From 92995da45a4d853eac6a4209e854f147b00e801d Mon Sep 17 00:00:00 2001
From: pavelpa <pavelpa@localhost>
Date: Thu, 14 Jan 2010 07:43:12 +0000
Subject: [PATCH] just some directory renaming  - renamed 'model' to 'mvc'
 (Model-View-Controller), since it contains also 'delegate' and 'view'

---
 src/app/app.pro                       |  4 ++--
 src/fosdem.pro                        |  2 +-
 src/gui/daynavigatorwidget.cpp        |  2 +-
 src/gui/gui.pro                       |  8 ++++----
 src/gui/mainwindow.ui                 | 18 +++++++++---------
 src/{model => mvc}/conference.cpp     |  0
 src/{model => mvc}/conference.h       |  0
 src/{model => mvc}/delegate.cpp       |  0
 src/{model => mvc}/delegate.h         |  0
 src/{model => mvc}/event.cpp          |  0
 src/{model => mvc}/event.h            |  0
 src/{model => mvc}/eventmodel.cpp     |  0
 src/{model => mvc}/eventmodel.h       |  0
 src/{model/model.pro => mvc/mvc.pro}  |  2 +-
 src/{model => mvc}/treeview.cpp       |  0
 src/{model => mvc}/treeview.h         |  0
 src/test/main.cpp                     |  2 +-
 src/test/{model => mvc}/eventtest.cpp |  0
 src/test/{model => mvc}/eventtest.h   |  0
 src/test/test.pro                     | 12 ++++++------
 20 files changed, 25 insertions(+), 25 deletions(-)
 rename src/{model => mvc}/conference.cpp (100%)
 rename src/{model => mvc}/conference.h (100%)
 rename src/{model => mvc}/delegate.cpp (100%)
 rename src/{model => mvc}/delegate.h (100%)
 rename src/{model => mvc}/event.cpp (100%)
 rename src/{model => mvc}/event.h (100%)
 rename src/{model => mvc}/eventmodel.cpp (100%)
 rename src/{model => mvc}/eventmodel.h (100%)
 rename src/{model/model.pro => mvc/mvc.pro} (96%)
 rename src/{model => mvc}/treeview.cpp (100%)
 rename src/{model => mvc}/treeview.h (100%)
 rename src/test/{model => mvc}/eventtest.cpp (100%)
 rename src/test/{model => mvc}/eventtest.h (100%)

diff --git a/src/app/app.pro b/src/app/app.pro
index a48b1f2..5567579 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -4,10 +4,10 @@ DESTDIR = ../bin
 QT += sql xml
 
 # module dependencies
-LIBS += -L$$DESTDIR -lgui -lmodel -lsql
+LIBS += -L$$DESTDIR -lgui -lmvc -lsql
 INCLUDEPATH += ../gui
 DEPENDPATH += . ../gui
-TARGETDEPS += $$DESTDIR/libmodel.a $$DESTDIR/libgui.a $$DESTDIR/libsql.a
+TARGETDEPS += $$DESTDIR/libmvc.a $$DESTDIR/libgui.a $$DESTDIR/libsql.a
 
 SOURCES += main.cpp
 
diff --git a/src/fosdem.pro b/src/fosdem.pro
index ded833f..69179f8 100644
--- a/src/fosdem.pro
+++ b/src/fosdem.pro
@@ -1,4 +1,4 @@
 TEMPLATE = subdirs
-SUBDIRS  = orm model sql gui app test
+SUBDIRS  = orm mvc sql gui app test
 CONFIG += ordered
 
