rename project

gammasoft71 · gammasoft71 · commit 79b7ab679dec · 2020-05-12T19:02:45.000+02:00
diff --git a/Qt.Widgets/CommonControls/CMakeLists.txt b/Qt.Widgets/CommonControls/CMakeLists.txt
@@ -12,6 +12,7 @@ add_subdirectory(Label)
 add_subdirectory(LCDNumber)
 add_subdirectory(LineEdit)
 add_subdirectory(ListView)
+add_subdirectory(ListView2)
 add_subdirectory(ListWidget)
 add_subdirectory(PictureBox)
 add_subdirectory(PictureBox2)
@@ -23,5 +24,4 @@ add_subdirectory(SpinBox)
 add_subdirectory(SpinButton)
 add_subdirectory(ToggleButton)
 add_subdirectory(TreeView)
-add_subdirectory(TreeView2)
 add_subdirectory(Widget)
diff --git a/Qt.Widgets/CommonControls/CommonControls.pro b/Qt.Widgets/CommonControls/CommonControls.pro
@@ -7,6 +7,7 @@ SUBDIRS = \
     LCDNumber \
     LineEdit \
     ListView \
+    ListView2 \
     ListWidget \
     PictureBox \
     PictureBox2 \
@@ -18,5 +19,4 @@ SUBDIRS = \
     SpinButton \
     ToggleButton \
     TreeView \
-    TreeView2 \
     Widget \
diff --git a/Qt.Widgets/CommonControls/ListView/src/ListView.h b/Qt.Widgets/CommonControls/ListView/src/ListView.h
@@ -41,7 +41,7 @@ namespace Examples {
     QFrame frame;
     QVBoxLayout layout {&frame};
     QListView listView1;
-    QStandardItemModel model;;
+    QStandardItemModel model;
     QComboBox comboBoxMode;
   };
 }
diff --git a/Qt.Widgets/CommonControls/ListView2/CMakeLists.txt b/Qt.Widgets/CommonControls/ListView2/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
 
 # Project
-project(TreeView2)
+project(ListView2)
 find_package(Qt5Widgets CONFIG REQUIRED)
 
 # Options
@@ -12,5 +12,5 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Application
-add_executable(TreeView2 WIN32 MACOSX_BUNDLE src/TreeView2.cpp src/TreeView2.h)
-target_link_libraries(TreeView2 Qt5::Widgets)
+add_executable(ListView2 WIN32 MACOSX_BUNDLE src/ListView2.cpp src/ListView2.h)
+target_link_libraries(ListView2 Qt5::Widgets)
diff --git a/Qt.Widgets/CommonControls/ListView2/ListView2.pro b/Qt.Widgets/CommonControls/ListView2/ListView2.pro
@@ -0,0 +1,4 @@
+CONFIG += c++17
+QT = widgets
+SOURCES = src/ListView2.cpp
+HEADERS = src/ListView2.h
diff --git a/Qt.Widgets/CommonControls/ListView2/src/Ai16.xpm b/Qt.Widgets/CommonControls/ListView2/src/Ai16.xpm
diff --git a/Qt.Widgets/CommonControls/ListView2/src/Avi16.xpm b/Qt.Widgets/CommonControls/ListView2/src/Avi16.xpm
diff --git a/Qt.Widgets/CommonControls/ListView2/src/Bmp16.xpm b/Qt.Widgets/CommonControls/ListView2/src/Bmp16.xpm
diff --git a/Qt.Widgets/CommonControls/ListView2/src/ListView2.cpp b/Qt.Widgets/CommonControls/ListView2/src/ListView2.cpp
@@ -1,5 +1,5 @@
 #include <QApplication>
-#include "TreeView2.h"
+#include "ListView2.h"
 
 using namespace Examples;
 
diff --git a/Qt.Widgets/CommonControls/ListView2/src/ListView2.h b/Qt.Widgets/CommonControls/ListView2/src/ListView2.h
@@ -40,6 +40,6 @@ namespace Examples {
     QFrame frame;
     QVBoxLayout layout {&frame};
     QTreeView treeView1;
-    QStandardItemModel model;;
+    QStandardItemModel model;
   };
 }
diff --git a/Qt.Widgets/CommonControls/TreeView/src/TreeView.h b/Qt.Widgets/CommonControls/TreeView/src/TreeView.h
@@ -43,6 +43,6 @@ namespace Examples {
     QFrame frame;
     QVBoxLayout layout {&frame};
     QTreeView treeView1;
-    QStandardItemModel model;;
+    QStandardItemModel model;
   };
 }
diff --git a/Qt.Widgets/CommonControls/TreeView2/TreeView2.pro b/Qt.Widgets/CommonControls/TreeView2/TreeView2.pro
diff --git a/README.md b/README.md
@@ -37,6 +37,8 @@ shows how to use Qt widgets only by programming code (c++17).
 
 [ListView](Qt.Widgets/CommonControls/ListWidget) shows how to create a list view with QListView.
 
+[ListView2](Qt.Widgets/CommonControls/ListView2) shows how to create a list view with QTreeView.
+
 [ListWidget](Qt.Widgets/CommonControls/ListWidget) shows how to create a list widget with QListWidget.
 
 [PictureBox](Qt.Widgets/CommonControls/PictureBox) shows how to create a picture box with QLabel.
@@ -59,8 +61,6 @@ shows how to use Qt widgets only by programming code (c++17).
 
 [TreeView](Qt.Widgets/CommonControls/TreeView) shows how to create a three view with QTreeView.
 
-[TreeView2](Qt.Widgets/CommonControls/TreeView2) shows how to create a list view with QTreeView.
-
 [Widget](Qt.Widgets/CommonControls/ToggleButton) shows how to create a widget with QWidget.
 
 ## Containers

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ namespace Examples {`
`41`	`41`	`QFrame frame;`
`42`	`42`	`QVBoxLayout layout {&frame};`
`43`	`43`	`QListView listView1;`
`44`		`- QStandardItemModel model;;`
	`44`	`+ QStandardItemModel model;`
`45`	`45`	`QComboBox comboBoxMode;`
`46`	`46`	`};`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,6 @@ namespace Examples {`
`40`	`40`	`QFrame frame;`
`41`	`41`	`QVBoxLayout layout {&frame};`
`42`	`42`	`QTreeView treeView1;`
`43`		`- QStandardItemModel model;;`
	`43`	`+ QStandardItemModel model;`
`44`	`44`	`};`
`45`	`45`	`}`