Changeset 92995da


Ignore:
Timestamp:
01/14/10 08:43:12 (12 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:
7 edited
13 moved

Legend:

Unmodified
Added
Removed
  • src/app/app.pro

    r6a624f7 r92995da  
    55
    66# module dependencies
    7 LIBS += -L$$DESTDIR -lgui -lmodel -lsql
     7LIBS += -L$$DESTDIR -lgui -lmvc -lsql
    88INCLUDEPATH += ../gui
    99DEPENDPATH += . ../gui
    10 TARGETDEPS += $$DESTDIR/libmodel.a $$DESTDIR/libgui.a $$DESTDIR/libsql.a
     10TARGETDEPS += $$DESTDIR/libmvc.a $$DESTDIR/libgui.a $$DESTDIR/libsql.a
    1111
    1212SOURCES += main.cpp
  • src/fosdem.pro

    r6a624f7 r92995da  
    11TEMPLATE = subdirs
    2 SUBDIRS  = orm model sql gui app test
     2SUBDIRS  = orm mvc sql gui app test
    33CONFIG += ordered
    44
  • src/gui/daynavigatorwidget.cpp

    r6a624f7 r92995da  
    1616void DayNavigatorWidget::setDates(const QDate &aStartDate, const QDate &aEndDate)
    1717{
    18     Q_ASSERT(aStartDate>=aEndDate);
     18    Q_ASSERT(aStartDate<=aEndDate);
    1919
    2020    //qDebug() << "DayNavigatorWidget::setDates(): " << aStartDate << ", " << aEndDate;
  • src/gui/gui.pro

    r6a624f7 r92995da  
    66
    77# module dependencies
    8 LIBS += -L$$DESTDIR -lmodel -lorm -lsql
    9 INCLUDEPATH += ../orm ../model ../sql
    10 DEPENDPATH += . ../orm ../model ../sql
    11 TARGETDEPS += $$DESTDIR/liborm.a $$DESTDIR/libmodel.a $$DESTDIR/libsql.a
     8LIBS += -L$$DESTDIR -lmvc -lorm -lsql
     9INCLUDEPATH += ../orm ../mvc ../sql
     10DEPENDPATH += . ../orm ../mvc ../sql
     11TARGETDEPS += $$DESTDIR/liborm.a $$DESTDIR/libmvc.a $$DESTDIR/libsql.a
    1212
    1313
  • src/gui/mainwindow.ui

    r6a624f7 r92995da  
    2020       <number>0</number>
    2121      </property>
    22       <widget class="QWidget" name="tab" >
     22      <widget class="QWidget" name="dayViewTab" >
    2323       <attribute name="title" >
    24         <string>Tab 1</string>
     24        <string>Day View</string>
    2525       </attribute>
    2626       <layout class="QGridLayout" name="gridLayout_2" >
     
    4444       </layout>
    4545      </widget>
    46       <widget class="QWidget" name="tab_2" >
     46      <widget class="QWidget" name="favouritiesTab" >
    4747       <attribute name="title" >
    48         <string>Tab 2</string>
     48        <string>Favourities</string>
    4949       </attribute>
    5050      </widget>
     
    9797 <customwidgets>
    9898  <customwidget>
    99    <class>TreeView</class>
    100    <extends>QTreeView</extends>
    101    <header>../model/treeview.h</header>
    102   </customwidget>
    103   <customwidget>
    10499   <class>DayNavigatorWidget</class>
    105100   <extends>QWidget</extends>
     
    107102   <container>1</container>
    108103  </customwidget>
     104  <customwidget>
     105   <class>TreeView</class>
     106   <extends>QTreeView</extends>
     107   <header>../mvc/treeview.h</header>
     108  </customwidget>
    109109 </customwidgets>
    110110 <resources/>
  • src/mvc/mvc.pro

    r6a624f7 r92995da  
    11TEMPLATE = lib
    2 TARGET = model
     2TARGET = mvc
    33DESTDIR = ../bin
    44CONFIG += static
  • src/test/main.cpp

    r6a624f7 r92995da  
    11#include <QtTest>
    22
    3 #include "model/eventtest.h"
     3#include "mvc/eventtest.h"
    44
    55int main(int argc, char *argv[])
  • src/test/test.pro

    r6a624f7 r92995da  
    66
    77# module dependencies
    8 LIBS += -L$$DESTDIR -lgui -lmodel
    9 INCLUDEPATH += ../gui ../model ../orm
    10 DEPENDPATH += . ../gui ../model ../orm
    11 TARGETDEPS += $$DESTDIR/libmodel.a $$DESTDIR/libgui.a $$DESTDIR/liborm.a
     8LIBS += -L$$DESTDIR -lgui -lmvc
     9INCLUDEPATH += ../gui ../mvc ../orm
     10DEPENDPATH += . ../gui ../mvc ../orm
     11TARGETDEPS += $$DESTDIR/libmvc.a $$DESTDIR/libgui.a $$DESTDIR/liborm.a
    1212
    1313SOURCES += main.cpp \
    14     model/EventTest.cpp
     14    mvc/EventTest.cpp
    1515
    1616HEADERS += \
    17     model/EventTest.h
     17    mvc/EventTest.h
    1818
Note: See TracChangeset for help on using the changeset viewer.