Changeset 92995da

Timestamp:

01/14/10 08:43:12 (13 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

f3f6162

Parents:

6a624f7

Message:

just some directory renaming

• renamed 'model' to 'mvc' (Model-View-Controller), since it contains also 'delegate' and 'view'

Location:

src

Files:

• app/app.pro (modified) (1 diff)
• fosdem.pro (modified) (1 diff)
• gui/daynavigatorwidget.cpp (modified) (1 diff)
• gui/gui.pro (modified) (1 diff)
• gui/mainwindow.ui (modified) (4 diffs)
• mvc/conference.cpp (moved) (moved from src/model/conference.cpp)
• mvc/conference.h (moved) (moved from src/model/conference.h)
• mvc/delegate.cpp (moved) (moved from src/model/delegate.cpp)
• mvc/delegate.h (moved) (moved from src/model/delegate.h)
• mvc/event.cpp (moved) (moved from src/model/event.cpp)
• mvc/event.h (moved) (moved from src/model/event.h)
• mvc/eventmodel.cpp (moved) (moved from src/model/eventmodel.cpp)
• mvc/eventmodel.h (moved) (moved from src/model/eventmodel.h)
• mvc/mvc.pro (moved) (moved from src/model/model.pro) (1 diff)
• mvc/treeview.cpp (moved) (moved from src/model/treeview.cpp)
• mvc/treeview.h (moved) (moved from src/model/treeview.h)
• test/main.cpp (modified) (1 diff)
• test/mvc/eventtest.cpp (moved) (moved from src/test/model/eventtest.cpp)
• test/mvc/eventtest.h (moved) (moved from src/test/model/eventtest.h)
• test/test.pro (modified) (1 diff)

src/app/app.pro

@@ -5 +5 @@
 
 # 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

src/fosdem.pro

@@ -1 +1 @@
 TEMPLATE = subdirs
-SUBDIRS  = orm model sql gui app test
+SUBDIRS  = orm mvc sql gui app test
 CONFIG += ordered
 

src/gui/daynavigatorwidget.cpp

@@ -16 +16 @@
 void DayNavigatorWidget::setDates(const QDate &aStartDate, const QDate &aEndDate)
 {
-    Q_ASSERT(aStartDate>=aEndDate);
+    Q_ASSERT(aStartDate<=aEndDate);
 
     //qDebug() << "DayNavigatorWidget::setDates(): " << aStartDate << ", " << aEndDate;

src/gui/gui.pro

@@ -6 +6 @@
 
 # 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
 
 

src/gui/mainwindow.ui

@@ -20 +20 @@
        <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" >
@@ -44 +44 @@
        </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>
@@ -97 +97 @@
  <customwidgets>
   <customwidget>
-   <class>TreeView</class>
-   <extends>QTreeView</extends>
-   <header>../model/treeview.h</header>
-  </customwidget>
-  <customwidget>
    <class>DayNavigatorWidget</class>
    <extends>QWidget</extends>
@@ -107 +102 @@
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>TreeView</class>
+   <extends>QTreeView</extends>
+   <header>../mvc/treeview.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>

src/mvc/mvc.pro

@@ -1 +1 @@
 TEMPLATE = lib
-TARGET = model
+TARGET = mvc
 DESTDIR = ../bin
 CONFIG += static

src/test/main.cpp

@@ -1 +1 @@
 #include <QtTest>
 
-#include "model/eventtest.h"
+#include "mvc/eventtest.h"
 
 int main(int argc, char *argv[])

src/test/test.pro

@@ -6 +6 @@
 
 # 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