diff --git a/src/gui/daynavigatorwidget.cpp b/src/gui/daynavigatorwidget.cpp
index 4f4ce54..20b2778 100644
--- a/src/gui/daynavigatorwidget.cpp
+++ b/src/gui/daynavigatorwidget.cpp
@@ -15,7 +15,7 @@ DayNavigatorWidget::DayNavigatorWidget(QWidget *aParent)
 
 void DayNavigatorWidget::setDates(const QDate &aStartDate, const QDate &aEndDate)
 {
-    Q_ASSERT(aStartDate>=aEndDate);
+    Q_ASSERT(aStartDate<=aEndDate);
 
     //qDebug() << "DayNavigatorWidget::setDates(): " << aStartDate << ", " << aEndDate;
     mStartDate = aStartDate;
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 9849e27..0abcbbd 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -5,10 +5,10 @@ CONFIG += static
 QT += sql xml
 
 # module dependencies
-LIBS += -L$$DESTDIR -lmodel -lorm -lsql
-INCLUDEPATH += ../orm ../model ../sql
-DEPENDPATH += . ../orm ../model ../sql
-TARGETDEPS += $$DESTDIR/liborm.a $$DESTDIR/libmodel.a $$DESTDIR/libsql.a
+LIBS += -L$$DESTDIR -lmvc -lorm -lsql
+INCLUDEPATH += ../orm ../mvc ../sql
+DEPENDPATH += . ../orm ../mvc ../sql
+TARGETDEPS += $$DESTDIR/liborm.a $$DESTDIR/libmvc.a $$DESTDIR/libsql.a
 
 
 # A shamelessly long list of sources, headers and forms.
diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui
index 72ccbfd..548054b 100644
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@@ -19,9 +19,9 @@
       <property name="currentIndex" >
        <number>0</number>
       </property>
-      <widget class="QWidget" name="tab" >
+      <widget class="QWidget" name="dayViewTab" >
        <attribute name="title" >
-        <string>Tab 1</string>
+        <string>Day View</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout_2" >
         <item row="0" column="0" >
@@ -43,9 +43,9 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="tab_2" >
+      <widget class="QWidget" name="favouritiesTab" >
        <attribute name="title" >
-        <string>Tab 2</string>
+        <string>Favourities</string>
        </attribute>
       </widget>
      </widget>
@@ -95,17 +95,17 @@
   </action>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>TreeView</class>
-   <extends>QTreeView</extends>
-   <header>../model/treeview.h</header>
-  </customwidget>
   <customwidget>
    <class>DayNavigatorWidget</class>
    <extends>QWidget</extends>
    <header>daynavigatorwidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>TreeView</class>
+   <extends>QTreeView</extends>
+   <header>../mvc/treeview.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/src/model/conference.cpp b/src/mvc/conference.cpp
similarity index 100%
rename from src/model/conference.cpp
rename to src/mvc/conference.cpp
diff --git a/src/model/conference.h b/src/mvc/conference.h
similarity index 100%
rename from src/model/conference.h
rename to src/mvc/conference.h
diff --git a/src/model/delegate.cpp b/src/mvc/delegate.cpp
similarity index 100%
rename from src/model/delegate.cpp
rename to src/mvc/delegate.cpp
diff --git a/src/model/delegate.h b/src/mvc/delegate.h
similarity index 100%
rename from src/model/delegate.h
rename to src/mvc/delegate.h
diff --git a/src/model/event.cpp b/src/mvc/event.cpp
similarity index 100%
rename from src/model/event.cpp
rename to src/mvc/event.cpp
diff --git a/src/model/event.h b/src/mvc/event.h
similarity index 100%
rename from src/model/event.h
rename to src/mvc/event.h
diff --git a/src/model/eventmodel.cpp b/src/mvc/eventmodel.cpp
similarity index 100%
rename from src/model/eventmodel.cpp
rename to src/mvc/eventmodel.cpp
diff --git a/src/model/eventmodel.h b/src/mvc/eventmodel.h
similarity index 100%
rename from src/model/eventmodel.h
rename to src/mvc/eventmodel.h
diff --git a/src/model/model.pro b/src/mvc/mvc.pro
similarity index 96%
rename from src/model/model.pro
rename to src/mvc/mvc.pro
index 87ce365..7ab7bb9 100644
--- a/src/model/model.pro
+++ b/src/mvc/mvc.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-TARGET = model
+TARGET = mvc
 DESTDIR = ../bin
 CONFIG += static
 QT += sql
diff --git a/src/model/treeview.cpp b/src/mvc/treeview.cpp
similarity index 100%
rename from src/model/treeview.cpp
rename to src/mvc/treeview.cpp
diff --git a/src/model/treeview.h b/src/mvc/treeview.h
similarity index 100%
rename from src/model/treeview.h
rename to src/mvc/treeview.h
diff --git a/src/test/main.cpp b/src/test/main.cpp
index 2cda835..2b22271 100644
--- a/src/test/main.cpp
+++ b/src/test/main.cpp
@@ -1,6 +1,6 @@
 #include <QtTest>
 
-#include "model/eventtest.h"
+#include "mvc/eventtest.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/src/test/model/eventtest.cpp b/src/test/mvc/eventtest.cpp
similarity index 100%
rename from src/test/model/eventtest.cpp
rename to src/test/mvc/eventtest.cpp
diff --git a/src/test/model/eventtest.h b/src/test/mvc/eventtest.h
similarity index 100%
rename from src/test/model/eventtest.h
rename to src/test/mvc/eventtest.h
diff --git a/src/test/test.pro b/src/test/test.pro
index 47ab4b4..df5a934 100644
--- a/src/test/test.pro
+++ b/src/test/test.pro
@@ -5,14 +5,14 @@ CONFIG += qtestlib console
 QT += sql
 
 # module dependencies
-LIBS += -L$$DESTDIR -lgui -lmodel
-INCLUDEPATH += ../gui ../model ../orm
-DEPENDPATH += . ../gui ../model ../orm
-TARGETDEPS += $$DESTDIR/libmodel.a $$DESTDIR/libgui.a $$DESTDIR/liborm.a
+LIBS += -L$$DESTDIR -lgui -lmvc
+INCLUDEPATH += ../gui ../mvc ../orm
+DEPENDPATH += . ../gui ../mvc ../orm
+TARGETDEPS += $$DESTDIR/libmvc.a $$DESTDIR/libgui.a $$DESTDIR/liborm.a
 
 SOURCES += main.cpp \
-    model/EventTest.cpp
+    mvc/EventTest.cpp
 
 HEADERS += \
-    model/EventTest.h
+    mvc/EventTest.h
 
-- 
2.39.5