changeset 407:eb959324f82a

merge
author Eldar Insafutdinov
date Fri, 18 Mar 2011 00:31:03 +0000
parents 778ef7374fb5 (diff) 9d6e4703a458 (current diff)
children ba1abf81d0e0
files
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/examples/itemviews/CMakeLists.txt	Thu Mar 17 23:09:43 2011 +0100
+++ b/examples/itemviews/CMakeLists.txt	Fri Mar 18 00:31:03 2011 +0000
@@ -1,2 +1,2 @@
- add_subdirectory(dirview)
+add_subdirectory(dirview)
 add_subdirectory(customsortfiltermodel)
\ No newline at end of file
--- a/examples/layouts/borderlayout/borderlayout.d	Thu Mar 17 23:09:43 2011 +0100
+++ b/examples/layouts/borderlayout/borderlayout.d	Fri Mar 18 00:31:03 2011 +0000
@@ -104,7 +104,7 @@
 
     int count() const
     {
-        return list.length;
+        return cast(int)list.length;
     }
 
     IQLayoutItem itemAt(int index) const
--- a/examples/layouts/dynamiclayouts/dialog.d	Thu Mar 17 23:09:43 2011 +0100
+++ b/examples/layouts/dynamiclayouts/dialog.d	Fri Mar 18 00:31:03 2011 +0000
@@ -117,7 +117,7 @@
 
         rotableWidgets = rotableWidgets[1..$] ~ rotableWidgets[0];
 
-        int n = rotableWidgets.length;
+        auto n = rotableWidgets.length;
         for (int i = 0; i < n / 2; ++i) {
             rotableLayout.addWidget(rotableWidgets[n - i - 1], 0, i);
             rotableLayout.addWidget(rotableWidgets[i], 1, i);
@@ -146,7 +146,7 @@
         rotableWidgets ~= a2;
         rotableWidgets ~= a3;
 
-        int n = rotableWidgets.length;
+        auto n = rotableWidgets.length;
 
         for (int i = 0; i < n; ++i)
             connect(rotableWidgets[i], "valueChanged", rotableWidgets[(i + 1) % n], "setValue");