Changeset 43:10dd65d71f7f in SMSSender


Ignore:
Timestamp:
Jan 27, 2010 5:57:30 PM (12 years ago)
Author:
Sämy Zehnder <saemy.zehnder@…>
Branch:
3.0
Convert:
svn:3639001d-8e34-449c-bb86-3782b86c4877/branches/3.0@42
Message:
  • Did a lot of work...
Files:
33 added
9 deleted
94 edited
6 moved

Legend:

Unmodified
Added
Removed

  • Makefile

    r42 r43  
    11#############################################################################
    22# Makefile for building: smssender-bin
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Thu Jan 14 13:21:33 2010
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 26 20:33:24 2010
    44# Project:  smssender.pro
    55# Template: app
    … …  
    8484                /usr/share/qt4/mkspecs/features/lex.prf \
    8585                /usr/share/qt4/mkspecs/features/include_source_dir.prf \
     86                /usr/lib/libQtSql.prl \
    8687                /usr/lib/libQtGui.prl \
    8788                /usr/lib/libQtCore.prl
    … …  
    107108/usr/share/qt4/mkspecs/features/lex.prf:
    108109/usr/share/qt4/mkspecs/features/include_source_dir.prf:
     110/usr/lib/libQtSql.prl:
    109111/usr/lib/libQtGui.prl:
    110112/usr/lib/libQtCore.prl:

  • Makefile.Debug

    r42 r43  
    11#############################################################################
    22# Makefile for building: smssender-bin
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Thu Jan 14 13:21:33 2010
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 26 20:33:24 2010
    44# Project:  smssender.pro
    55# Template: app
    … …  
    1010CC            = gcc
    1111CXX           = g++
    12 DEFINES       = -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
     12DEFINES       = -DQT_SQL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
    1313CFLAGS        = -pipe -g -D_REENTRANT -Wall -W $(DEFINES)
    1414CXXFLAGS      = -pipe -g -D_REENTRANT -Wall -W $(DEFINES)
    15 INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -Iapp -Ilib/libinterfaces/src/business -Ilib/libinterfaces/src/exceptions -Ilib/libinterfaces/src -Ilib/libdatatypes/src/business -Ilib/libutils/src -Idebug -I.
     15INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtSql -I/usr/include/qt4 -Iapp -Isrc/ui/components -Ilib/libinterfaces/src/business -Ilib/libinterfaces/src/exceptions -Ilib/libinterfaces/src -Ilib/libdatatypes/src/business -Ilib/libdatatypes/src -Ilib/libutils/src -Idebug -I.
    1616LINK          = g++
    1717LFLAGS        =
    18 LIBS          = $(SUBLIBS)  -L/usr/lib -Llib/ -ltntdb -lcrypto++ -ldatatypes -linterfaces -lutils -lpthread -lQtGui -lQtCore
     18LIBS          = $(SUBLIBS)  -L/usr/lib -Llib/ -ltntdb -lcrypto++ -ldatatypes -lutils -linterfaces -lpthread -lQtSql -lQtGui -lQtCore
    1919AR            = ar cqs
    2020RANLIB        =
    … …  
    4242####### Files
    4343
    44 SOURCES       = src/ui/completers/aliascompleter.cpp \
    45                 src/ui/completers/AliasModel.cpp \
    46                 src/ui/completers/FilteredPopupCompleter.cpp \
     44SOURCES       = src/persistence/storage/DAAccountListManager.cpp \
     45                src/persistence/storage/DAStorage.cpp \
     46                src/ui/models/contactgroupmodel.cpp \
     47                src/ui/models/aliascompletionmodel.cpp \
     48                src/ui/completers/bettercompleter.cpp \
     49                src/ui/models/accountmodel.cpp \
     50                src/ui/delegates/aligndelegate.cpp \
     51                src/ui/components/clearbutton.cpp \
     52                src/ui/components/lineedit.cpp \
     53                src/ui/components/searchbutton.cpp \
     54                src/ui/components/searchlineedit.cpp \
    4755                src/ui/VCEditAccount/vceditaccount.cpp \
    4856                src/ui/VCAccountList/vcaccountlist.cpp \
    4957                src/business/BCAccountLoadThread.cpp \
    5058                src/business/BCGatewayManager.cpp \
    51                 src/persistence/storage/DASQLiteAccountListManager.cpp \
    5259                src/persistence/DAAccountManager.cpp \
    5360                src/business/BCAccountManager.cpp \
    … …  
    6370                src/business/BCContactManager.cpp \
    6471                src/business/BusinessFactory.cpp \
    65                 src/persistence/storage/DASQLiteStorage.cpp \
    6672                src/business/BCSettings.cpp \
    6773                src/persistence/PersistenceFactory.cpp \
    … …  
    6975                src/main.cpp \
    7076                src/ui/VCMain/vcmain.cpp \
    71                 src/ui/VCSettings/vcsettings.cpp debug/moc_aliascompleter.cpp \
     77                src/ui/VCSettings/vcsettings.cpp debug/moc_DAAccountListManager.cpp \
     78                debug/moc_DAStorage.cpp \
     79                debug/moc_contactgroupmodel.cpp \
     80                debug/moc_aliascompletionmodel.cpp \
     81                debug/moc_bettercompleter.cpp \
     82                debug/moc_accountmodel.cpp \
     83                debug/moc_aligndelegate.cpp \
     84                debug/moc_clearbutton.cpp \
     85                debug/moc_lineedit.cpp \
     86                debug/moc_lineedit_p.cpp \
     87                debug/moc_searchbutton.cpp \
     88                debug/moc_searchlineedit.cpp \
    7289                debug/moc_vceditaccount.cpp \
    7390                debug/moc_vcaccountlist.cpp \
    7491                debug/moc_BCAccountLoadThread.cpp \
    75                 debug/moc_DASQLiteAccountListManager.cpp \
    7692                debug/moc_DAAccountManager.cpp \
     93                debug/moc_BCAccountManager.cpp \
    7794                debug/moc_BCAccountLoadManager.cpp \
    7895                debug/moc_BCLibraryLoader.cpp \
    7996                debug/moc_vceditgroup.cpp \
    8097                debug/moc_DAGroupManager.cpp \
     98                debug/moc_BCGroupManager.cpp \
    8199                debug/moc_vceditcontact.cpp \
    82100                debug/moc_DASettings.cpp \
    83101                debug/moc_vcaddressbook.cpp \
    84                 debug/moc_DASQLiteStorage.cpp \
     102                debug/moc_BCContactManager.cpp \
    85103                debug/moc_DAContactManager.cpp \
    86104                debug/moc_PersistenceFactory.cpp \
    … …  
    88106                debug/moc_vcsettings.cpp \
    89107                debug/qrc_resource.cpp
    90 OBJECTS       = debug/aliascompleter.o \
    91                 debug/AliasModel.o \
    92                 debug/FilteredPopupCompleter.o \
     108OBJECTS       = debug/DAAccountListManager.o \
     109                debug/DAStorage.o \
     110                debug/contactgroupmodel.o \
     111                debug/aliascompletionmodel.o \
     112                debug/bettercompleter.o \
     113                debug/accountmodel.o \
     114                debug/aligndelegate.o \
     115                debug/clearbutton.o \
     116                debug/lineedit.o \
     117                debug/searchbutton.o \
     118                debug/searchlineedit.o \
    93119                debug/vceditaccount.o \
    94120                debug/vcaccountlist.o \
    95121                debug/BCAccountLoadThread.o \
    96122                debug/BCGatewayManager.o \
    97                 debug/DASQLiteAccountListManager.o \
    98123                debug/DAAccountManager.o \
    99124                debug/BCAccountManager.o \
    … …  
    109134                debug/BCContactManager.o \
    110135                debug/BusinessFactory.o \
    111                 debug/DASQLiteStorage.o \
    112136                debug/BCSettings.o \
    113137                debug/PersistenceFactory.o \
    … …  
    116140                debug/vcmain.o \
    117141                debug/vcsettings.o \
    118                 debug/moc_aliascompleter.o \
     142                debug/moc_DAAccountListManager.o \
     143                debug/moc_DAStorage.o \
     144                debug/moc_contactgroupmodel.o \
     145                debug/moc_aliascompletionmodel.o \
     146                debug/moc_bettercompleter.o \
     147                debug/moc_accountmodel.o \
     148                debug/moc_aligndelegate.o \
     149                debug/moc_clearbutton.o \
     150                debug/moc_lineedit.o \
     151                debug/moc_lineedit_p.o \
     152                debug/moc_searchbutton.o \
     153                debug/moc_searchlineedit.o \
    119154                debug/moc_vceditaccount.o \
    120155                debug/moc_vcaccountlist.o \
    121156                debug/moc_BCAccountLoadThread.o \
    122                 debug/moc_DASQLiteAccountListManager.o \
    123157                debug/moc_DAAccountManager.o \
     158                debug/moc_BCAccountManager.o \
    124159                debug/moc_BCAccountLoadManager.o \
    125160                debug/moc_BCLibraryLoader.o \
    126161                debug/moc_vceditgroup.o \
    127162                debug/moc_DAGroupManager.o \
     163                debug/moc_BCGroupManager.o \
    128164                debug/moc_vceditcontact.o \
    129165                debug/moc_DASettings.o \
    130166                debug/moc_vcaddressbook.o \
    131                 debug/moc_DASQLiteStorage.o \
     167                debug/moc_BCContactManager.o \
    132168                debug/moc_DAContactManager.o \
    133169                debug/moc_PersistenceFactory.o \
    … …  
    193229dist:
    194230        @$(CHK_DIR_EXISTS) debug/smssender-bin3.0.0 || $(MKDIR) debug/smssender-bin3.0.0
    195         $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/ui/completers/aliascompleter.h src/ui/completers/AliasModel.h src/ui/completers/FilteredPopupCompleter.h src/ui/VCEditAccount/vceditaccount.h src/ui/VCAccountList/vcaccountlist.h src/business/BCAccountLoadThread.h src/business/BCGatewayManager.h src/persistence/storage/DASQLiteAccountListManager.h src/persistence/DAAccountManager.h src/business/BCAccountManager.h src/business/BCAccountLoadManager.h src/business/BCLibraryLoader.h src/ui/VCEditGroup/vceditgroup.h src/persistence/DAGroupManager.h src/business/BCGroupManager.h src/ui/UIHelper.h src/ui/VCEditContact/vceditcontact.h src/persistence/DASettings.h src/ui/VCAddressBook/vcaddressbook.h src/business/BCContactManager.h src/business/BusinessFactory.h src/persistence/storage/DASQLiteStorage.h src/persistence/DAContactManager.h src/business/BCSettings.h src/persistence/PersistenceFactory.h src/ui/VCMain/vcmain.h src/ui/VCSettings/vcsettings.h debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents lib/resource.qrc debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/ui/completers/aliascompleter.cpp src/ui/completers/AliasModel.cpp src/ui/completers/FilteredPopupCompleter.cpp src/ui/VCEditAccount/vceditaccount.cpp src/ui/VCAccountList/vcaccountlist.cpp src/business/BCAccountLoadThread.cpp src/business/BCGatewayManager.cpp src/persistence/storage/DASQLiteAccountListManager.cpp src/persistence/DAAccountManager.cpp src/business/BCAccountManager.cpp src/business/BCAccountLoadManager.cpp src/business/BCLibraryLoader.cpp src/ui/VCEditGroup/vceditgroup.cpp src/persistence/DAGroupManager.cpp src/business/BCGroupManager.cpp src/ui/UIHelper.cpp src/ui/VCEditContact/vceditcontact.cpp src/persistence/DASettings.cpp src/ui/VCAddressBook/vcaddressbook.cpp src/business/BCContactManager.cpp src/business/BusinessFactory.cpp src/persistence/storage/DASQLiteStorage.cpp src/business/BCSettings.cpp src/persistence/PersistenceFactory.cpp src/persistence/DAContactManager.cpp src/main.cpp src/ui/VCMain/vcmain.cpp src/ui/VCSettings/vcsettings.cpp debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/ui/VCEditAccount/vceditaccount.ui src/ui/VCAccountList/vcaccountlist.ui src/ui/VCEditGroup/vceditgroup.ui src/ui/VCEditContact/vceditcontact.ui src/ui/VCAddressBook/vcaddressbook.ui src/ui/VCMain/vcmain.ui src/ui/VCSettings/vcsettings.ui debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents locale/de.ts debug/smssender-bin3.0.0/ && (cd `dirname debug/smssender-bin3.0.0` && $(TAR) smssender-bin3.0.0.tar smssender-bin3.0.0 && $(COMPRESS) smssender-bin3.0.0.tar) && $(MOVE) `dirname debug/smssender-bin3.0.0`/smssender-bin3.0.0.tar.gz . && $(DEL_FILE) -r debug/smssender-bin3.0.0
     231        $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/persistence/storage/DAAccountListManager.h src/persistence/storage/DAStorage.h src/ui/models/contactgroupmodel.h src/ui/models/aliascompletionmodel.h src/ui/completers/bettercompleter.h src/ui/models/accountmodel.h src/ui/delegates/aligndelegate.h src/ui/components/clearbutton.h src/ui/components/lineedit.h src/ui/components/lineedit_p.h src/ui/components/searchbutton.h src/ui/components/searchlineedit.h src/ui/VCEditAccount/vceditaccount.h src/ui/VCAccountList/vcaccountlist.h src/business/BCAccountLoadThread.h src/business/BCGatewayManager.h src/persistence/DAAccountManager.h src/business/BCAccountManager.h src/business/BCAccountLoadManager.h src/business/BCLibraryLoader.h src/ui/VCEditGroup/vceditgroup.h src/persistence/DAGroupManager.h src/business/BCGroupManager.h src/ui/UIHelper.h src/ui/VCEditContact/vceditcontact.h src/persistence/DASettings.h src/ui/VCAddressBook/vcaddressbook.h src/business/BCContactManager.h src/business/BusinessFactory.h src/persistence/DAContactManager.h src/business/BCSettings.h src/persistence/PersistenceFactory.h src/ui/VCMain/vcmain.h src/ui/VCSettings/vcsettings.h debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents lib/resource.qrc debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/persistence/storage/DAAccountListManager.cpp src/persistence/storage/DAStorage.cpp src/ui/models/contactgroupmodel.cpp src/ui/models/aliascompletionmodel.cpp src/ui/completers/bettercompleter.cpp src/ui/models/accountmodel.cpp src/ui/delegates/aligndelegate.cpp src/ui/components/clearbutton.cpp src/ui/components/lineedit.cpp src/ui/components/searchbutton.cpp src/ui/components/searchlineedit.cpp src/ui/VCEditAccount/vceditaccount.cpp src/ui/VCAccountList/vcaccountlist.cpp src/business/BCAccountLoadThread.cpp src/business/BCGatewayManager.cpp src/persistence/DAAccountManager.cpp src/business/BCAccountManager.cpp src/business/BCAccountLoadManager.cpp src/business/BCLibraryLoader.cpp src/ui/VCEditGroup/vceditgroup.cpp src/persistence/DAGroupManager.cpp src/business/BCGroupManager.cpp src/ui/UIHelper.cpp src/ui/VCEditContact/vceditcontact.cpp src/persistence/DASettings.cpp src/ui/VCAddressBook/vcaddressbook.cpp src/business/BCContactManager.cpp src/business/BusinessFactory.cpp src/business/BCSettings.cpp src/persistence/PersistenceFactory.cpp src/persistence/DAContactManager.cpp src/main.cpp src/ui/VCMain/vcmain.cpp src/ui/VCSettings/vcsettings.cpp debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/ui/VCEditAccount/vceditaccount.ui src/ui/VCAccountList/vcaccountlist.ui src/ui/VCEditGroup/vceditgroup.ui src/ui/VCEditContact/vceditcontact.ui src/ui/VCAddressBook/vcaddressbook.ui src/ui/VCMain/vcmain.ui src/ui/VCSettings/vcsettings.ui debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents locale/de.ts debug/smssender-bin3.0.0/ && (cd `dirname debug/smssender-bin3.0.0` && $(TAR) smssender-bin3.0.0.tar smssender-bin3.0.0 && $(COMPRESS) smssender-bin3.0.0.tar) && $(MOVE) `dirname debug/smssender-bin3.0.0`/smssender-bin3.0.0.tar.gz . && $(DEL_FILE) -r debug/smssender-bin3.0.0
    196232
    197233
    … …  
    212248mocables: compiler_moc_header_make_all compiler_moc_source_make_all
    213249
    214 compiler_moc_header_make_all: debug/moc_aliascompleter.cpp debug/moc_vceditaccount.cpp debug/moc_vcaccountlist.cpp debug/moc_BCAccountLoadThread.cpp debug/moc_DASQLiteAccountListManager.cpp debug/moc_DAAccountManager.cpp debug/moc_BCAccountLoadManager.cpp debug/moc_BCLibraryLoader.cpp debug/moc_vceditgroup.cpp debug/moc_DAGroupManager.cpp debug/moc_vceditcontact.cpp debug/moc_DASettings.cpp debug/moc_vcaddressbook.cpp debug/moc_DASQLiteStorage.cpp debug/moc_DAContactManager.cpp debug/moc_PersistenceFactory.cpp debug/moc_vcmain.cpp debug/moc_vcsettings.cpp
     250compiler_moc_header_make_all: debug/moc_DAAccountListManager.cpp debug/moc_DAStorage.cpp debug/moc_contactgroupmodel.cpp debug/moc_aliascompletionmodel.cpp debug/moc_bettercompleter.cpp debug/moc_accountmodel.cpp debug/moc_aligndelegate.cpp debug/moc_clearbutton.cpp debug/moc_lineedit.cpp debug/moc_lineedit_p.cpp debug/moc_searchbutton.cpp debug/moc_searchlineedit.cpp debug/moc_vceditaccount.cpp debug/moc_vcaccountlist.cpp debug/moc_BCAccountLoadThread.cpp debug/moc_DAAccountManager.cpp debug/moc_BCAccountManager.cpp debug/moc_BCAccountLoadManager.cpp debug/moc_BCLibraryLoader.cpp debug/moc_vceditgroup.cpp debug/moc_DAGroupManager.cpp debug/moc_BCGroupManager.cpp debug/moc_vceditcontact.cpp debug/moc_DASettings.cpp debug/moc_vcaddressbook.cpp debug/moc_BCContactManager.cpp debug/moc_DAContactManager.cpp debug/moc_PersistenceFactory.cpp debug/moc_vcmain.cpp debug/moc_vcsettings.cpp
    215251compiler_moc_header_clean:
    216         -$(DEL_FILE) debug/moc_aliascompleter.cpp debug/moc_vceditaccount.cpp debug/moc_vcaccountlist.cpp debug/moc_BCAccountLoadThread.cpp debug/moc_DASQLiteAccountListManager.cpp debug/moc_DAAccountManager.cpp debug/moc_BCAccountLoadManager.cpp debug/moc_BCLibraryLoader.cpp debug/moc_vceditgroup.cpp debug/moc_DAGroupManager.cpp debug/moc_vceditcontact.cpp debug/moc_DASettings.cpp debug/moc_vcaddressbook.cpp debug/moc_DASQLiteStorage.cpp debug/moc_DAContactManager.cpp debug/moc_PersistenceFactory.cpp debug/moc_vcmain.cpp debug/moc_vcsettings.cpp
    217 debug/moc_aliascompleter.cpp: src/ui/completers/aliascompleter.h
    218         /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/completers/aliascompleter.h -o debug/moc_aliascompleter.cpp
     252        -$(DEL_FILE) debug/moc_DAAccountListManager.cpp debug/moc_DAStorage.cpp debug/moc_contactgroupmodel.cpp debug/moc_aliascompletionmodel.cpp debug/moc_bettercompleter.cpp debug/moc_accountmodel.cpp debug/moc_aligndelegate.cpp debug/moc_clearbutton.cpp debug/moc_lineedit.cpp debug/moc_lineedit_p.cpp debug/moc_searchbutton.cpp debug/moc_searchlineedit.cpp debug/moc_vceditaccount.cpp debug/moc_vcaccountlist.cpp debug/moc_BCAccountLoadThread.cpp debug/moc_DAAccountManager.cpp debug/moc_BCAccountManager.cpp debug/moc_BCAccountLoadManager.cpp debug/moc_BCLibraryLoader.cpp debug/moc_vceditgroup.cpp debug/moc_DAGroupManager.cpp debug/moc_BCGroupManager.cpp debug/moc_vceditcontact.cpp debug/moc_DASettings.cpp debug/moc_vcaddressbook.cpp debug/moc_BCContactManager.cpp debug/moc_DAContactManager.cpp debug/moc_PersistenceFactory.cpp debug/moc_vcmain.cpp debug/moc_vcsettings.cpp
     253debug/moc_DAAccountListManager.cpp: src/persistence/storage/DAAccountListManager.h
     254        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/storage/DAAccountListManager.h -o debug/moc_DAAccountListManager.cpp
     255
     256debug/moc_DAStorage.cpp: src/persistence/storage/DAStorage.h
     257        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/storage/DAStorage.h -o debug/moc_DAStorage.cpp
     258
     259debug/moc_contactgroupmodel.cpp: src/business/BCContactManager.h \
     260                src/business/BCGroupManager.h \
     261                src/ui/models/contactgroupmodel.h
     262        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/models/contactgroupmodel.h -o debug/moc_contactgroupmodel.cpp
     263
     264debug/moc_aliascompletionmodel.cpp: src/ui/completers/bettercompleter.h \
     265                src/ui/models/aliascompletionmodel.h
     266        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/models/aliascompletionmodel.h -o debug/moc_aliascompletionmodel.cpp
     267
     268debug/moc_bettercompleter.cpp: src/ui/completers/bettercompleter.h
     269        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/completers/bettercompleter.h -o debug/moc_bettercompleter.cpp
     270
     271debug/moc_accountmodel.cpp: src/business/BCAccountManager.h \
     272                src/business/BCAccountLoadManager.h \
     273                src/business/BCAccountLoadThread.h \
     274                src/ui/models/accountmodel.h
     275        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/models/accountmodel.h -o debug/moc_accountmodel.cpp
     276
     277debug/moc_aligndelegate.cpp: src/ui/delegates/aligndelegate.h
     278        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/delegates/aligndelegate.h -o debug/moc_aligndelegate.cpp
     279
     280debug/moc_clearbutton.cpp: src/ui/components/clearbutton.h
     281        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/components/clearbutton.h -o debug/moc_clearbutton.cpp
     282
     283debug/moc_lineedit.cpp: src/ui/components/lineedit.h
     284        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/components/lineedit.h -o debug/moc_lineedit.cpp
     285
     286debug/moc_lineedit_p.cpp: src/ui/components/lineedit_p.h
     287        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/components/lineedit_p.h -o debug/moc_lineedit_p.cpp
     288
     289debug/moc_searchbutton.cpp: src/ui/components/searchbutton.h
     290        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/components/searchbutton.h -o debug/moc_searchbutton.cpp
     291
     292debug/moc_searchlineedit.cpp: src/ui/components/lineedit.h \
     293                src/ui/components/searchlineedit.h
     294        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/components/searchlineedit.h -o debug/moc_searchlineedit.cpp
    219295
    220296debug/moc_vceditaccount.cpp: ui_vceditaccount.h \
    … …  
    223299
    224300debug/moc_vcaccountlist.cpp: ui_vcaccountlist.h \
     301                src/ui/models/accountmodel.h \
     302                src/business/BCAccountManager.h \
     303                src/business/BCAccountLoadManager.h \
     304                src/business/BCAccountLoadThread.h \
    225305                src/ui/VCAccountList/vcaccountlist.h
    226306        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCAccountList/vcaccountlist.h -o debug/moc_vcaccountlist.cpp
    … …  
    229309        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCAccountLoadThread.h -o debug/moc_BCAccountLoadThread.cpp
    230310
    231 debug/moc_DASQLiteAccountListManager.cpp: src/persistence/storage/DASQLiteAccountListManager.h
    232         /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/storage/DASQLiteAccountListManager.h -o debug/moc_DASQLiteAccountListManager.cpp
    233 
    234311debug/moc_DAAccountManager.cpp: src/persistence/DAAccountManager.h
    235312        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DAAccountManager.h -o debug/moc_DAAccountManager.cpp
     313
     314debug/moc_BCAccountManager.cpp: src/business/BCAccountLoadManager.h \
     315                src/business/BCAccountLoadThread.h \
     316                src/business/BCAccountManager.h
     317        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCAccountManager.h -o debug/moc_BCAccountManager.cpp
    236318
    237319debug/moc_BCAccountLoadManager.cpp: src/business/BCAccountLoadThread.h \
    … …  
    249331        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DAGroupManager.h -o debug/moc_DAGroupManager.cpp
    250332
     333debug/moc_BCGroupManager.cpp: src/business/BCGroupManager.h
     334        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCGroupManager.h -o debug/moc_BCGroupManager.cpp
     335
    251336debug/moc_vceditcontact.cpp: ui_vceditcontact.h \
    252337                src/ui/VCEditContact/vceditcontact.h
    … …  
    260345        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCAddressBook/vcaddressbook.h -o debug/moc_vcaddressbook.cpp
    261346
    262 debug/moc_DASQLiteStorage.cpp: src/persistence/storage/DASQLiteStorage.h
    263         /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/storage/DASQLiteStorage.h -o debug/moc_DASQLiteStorage.cpp
     347debug/moc_BCContactManager.cpp: src/business/BCContactManager.h
     348        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCContactManager.h -o debug/moc_BCContactManager.cpp
    264349
    265350debug/moc_DAContactManager.cpp: src/persistence/DAContactManager.h
    … …  
    271356debug/moc_vcmain.cpp: src/business/BCAccountLoadManager.h \
    272357                src/business/BCAccountLoadThread.h \
    273                 src/ui/completers/AliasModel.h \
    274358                ui_vcmain.h \
     359                src/ui/models/contactgroupmodel.h \
     360                src/business/BCContactManager.h \
     361                src/business/BCGroupManager.h \
    275362                src/ui/VCMain/vcmain.h
    276363        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCMain/vcmain.h -o debug/moc_vcmain.cpp
    … …  
    292379                lib/refresh.png \
    293380                lib/users.png \
     381                lib/edit.png \
    294382                lib/address_book.png \
    295383                lib/preferences.png \
    … …  
    346434####### Compile
    347435
    348 debug/aliascompleter.o: src/ui/completers/aliascompleter.cpp src/ui/completers/aliascompleter.h
    349         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/aliascompleter.o src/ui/completers/aliascompleter.cpp
    350 
    351 debug/AliasModel.o: src/ui/completers/AliasModel.cpp src/ui/completers/AliasModel.h
    352         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/AliasModel.o src/ui/completers/AliasModel.cpp
    353 
    354 debug/FilteredPopupCompleter.o: src/ui/completers/FilteredPopupCompleter.cpp src/ui/completers/FilteredPopupCompleter.h
    355         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/FilteredPopupCompleter.o src/ui/completers/FilteredPopupCompleter.cpp
     436debug/DAAccountListManager.o: src/persistence/storage/DAAccountListManager.cpp src/persistence/storage/DAAccountListManager.h \
     437                src/business/BCGatewayManager.h \
     438                src/persistence/storage/DAStorage.h
     439        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/DAAccountListManager.o src/persistence/storage/DAAccountListManager.cpp
     440
     441debug/DAStorage.o: src/persistence/storage/DAStorage.cpp src/persistence/storage/DAStorage.h \
     442                src/business/BCSettings.h \
     443                src/business/BCContactManager.h
     444        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/DAStorage.o src/persistence/storage/DAStorage.cpp
     445
     446debug/contactgroupmodel.o: src/ui/models/contactgroupmodel.cpp src/ui/models/contactgroupmodel.h \
     447                src/business/BCContactManager.h \
     448                src/business/BCGroupManager.h
     449        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/contactgroupmodel.o src/ui/models/contactgroupmodel.cpp
     450
     451debug/aliascompletionmodel.o: src/ui/models/aliascompletionmodel.cpp src/ui/models/aliascompletionmodel.h \
     452                src/ui/completers/bettercompleter.h
     453        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/aliascompletionmodel.o src/ui/models/aliascompletionmodel.cpp
     454
     455debug/bettercompleter.o: src/ui/completers/bettercompleter.cpp src/ui/completers/bettercompleter.h
     456        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/bettercompleter.o src/ui/completers/bettercompleter.cpp
     457
     458debug/accountmodel.o: src/ui/models/accountmodel.cpp src/ui/models/accountmodel.h \
     459                src/business/BCAccountManager.h \
     460                src/business/BCAccountLoadManager.h \
     461                src/business/BCAccountLoadThread.h
     462        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/accountmodel.o src/ui/models/accountmodel.cpp
     463
     464debug/aligndelegate.o: src/ui/delegates/aligndelegate.cpp src/ui/delegates/aligndelegate.h
     465        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/aligndelegate.o src/ui/delegates/aligndelegate.cpp
     466
     467debug/clearbutton.o: src/ui/components/clearbutton.cpp src/ui/components/clearbutton.h
     468        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/clearbutton.o src/ui/components/clearbutton.cpp
     469
     470debug/lineedit.o: src/ui/components/lineedit.cpp src/ui/components/lineedit.h \
     471                src/ui/components/lineedit_p.h
     472        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/lineedit.o src/ui/components/lineedit.cpp
     473
     474debug/searchbutton.o: src/ui/components/searchbutton.cpp src/ui/components/searchbutton.h
     475        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/searchbutton.o src/ui/components/searchbutton.cpp
     476
     477debug/searchlineedit.o: src/ui/components/searchlineedit.cpp src/ui/components/searchlineedit.h \
     478                src/ui/components/lineedit.h \
     479                src/ui/components/clearbutton.h \
     480                src/ui/components/searchbutton.h
     481        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/searchlineedit.o src/ui/components/searchlineedit.cpp
    356482
    357483debug/vceditaccount.o: src/ui/VCEditAccount/vceditaccount.cpp src/ui/VCEditAccount/vceditaccount.h \
    … …  
    365491debug/vcaccountlist.o: src/ui/VCAccountList/vcaccountlist.cpp src/ui/VCAccountList/vcaccountlist.h \
    366492                ui_vcaccountlist.h \
     493                src/ui/models/accountmodel.h \
     494                src/business/BCAccountManager.h \
     495                src/business/BCAccountLoadManager.h \
     496                src/business/BCAccountLoadThread.h \
    367497                src/ui/VCEditAccount/vceditaccount.h \
    368498                ui_vceditaccount.h \
    369499                src/ui/UIHelper.h \
    370                 src/business/BCAccountManager.h \
    371                 src/business/BCAccountLoadManager.h \
    372                 src/business/BCAccountLoadThread.h \
    373                 src/business/BusinessFactory.h
     500                src/business/BusinessFactory.h \
     501                src/ui/completers/bettercompleter.h
    374502        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/vcaccountlist.o src/ui/VCAccountList/vcaccountlist.cpp
    375503
    … …  
    381509        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BCGatewayManager.o src/business/BCGatewayManager.cpp
    382510
    383 debug/DASQLiteAccountListManager.o: src/persistence/storage/DASQLiteAccountListManager.cpp src/persistence/storage/DASQLiteAccountListManager.h \
    384                 src/business/BCGatewayManager.h \
    385                 src/persistence/storage/DASQLiteStorage.h
    386         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/DASQLiteAccountListManager.o src/persistence/storage/DASQLiteAccountListManager.cpp
    387 
    388511debug/DAAccountManager.o: src/persistence/DAAccountManager.cpp src/persistence/DAAccountManager.h \
    389                 src/persistence/storage/DASQLiteAccountListManager.h
     512                src/persistence/storage/DAAccountListManager.h
    390513        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/DAAccountManager.o src/persistence/DAAccountManager.cpp
    391514
    … …  
    450573        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BusinessFactory.o src/business/BusinessFactory.cpp
    451574
    452 debug/DASQLiteStorage.o: src/persistence/storage/DASQLiteStorage.cpp src/persistence/storage/DASQLiteStorage.h \
    453                 src/business/BCSettings.h \
    454                 src/business/BCContactManager.h
    455         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/DASQLiteStorage.o src/persistence/storage/DASQLiteStorage.cpp
    456 
    457575debug/BCSettings.o: src/business/BCSettings.cpp src/business/BCSettings.h \
    458576                src/persistence/PersistenceFactory.h
    … …  
    464582                src/persistence/DAGroupManager.h \
    465583                src/persistence/DASettings.h \
    466                 src/persistence/storage/DASQLiteStorage.h
     584                src/persistence/storage/DAStorage.h
    467585        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/PersistenceFactory.o src/persistence/PersistenceFactory.cpp
    468586
    … …  
    474592                src/business/BCAccountLoadManager.h \
    475593                src/business/BCAccountLoadThread.h \
    476                 src/ui/completers/AliasModel.h \
    477594                ui_vcmain.h \
     595                src/ui/models/contactgroupmodel.h \
     596                src/business/BCContactManager.h \
     597                src/business/BCGroupManager.h \
    478598                src/business/BCSettings.h \
    479599                src/business/BCAccountManager.h \
    … …  
    485605                src/business/BCAccountLoadManager.h \
    486606                src/business/BCAccountLoadThread.h \
    487                 src/ui/completers/AliasModel.h \
    488607                ui_vcmain.h \
    489                 src/business/BCAccountManager.h \
     608                src/ui/models/contactgroupmodel.h \
    490609                src/business/BCContactManager.h \
    491610                src/business/BCGroupManager.h \
     611                src/business/BCAccountManager.h \
    492612                src/ui/UIHelper.h \
    493613                src/ui/VCAccountList/vcaccountlist.h \
    494614                ui_vcaccountlist.h \
     615                src/ui/models/accountmodel.h \
    495616                src/ui/VCAddressBook/vcaddressbook.h \
    496617                ui_vcaddressbook.h \
    497618                src/ui/VCSettings/vcsettings.h \
    498                 ui_vcsettings.h
     619                ui_vcsettings.h \
     620                src/ui/completers/bettercompleter.h \
     621                src/ui/models/aliascompletionmodel.h \
     622                src/ui/delegates/aligndelegate.h
    499623        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/vcmain.o src/ui/VCMain/vcmain.cpp
    500624
    … …  
    505629        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/vcsettings.o src/ui/VCSettings/vcsettings.cpp
    506630
    507 debug/moc_aliascompleter.o: debug/moc_aliascompleter.cpp
    508         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_aliascompleter.o debug/moc_aliascompleter.cpp
     631debug/moc_DAAccountListManager.o: debug/moc_DAAccountListManager.cpp
     632        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DAAccountListManager.o debug/moc_DAAccountListManager.cpp
     633
     634debug/moc_DAStorage.o: debug/moc_DAStorage.cpp
     635        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DAStorage.o debug/moc_DAStorage.cpp
     636
     637debug/moc_contactgroupmodel.o: debug/moc_contactgroupmodel.cpp
     638        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_contactgroupmodel.o debug/moc_contactgroupmodel.cpp
     639
     640debug/moc_aliascompletionmodel.o: debug/moc_aliascompletionmodel.cpp
     641        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_aliascompletionmodel.o debug/moc_aliascompletionmodel.cpp
     642
     643debug/moc_bettercompleter.o: debug/moc_bettercompleter.cpp
     644        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_bettercompleter.o debug/moc_bettercompleter.cpp
     645
     646debug/moc_accountmodel.o: debug/moc_accountmodel.cpp
     647        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_accountmodel.o debug/moc_accountmodel.cpp
     648
     649debug/moc_aligndelegate.o: debug/moc_aligndelegate.cpp
     650        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_aligndelegate.o debug/moc_aligndelegate.cpp
     651
     652debug/moc_clearbutton.o: debug/moc_clearbutton.cpp
     653        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_clearbutton.o debug/moc_clearbutton.cpp
     654
     655debug/moc_lineedit.o: debug/moc_lineedit.cpp
     656        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_lineedit.o debug/moc_lineedit.cpp
     657
     658debug/moc_lineedit_p.o: debug/moc_lineedit_p.cpp
     659        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_lineedit_p.o debug/moc_lineedit_p.cpp
     660
     661debug/moc_searchbutton.o: debug/moc_searchbutton.cpp
     662        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_searchbutton.o debug/moc_searchbutton.cpp
     663
     664debug/moc_searchlineedit.o: debug/moc_searchlineedit.cpp
     665        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_searchlineedit.o debug/moc_searchlineedit.cpp
    509666
    510667debug/moc_vceditaccount.o: debug/moc_vceditaccount.cpp
    … …  
    517674        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCAccountLoadThread.o debug/moc_BCAccountLoadThread.cpp
    518675
    519 debug/moc_DASQLiteAccountListManager.o: debug/moc_DASQLiteAccountListManager.cpp
    520         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DASQLiteAccountListManager.o debug/moc_DASQLiteAccountListManager.cpp
    521 
    522676debug/moc_DAAccountManager.o: debug/moc_DAAccountManager.cpp
    523677        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DAAccountManager.o debug/moc_DAAccountManager.cpp
    524678
     679debug/moc_BCAccountManager.o: debug/moc_BCAccountManager.cpp
     680        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCAccountManager.o debug/moc_BCAccountManager.cpp
     681
    525682debug/moc_BCAccountLoadManager.o: debug/moc_BCAccountLoadManager.cpp
    526683        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCAccountLoadManager.o debug/moc_BCAccountLoadManager.cpp
    … …  
    535692        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DAGroupManager.o debug/moc_DAGroupManager.cpp
    536693
     694debug/moc_BCGroupManager.o: debug/moc_BCGroupManager.cpp
     695        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCGroupManager.o debug/moc_BCGroupManager.cpp
     696
    537697debug/moc_vceditcontact.o: debug/moc_vceditcontact.cpp
    538698        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_vceditcontact.o debug/moc_vceditcontact.cpp
    … …  
    544704        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_vcaddressbook.o debug/moc_vcaddressbook.cpp
    545705
    546 debug/moc_DASQLiteStorage.o: debug/moc_DASQLiteStorage.cpp
    547         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DASQLiteStorage.o debug/moc_DASQLiteStorage.cpp
     706debug/moc_BCContactManager.o: debug/moc_BCContactManager.cpp
     707        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCContactManager.o debug/moc_BCContactManager.cpp
    548708
    549709debug/moc_DAContactManager.o: debug/moc_DAContactManager.cpp

  • Makefile.Release

    r42 r43  
    11#############################################################################
    22# Makefile for building: smssender-bin
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Thu Jan 14 13:21:33 2010
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 26 20:33:24 2010
    44# Project:  smssender.pro
    55# Template: app
    … …  
    1010CC            = gcc
    1111CXX           = g++
    12 DEFINES       = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
     12DEFINES       = -DQT_NO_DEBUG -DQT_SQL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
    1313CFLAGS        = -pipe -O2 -D_REENTRANT -Wall -W $(DEFINES)
    1414CXXFLAGS      = -pipe -O2 -D_REENTRANT -Wall -W $(DEFINES)
    15 INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -Iapp -Ilib/libinterfaces/src/business -Ilib/libinterfaces/src/exceptions -Ilib/libinterfaces/src -Ilib/libdatatypes/src/business -Ilib/libutils/src -Irelease -I.
     15INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtSql -I/usr/include/qt4 -Iapp -Isrc/ui/components -Ilib/libinterfaces/src/business -Ilib/libinterfaces/src/exceptions -Ilib/libinterfaces/src -Ilib/libdatatypes/src/business -Ilib/libdatatypes/src -Ilib/libutils/src -Irelease -I.
    1616LINK          = g++
    1717LFLAGS        = -Wl,-O1
    18 LIBS          = $(SUBLIBS)  -L/usr/lib -Llib/ -ltntdb -lcrypto++ -ldatatypes -linterfaces -lutils -lpthread -lQtGui -lQtCore
     18LIBS          = $(SUBLIBS)  -L/usr/lib -Llib/ -ltntdb -lcrypto++ -ldatatypes -lutils -linterfaces -lpthread -lQtSql -lQtGui -lQtCore
    1919AR            = ar cqs
    2020RANLIB        =
    … …  
    4242####### Files
    4343
    44 SOURCES       = src/ui/completers/aliascompleter.cpp \
    45                 src/ui/completers/AliasModel.cpp \
    46                 src/ui/completers/FilteredPopupCompleter.cpp \
     44SOURCES       = src/persistence/storage/DAAccountListManager.cpp \
     45                src/persistence/storage/DAStorage.cpp \
     46                src/ui/models/contactgroupmodel.cpp \
     47                src/ui/models/aliascompletionmodel.cpp \
     48                src/ui/completers/bettercompleter.cpp \
     49                src/ui/models/accountmodel.cpp \
     50                src/ui/delegates/aligndelegate.cpp \
     51                src/ui/components/clearbutton.cpp \
     52                src/ui/components/lineedit.cpp \
     53                src/ui/components/searchbutton.cpp \
     54                src/ui/components/searchlineedit.cpp \
    4755                src/ui/VCEditAccount/vceditaccount.cpp \
    4856                src/ui/VCAccountList/vcaccountlist.cpp \
    4957                src/business/BCAccountLoadThread.cpp \
    5058                src/business/BCGatewayManager.cpp \
    51                 src/persistence/storage/DASQLiteAccountListManager.cpp \
    5259                src/persistence/DAAccountManager.cpp \
    5360                src/business/BCAccountManager.cpp \
    … …  
    6370                src/business/BCContactManager.cpp \
    6471                src/business/BusinessFactory.cpp \
    65                 src/persistence/storage/DASQLiteStorage.cpp \
    6672                src/business/BCSettings.cpp \
    6773                src/persistence/PersistenceFactory.cpp \
    … …  
    6975                src/main.cpp \
    7076                src/ui/VCMain/vcmain.cpp \
    71                 src/ui/VCSettings/vcsettings.cpp release/moc_aliascompleter.cpp \
     77                src/ui/VCSettings/vcsettings.cpp release/moc_DAAccountListManager.cpp \
     78                release/moc_DAStorage.cpp \
     79                release/moc_contactgroupmodel.cpp \
     80                release/moc_aliascompletionmodel.cpp \
     81                release/moc_bettercompleter.cpp \
     82                release/moc_accountmodel.cpp \
     83                release/moc_aligndelegate.cpp \
     84                release/moc_clearbutton.cpp \
     85                release/moc_lineedit.cpp \
     86                release/moc_lineedit_p.cpp \
     87                release/moc_searchbutton.cpp \
     88                release/moc_searchlineedit.cpp \
    7289                release/moc_vceditaccount.cpp \
    7390                release/moc_vcaccountlist.cpp \
    7491                release/moc_BCAccountLoadThread.cpp \
    75                 release/moc_DASQLiteAccountListManager.cpp \
    7692                release/moc_DAAccountManager.cpp \
     93                release/moc_BCAccountManager.cpp \
    7794                release/moc_BCAccountLoadManager.cpp \
    7895                release/moc_BCLibraryLoader.cpp \
    7996                release/moc_vceditgroup.cpp \
    8097                release/moc_DAGroupManager.cpp \
     98                release/moc_BCGroupManager.cpp \
    8199                release/moc_vceditcontact.cpp \
    82100                release/moc_DASettings.cpp \
    83101                release/moc_vcaddressbook.cpp \
    84                 release/moc_DASQLiteStorage.cpp \
     102                release/moc_BCContactManager.cpp \
    85103                release/moc_DAContactManager.cpp \
    86104                release/moc_PersistenceFactory.cpp \
    … …  
    88106                release/moc_vcsettings.cpp \
    89107                release/qrc_resource.cpp
    90 OBJECTS       = release/aliascompleter.o \
    91                 release/AliasModel.o \
    92                 release/FilteredPopupCompleter.o \
     108OBJECTS       = release/DAAccountListManager.o \
     109                release/DAStorage.o \
     110                release/contactgroupmodel.o \
     111                release/aliascompletionmodel.o \
     112                release/bettercompleter.o \
     113                release/accountmodel.o \
     114                release/aligndelegate.o \
     115                release/clearbutton.o \
     116                release/lineedit.o \
     117                release/searchbutton.o \
     118                release/searchlineedit.o \
    93119                release/vceditaccount.o \
    94120                release/vcaccountlist.o \
    95121                release/BCAccountLoadThread.o \
    96122                release/BCGatewayManager.o \
    97                 release/DASQLiteAccountListManager.o \
    98123                release/DAAccountManager.o \
    99124                release/BCAccountManager.o \
    … …  
    109134                release/BCContactManager.o \
    110135                release/BusinessFactory.o \
    111                 release/DASQLiteStorage.o \
    112136                release/BCSettings.o \
    113137                release/PersistenceFactory.o \
    … …  
    116140                release/vcmain.o \
    117141                release/vcsettings.o \
    118                 release/moc_aliascompleter.o \
     142                release/moc_DAAccountListManager.o \
     143                release/moc_DAStorage.o \
     144                release/moc_contactgroupmodel.o \
     145                release/moc_aliascompletionmodel.o \
     146                release/moc_bettercompleter.o \
     147                release/moc_accountmodel.o \
     148                release/moc_aligndelegate.o \
     149                release/moc_clearbutton.o \
     150                release/moc_lineedit.o \
     151                release/moc_lineedit_p.o \
     152                release/moc_searchbutton.o \
     153                release/moc_searchlineedit.o \
    119154                release/moc_vceditaccount.o \
    120155                release/moc_vcaccountlist.o \
    121156                release/moc_BCAccountLoadThread.o \
    122                 release/moc_DASQLiteAccountListManager.o \
    123157                release/moc_DAAccountManager.o \
     158                release/moc_BCAccountManager.o \
    124159                release/moc_BCAccountLoadManager.o \
    125160                release/moc_BCLibraryLoader.o \
    126161                release/moc_vceditgroup.o \
    127162                release/moc_DAGroupManager.o \
     163                release/moc_BCGroupManager.o \
    128164                release/moc_vceditcontact.o \
    129165                release/moc_DASettings.o \
    130166                release/moc_vcaddressbook.o \
    131                 release/moc_DASQLiteStorage.o \
     167                release/moc_BCContactManager.o \
    132168                release/moc_DAContactManager.o \
    133169                release/moc_PersistenceFactory.o \
    … …  
    193229dist:
    194230        @$(CHK_DIR_EXISTS) release/smssender-bin3.0.0 || $(MKDIR) release/smssender-bin3.0.0
    195         $(COPY_FILE) --parents $(SOURCES) $(DIST) release/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/ui/completers/aliascompleter.h src/ui/completers/AliasModel.h src/ui/completers/FilteredPopupCompleter.h src/ui/VCEditAccount/vceditaccount.h src/ui/VCAccountList/vcaccountlist.h src/business/BCAccountLoadThread.h src/business/BCGatewayManager.h src/persistence/storage/DASQLiteAccountListManager.h src/persistence/DAAccountManager.h src/business/BCAccountManager.h src/business/BCAccountLoadManager.h src/business/BCLibraryLoader.h src/ui/VCEditGroup/vceditgroup.h src/persistence/DAGroupManager.h src/business/BCGroupManager.h src/ui/UIHelper.h src/ui/VCEditContact/vceditcontact.h src/persistence/DASettings.h src/ui/VCAddressBook/vcaddressbook.h src/business/BCContactManager.h src/business/BusinessFactory.h src/persistence/storage/DASQLiteStorage.h src/persistence/DAContactManager.h src/business/BCSettings.h src/persistence/PersistenceFactory.h src/ui/VCMain/vcmain.h src/ui/VCSettings/vcsettings.h release/smssender-bin3.0.0/ && $(COPY_FILE) --parents lib/resource.qrc release/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/ui/completers/aliascompleter.cpp src/ui/completers/AliasModel.cpp src/ui/completers/FilteredPopupCompleter.cpp src/ui/VCEditAccount/vceditaccount.cpp src/ui/VCAccountList/vcaccountlist.cpp src/business/BCAccountLoadThread.cpp src/business/BCGatewayManager.cpp src/persistence/storage/DASQLiteAccountListManager.cpp src/persistence/DAAccountManager.cpp src/business/BCAccountManager.cpp src/business/BCAccountLoadManager.cpp src/business/BCLibraryLoader.cpp src/ui/VCEditGroup/vceditgroup.cpp src/persistence/DAGroupManager.cpp src/business/BCGroupManager.cpp src/ui/UIHelper.cpp src/ui/VCEditContact/vceditcontact.cpp src/persistence/DASettings.cpp src/ui/VCAddressBook/vcaddressbook.cpp src/business/BCContactManager.cpp src/business/BusinessFactory.cpp src/persistence/storage/DASQLiteStorage.cpp src/business/BCSettings.cpp src/persistence/PersistenceFactory.cpp src/persistence/DAContactManager.cpp src/main.cpp src/ui/VCMain/vcmain.cpp src/ui/VCSettings/vcsettings.cpp release/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/ui/VCEditAccount/vceditaccount.ui src/ui/VCAccountList/vcaccountlist.ui src/ui/VCEditGroup/vceditgroup.ui src/ui/VCEditContact/vceditcontact.ui src/ui/VCAddressBook/vcaddressbook.ui src/ui/VCMain/vcmain.ui src/ui/VCSettings/vcsettings.ui release/smssender-bin3.0.0/ && $(COPY_FILE) --parents locale/de.ts release/smssender-bin3.0.0/ && (cd `dirname release/smssender-bin3.0.0` && $(TAR) smssender-bin3.0.0.tar smssender-bin3.0.0 && $(COMPRESS) smssender-bin3.0.0.tar) && $(MOVE) `dirname release/smssender-bin3.0.0`/smssender-bin3.0.0.tar.gz . && $(DEL_FILE) -r release/smssender-bin3.0.0
     231        $(COPY_FILE) --parents $(SOURCES) $(DIST) release/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/persistence/storage/DAAccountListManager.h src/persistence/storage/DAStorage.h src/ui/models/contactgroupmodel.h src/ui/models/aliascompletionmodel.h src/ui/completers/bettercompleter.h src/ui/models/accountmodel.h src/ui/delegates/aligndelegate.h src/ui/components/clearbutton.h src/ui/components/lineedit.h src/ui/components/lineedit_p.h src/ui/components/searchbutton.h src/ui/components/searchlineedit.h src/ui/VCEditAccount/vceditaccount.h src/ui/VCAccountList/vcaccountlist.h src/business/BCAccountLoadThread.h src/business/BCGatewayManager.h src/persistence/DAAccountManager.h src/business/BCAccountManager.h src/business/BCAccountLoadManager.h src/business/BCLibraryLoader.h src/ui/VCEditGroup/vceditgroup.h src/persistence/DAGroupManager.h src/business/BCGroupManager.h src/ui/UIHelper.h src/ui/VCEditContact/vceditcontact.h src/persistence/DASettings.h src/ui/VCAddressBook/vcaddressbook.h src/business/BCContactManager.h src/business/BusinessFactory.h src/persistence/DAContactManager.h src/business/BCSettings.h src/persistence/PersistenceFactory.h src/ui/VCMain/vcmain.h src/ui/VCSettings/vcsettings.h release/smssender-bin3.0.0/ && $(COPY_FILE) --parents lib/resource.qrc release/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/persistence/storage/DAAccountListManager.cpp src/persistence/storage/DAStorage.cpp src/ui/models/contactgroupmodel.cpp src/ui/models/aliascompletionmodel.cpp src/ui/completers/bettercompleter.cpp src/ui/models/accountmodel.cpp src/ui/delegates/aligndelegate.cpp src/ui/components/clearbutton.cpp src/ui/components/lineedit.cpp src/ui/components/searchbutton.cpp src/ui/components/searchlineedit.cpp src/ui/VCEditAccount/vceditaccount.cpp src/ui/VCAccountList/vcaccountlist.cpp src/business/BCAccountLoadThread.cpp src/business/BCGatewayManager.cpp src/persistence/DAAccountManager.cpp src/business/BCAccountManager.cpp src/business/BCAccountLoadManager.cpp src/business/BCLibraryLoader.cpp src/ui/VCEditGroup/vceditgroup.cpp src/persistence/DAGroupManager.cpp src/business/BCGroupManager.cpp src/ui/UIHelper.cpp src/ui/VCEditContact/vceditcontact.cpp src/persistence/DASettings.cpp src/ui/VCAddressBook/vcaddressbook.cpp src/business/BCContactManager.cpp src/business/BusinessFactory.cpp src/business/BCSettings.cpp src/persistence/PersistenceFactory.cpp src/persistence/DAContactManager.cpp src/main.cpp src/ui/VCMain/vcmain.cpp src/ui/VCSettings/vcsettings.cpp release/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/ui/VCEditAccount/vceditaccount.ui src/ui/VCAccountList/vcaccountlist.ui src/ui/VCEditGroup/vceditgroup.ui src/ui/VCEditContact/vceditcontact.ui src/ui/VCAddressBook/vcaddressbook.ui src/ui/VCMain/vcmain.ui src/ui/VCSettings/vcsettings.ui release/smssender-bin3.0.0/ && $(COPY_FILE) --parents locale/de.ts release/smssender-bin3.0.0/ && (cd `dirname release/smssender-bin3.0.0` && $(TAR) smssender-bin3.0.0.tar smssender-bin3.0.0 && $(COMPRESS) smssender-bin3.0.0.tar) && $(MOVE) `dirname release/smssender-bin3.0.0`/smssender-bin3.0.0.tar.gz . && $(DEL_FILE) -r release/smssender-bin3.0.0
    196232
    197233
    … …  
    212248mocables: compiler_moc_header_make_all compiler_moc_source_make_all
    213249
    214 compiler_moc_header_make_all: release/moc_aliascompleter.cpp release/moc_vceditaccount.cpp release/moc_vcaccountlist.cpp release/moc_BCAccountLoadThread.cpp release/moc_DASQLiteAccountListManager.cpp release/moc_DAAccountManager.cpp release/moc_BCAccountLoadManager.cpp release/moc_BCLibraryLoader.cpp release/moc_vceditgroup.cpp release/moc_DAGroupManager.cpp release/moc_vceditcontact.cpp release/moc_DASettings.cpp release/moc_vcaddressbook.cpp release/moc_DASQLiteStorage.cpp release/moc_DAContactManager.cpp release/moc_PersistenceFactory.cpp release/moc_vcmain.cpp release/moc_vcsettings.cpp
     250compiler_moc_header_make_all: release/moc_DAAccountListManager.cpp release/moc_DAStorage.cpp release/moc_contactgroupmodel.cpp release/moc_aliascompletionmodel.cpp release/moc_bettercompleter.cpp release/moc_accountmodel.cpp release/moc_aligndelegate.cpp release/moc_clearbutton.cpp release/moc_lineedit.cpp release/moc_lineedit_p.cpp release/moc_searchbutton.cpp release/moc_searchlineedit.cpp release/moc_vceditaccount.cpp release/moc_vcaccountlist.cpp release/moc_BCAccountLoadThread.cpp release/moc_DAAccountManager.cpp release/moc_BCAccountManager.cpp release/moc_BCAccountLoadManager.cpp release/moc_BCLibraryLoader.cpp release/moc_vceditgroup.cpp release/moc_DAGroupManager.cpp release/moc_BCGroupManager.cpp release/moc_vceditcontact.cpp release/moc_DASettings.cpp release/moc_vcaddressbook.cpp release/moc_BCContactManager.cpp release/moc_DAContactManager.cpp release/moc_PersistenceFactory.cpp release/moc_vcmain.cpp release/moc_vcsettings.cpp
    215251compiler_moc_header_clean:
    216         -$(DEL_FILE) release/moc_aliascompleter.cpp release/moc_vceditaccount.cpp release/moc_vcaccountlist.cpp release/moc_BCAccountLoadThread.cpp release/moc_DASQLiteAccountListManager.cpp release/moc_DAAccountManager.cpp release/moc_BCAccountLoadManager.cpp release/moc_BCLibraryLoader.cpp release/moc_vceditgroup.cpp release/moc_DAGroupManager.cpp release/moc_vceditcontact.cpp release/moc_DASettings.cpp release/moc_vcaddressbook.cpp release/moc_DASQLiteStorage.cpp release/moc_DAContactManager.cpp release/moc_PersistenceFactory.cpp release/moc_vcmain.cpp release/moc_vcsettings.cpp
    217 release/moc_aliascompleter.cpp: src/ui/completers/aliascompleter.h
    218         /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/completers/aliascompleter.h -o release/moc_aliascompleter.cpp
     252        -$(DEL_FILE) release/moc_DAAccountListManager.cpp release/moc_DAStorage.cpp release/moc_contactgroupmodel.cpp release/moc_aliascompletionmodel.cpp release/moc_bettercompleter.cpp release/moc_accountmodel.cpp release/moc_aligndelegate.cpp release/moc_clearbutton.cpp release/moc_lineedit.cpp release/moc_lineedit_p.cpp release/moc_searchbutton.cpp release/moc_searchlineedit.cpp release/moc_vceditaccount.cpp release/moc_vcaccountlist.cpp release/moc_BCAccountLoadThread.cpp release/moc_DAAccountManager.cpp release/moc_BCAccountManager.cpp release/moc_BCAccountLoadManager.cpp release/moc_BCLibraryLoader.cpp release/moc_vceditgroup.cpp release/moc_DAGroupManager.cpp release/moc_BCGroupManager.cpp release/moc_vceditcontact.cpp release/moc_DASettings.cpp release/moc_vcaddressbook.cpp release/moc_BCContactManager.cpp release/moc_DAContactManager.cpp release/moc_PersistenceFactory.cpp release/moc_vcmain.cpp release/moc_vcsettings.cpp
     253release/moc_DAAccountListManager.cpp: src/persistence/storage/DAAccountListManager.h
     254        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/storage/DAAccountListManager.h -o release/moc_DAAccountListManager.cpp
     255
     256release/moc_DAStorage.cpp: src/persistence/storage/DAStorage.h
     257        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/storage/DAStorage.h -o release/moc_DAStorage.cpp
     258
     259release/moc_contactgroupmodel.cpp: src/business/BCContactManager.h \
     260                src/business/BCGroupManager.h \
     261                src/ui/models/contactgroupmodel.h
     262        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/models/contactgroupmodel.h -o release/moc_contactgroupmodel.cpp
     263
     264release/moc_aliascompletionmodel.cpp: src/ui/completers/bettercompleter.h \
     265                src/ui/models/aliascompletionmodel.h
     266        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/models/aliascompletionmodel.h -o release/moc_aliascompletionmodel.cpp
     267
     268release/moc_bettercompleter.cpp: src/ui/completers/bettercompleter.h
     269        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/completers/bettercompleter.h -o release/moc_bettercompleter.cpp
     270
     271release/moc_accountmodel.cpp: src/business/BCAccountManager.h \
     272                src/business/BCAccountLoadManager.h \
     273                src/business/BCAccountLoadThread.h \
     274                src/ui/models/accountmodel.h
     275        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/models/accountmodel.h -o release/moc_accountmodel.cpp
     276
     277release/moc_aligndelegate.cpp: src/ui/delegates/aligndelegate.h
     278        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/delegates/aligndelegate.h -o release/moc_aligndelegate.cpp
     279
     280release/moc_clearbutton.cpp: src/ui/components/clearbutton.h
     281        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/components/clearbutton.h -o release/moc_clearbutton.cpp
     282
     283release/moc_lineedit.cpp: src/ui/components/lineedit.h
     284        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/components/lineedit.h -o release/moc_lineedit.cpp
     285
     286release/moc_lineedit_p.cpp: src/ui/components/lineedit_p.h
     287        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/components/lineedit_p.h -o release/moc_lineedit_p.cpp
     288
     289release/moc_searchbutton.cpp: src/ui/components/searchbutton.h
     290        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/components/searchbutton.h -o release/moc_searchbutton.cpp
     291
     292release/moc_searchlineedit.cpp: src/ui/components/lineedit.h \
     293                src/ui/components/searchlineedit.h
     294        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/components/searchlineedit.h -o release/moc_searchlineedit.cpp
    219295
    220296release/moc_vceditaccount.cpp: ui_vceditaccount.h \
    … …  
    223299
    224300release/moc_vcaccountlist.cpp: ui_vcaccountlist.h \
     301                src/ui/models/accountmodel.h \
     302                src/business/BCAccountManager.h \
     303                src/business/BCAccountLoadManager.h \
     304                src/business/BCAccountLoadThread.h \
    225305                src/ui/VCAccountList/vcaccountlist.h
    226306        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCAccountList/vcaccountlist.h -o release/moc_vcaccountlist.cpp
    … …  
    229309        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCAccountLoadThread.h -o release/moc_BCAccountLoadThread.cpp
    230310
    231 release/moc_DASQLiteAccountListManager.cpp: src/persistence/storage/DASQLiteAccountListManager.h
    232         /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/storage/DASQLiteAccountListManager.h -o release/moc_DASQLiteAccountListManager.cpp
    233 
    234311release/moc_DAAccountManager.cpp: src/persistence/DAAccountManager.h
    235312        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DAAccountManager.h -o release/moc_DAAccountManager.cpp
     313
     314release/moc_BCAccountManager.cpp: src/business/BCAccountLoadManager.h \
     315                src/business/BCAccountLoadThread.h \
     316                src/business/BCAccountManager.h
     317        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCAccountManager.h -o release/moc_BCAccountManager.cpp
    236318
    237319release/moc_BCAccountLoadManager.cpp: src/business/BCAccountLoadThread.h \
    … …  
    249331        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DAGroupManager.h -o release/moc_DAGroupManager.cpp
    250332
     333release/moc_BCGroupManager.cpp: src/business/BCGroupManager.h
     334        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCGroupManager.h -o release/moc_BCGroupManager.cpp
     335
    251336release/moc_vceditcontact.cpp: ui_vceditcontact.h \
    252337                src/ui/VCEditContact/vceditcontact.h
    … …  
    260345        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCAddressBook/vcaddressbook.h -o release/moc_vcaddressbook.cpp
    261346
    262 release/moc_DASQLiteStorage.cpp: src/persistence/storage/DASQLiteStorage.h
    263         /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/storage/DASQLiteStorage.h -o release/moc_DASQLiteStorage.cpp
     347release/moc_BCContactManager.cpp: src/business/BCContactManager.h
     348        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCContactManager.h -o release/moc_BCContactManager.cpp
    264349
    265350release/moc_DAContactManager.cpp: src/persistence/DAContactManager.h
    … …  
    271356release/moc_vcmain.cpp: src/business/BCAccountLoadManager.h \
    272357                src/business/BCAccountLoadThread.h \
    273                 src/ui/completers/AliasModel.h \
    274358                ui_vcmain.h \
     359                src/ui/models/contactgroupmodel.h \
     360                src/business/BCContactManager.h \
     361                src/business/BCGroupManager.h \
    275362                src/ui/VCMain/vcmain.h
    276363        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCMain/vcmain.h -o release/moc_vcmain.cpp
    … …  
    292379                lib/refresh.png \
    293380                lib/users.png \
     381                lib/edit.png \
    294382                lib/address_book.png \
    295383                lib/preferences.png \
    … …  
    346434####### Compile
    347435
    348 release/aliascompleter.o: src/ui/completers/aliascompleter.cpp src/ui/completers/aliascompleter.h
    349         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/aliascompleter.o src/ui/completers/aliascompleter.cpp
    350 
    351 release/AliasModel.o: src/ui/completers/AliasModel.cpp src/ui/completers/AliasModel.h
    352         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/AliasModel.o src/ui/completers/AliasModel.cpp
    353 
    354 release/FilteredPopupCompleter.o: src/ui/completers/FilteredPopupCompleter.cpp src/ui/completers/FilteredPopupCompleter.h
    355         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/FilteredPopupCompleter.o src/ui/completers/FilteredPopupCompleter.cpp
     436release/DAAccountListManager.o: src/persistence/storage/DAAccountListManager.cpp src/persistence/storage/DAAccountListManager.h \
     437                src/business/BCGatewayManager.h \
     438                src/persistence/storage/DAStorage.h
     439        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/DAAccountListManager.o src/persistence/storage/DAAccountListManager.cpp
     440
     441release/DAStorage.o: src/persistence/storage/DAStorage.cpp src/persistence/storage/DAStorage.h \
     442                src/business/BCSettings.h \
     443                src/business/BCContactManager.h
     444        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/DAStorage.o src/persistence/storage/DAStorage.cpp
     445
     446release/contactgroupmodel.o: src/ui/models/contactgroupmodel.cpp src/ui/models/contactgroupmodel.h \
     447                src/business/BCContactManager.h \
     448                src/business/BCGroupManager.h
     449        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/contactgroupmodel.o src/ui/models/contactgroupmodel.cpp
     450
     451release/aliascompletionmodel.o: src/ui/models/aliascompletionmodel.cpp src/ui/models/aliascompletionmodel.h \
     452                src/ui/completers/bettercompleter.h
     453        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/aliascompletionmodel.o src/ui/models/aliascompletionmodel.cpp
     454
     455release/bettercompleter.o: src/ui/completers/bettercompleter.cpp src/ui/completers/bettercompleter.h
     456        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/bettercompleter.o src/ui/completers/bettercompleter.cpp
     457
     458release/accountmodel.o: src/ui/models/accountmodel.cpp src/ui/models/accountmodel.h \
     459                src/business/BCAccountManager.h \
     460                src/business/BCAccountLoadManager.h \
     461                src/business/BCAccountLoadThread.h
     462        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/accountmodel.o src/ui/models/accountmodel.cpp
     463
     464release/aligndelegate.o: src/ui/delegates/aligndelegate.cpp src/ui/delegates/aligndelegate.h
     465        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/aligndelegate.o src/ui/delegates/aligndelegate.cpp
     466
     467release/clearbutton.o: src/ui/components/clearbutton.cpp src/ui/components/clearbutton.h
     468        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/clearbutton.o src/ui/components/clearbutton.cpp
     469
     470release/lineedit.o: src/ui/components/lineedit.cpp src/ui/components/lineedit.h \
     471                src/ui/components/lineedit_p.h
     472        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/lineedit.o src/ui/components/lineedit.cpp
     473
     474release/searchbutton.o: src/ui/components/searchbutton.cpp src/ui/components/searchbutton.h
     475        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/searchbutton.o src/ui/components/searchbutton.cpp
     476
     477release/searchlineedit.o: src/ui/components/searchlineedit.cpp src/ui/components/searchlineedit.h \
     478                src/ui/components/lineedit.h \
     479                src/ui/components/clearbutton.h \
     480                src/ui/components/searchbutton.h
     481        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/searchlineedit.o src/ui/components/searchlineedit.cpp
    356482
    357483release/vceditaccount.o: src/ui/VCEditAccount/vceditaccount.cpp src/ui/VCEditAccount/vceditaccount.h \
    … …  
    365491release/vcaccountlist.o: src/ui/VCAccountList/vcaccountlist.cpp src/ui/VCAccountList/vcaccountlist.h \
    366492                ui_vcaccountlist.h \
     493                src/ui/models/accountmodel.h \
     494                src/business/BCAccountManager.h \
     495                src/business/BCAccountLoadManager.h \
     496                src/business/BCAccountLoadThread.h \
    367497                src/ui/VCEditAccount/vceditaccount.h \
    368498                ui_vceditaccount.h \
    369499                src/ui/UIHelper.h \
    370                 src/business/BCAccountManager.h \
    371                 src/business/BCAccountLoadManager.h \
    372                 src/business/BCAccountLoadThread.h \
    373                 src/business/BusinessFactory.h
     500                src/business/BusinessFactory.h \
     501                src/ui/completers/bettercompleter.h
    374502        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/vcaccountlist.o src/ui/VCAccountList/vcaccountlist.cpp
    375503
    … …  
    381509        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BCGatewayManager.o src/business/BCGatewayManager.cpp
    382510
    383 release/DASQLiteAccountListManager.o: src/persistence/storage/DASQLiteAccountListManager.cpp src/persistence/storage/DASQLiteAccountListManager.h \
    384                 src/business/BCGatewayManager.h \
    385                 src/persistence/storage/DASQLiteStorage.h
    386         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/DASQLiteAccountListManager.o src/persistence/storage/DASQLiteAccountListManager.cpp
    387 
    388511release/DAAccountManager.o: src/persistence/DAAccountManager.cpp src/persistence/DAAccountManager.h \
    389                 src/persistence/storage/DASQLiteAccountListManager.h
     512                src/persistence/storage/DAAccountListManager.h
    390513        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/DAAccountManager.o src/persistence/DAAccountManager.cpp
    391514
    … …  
    450573        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BusinessFactory.o src/business/BusinessFactory.cpp
    451574
    452 release/DASQLiteStorage.o: src/persistence/storage/DASQLiteStorage.cpp src/persistence/storage/DASQLiteStorage.h \
    453                 src/business/BCSettings.h \
    454                 src/business/BCContactManager.h
    455         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/DASQLiteStorage.o src/persistence/storage/DASQLiteStorage.cpp
    456 
    457575release/BCSettings.o: src/business/BCSettings.cpp src/business/BCSettings.h \
    458576                src/persistence/PersistenceFactory.h
    … …  
    464582                src/persistence/DAGroupManager.h \
    465583                src/persistence/DASettings.h \
    466                 src/persistence/storage/DASQLiteStorage.h
     584                src/persistence/storage/DAStorage.h
    467585        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/PersistenceFactory.o src/persistence/PersistenceFactory.cpp
    468586
    … …  
    474592                src/business/BCAccountLoadManager.h \
    475593                src/business/BCAccountLoadThread.h \
    476                 src/ui/completers/AliasModel.h \
    477594                ui_vcmain.h \
     595                src/ui/models/contactgroupmodel.h \
     596                src/business/BCContactManager.h \
     597                src/business/BCGroupManager.h \
    478598                src/business/BCSettings.h \
    479599                src/business/BCAccountManager.h \
    … …  
    485605                src/business/BCAccountLoadManager.h \
    486606                src/business/BCAccountLoadThread.h \
    487                 src/ui/completers/AliasModel.h \
    488607                ui_vcmain.h \
    489                 src/business/BCAccountManager.h \
     608                src/ui/models/contactgroupmodel.h \
    490609                src/business/BCContactManager.h \
    491610                src/business/BCGroupManager.h \
     611                src/business/BCAccountManager.h \
    492612                src/ui/UIHelper.h \
    493613                src/ui/VCAccountList/vcaccountlist.h \
    494614                ui_vcaccountlist.h \
     615                src/ui/models/accountmodel.h \
    495616                src/ui/VCAddressBook/vcaddressbook.h \
    496617                ui_vcaddressbook.h \
    497618                src/ui/VCSettings/vcsettings.h \
    498                 ui_vcsettings.h
     619                ui_vcsettings.h \
     620                src/ui/completers/bettercompleter.h \
     621                src/ui/models/aliascompletionmodel.h \
     622                src/ui/delegates/aligndelegate.h
    499623        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/vcmain.o src/ui/VCMain/vcmain.cpp
    500624
    … …  
    505629        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/vcsettings.o src/ui/VCSettings/vcsettings.cpp
    506630
    507 release/moc_aliascompleter.o: release/moc_aliascompleter.cpp
    508         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_aliascompleter.o release/moc_aliascompleter.cpp
     631release/moc_DAAccountListManager.o: release/moc_DAAccountListManager.cpp
     632        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DAAccountListManager.o release/moc_DAAccountListManager.cpp
     633
     634release/moc_DAStorage.o: release/moc_DAStorage.cpp
     635        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DAStorage.o release/moc_DAStorage.cpp
     636
     637release/moc_contactgroupmodel.o: release/moc_contactgroupmodel.cpp
     638        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_contactgroupmodel.o release/moc_contactgroupmodel.cpp
     639
     640release/moc_aliascompletionmodel.o: release/moc_aliascompletionmodel.cpp
     641        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_aliascompletionmodel.o release/moc_aliascompletionmodel.cpp
     642
     643release/moc_bettercompleter.o: release/moc_bettercompleter.cpp
     644        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_bettercompleter.o release/moc_bettercompleter.cpp
     645
     646release/moc_accountmodel.o: release/moc_accountmodel.cpp
     647        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_accountmodel.o release/moc_accountmodel.cpp
     648
     649release/moc_aligndelegate.o: release/moc_aligndelegate.cpp
     650        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_aligndelegate.o release/moc_aligndelegate.cpp
     651
     652release/moc_clearbutton.o: release/moc_clearbutton.cpp
     653        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_clearbutton.o release/moc_clearbutton.cpp
     654
     655release/moc_lineedit.o: release/moc_lineedit.cpp
     656        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_lineedit.o release/moc_lineedit.cpp
     657
     658release/moc_lineedit_p.o: release/moc_lineedit_p.cpp
     659        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_lineedit_p.o release/moc_lineedit_p.cpp
     660
     661release/moc_searchbutton.o: release/moc_searchbutton.cpp
     662        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_searchbutton.o release/moc_searchbutton.cpp
     663
     664release/moc_searchlineedit.o: release/moc_searchlineedit.cpp
     665        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_searchlineedit.o release/moc_searchlineedit.cpp
    509666
    510667release/moc_vceditaccount.o: release/moc_vceditaccount.cpp
    … …  
    517674        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCAccountLoadThread.o release/moc_BCAccountLoadThread.cpp
    518675
    519 release/moc_DASQLiteAccountListManager.o: release/moc_DASQLiteAccountListManager.cpp
    520         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DASQLiteAccountListManager.o release/moc_DASQLiteAccountListManager.cpp
    521 
    522676release/moc_DAAccountManager.o: release/moc_DAAccountManager.cpp
    523677        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DAAccountManager.o release/moc_DAAccountManager.cpp
    524678
     679release/moc_BCAccountManager.o: release/moc_BCAccountManager.cpp
     680        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCAccountManager.o release/moc_BCAccountManager.cpp
     681
    525682release/moc_BCAccountLoadManager.o: release/moc_BCAccountLoadManager.cpp
    526683        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCAccountLoadManager.o release/moc_BCAccountLoadManager.cpp
    … …  
    535692        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DAGroupManager.o release/moc_DAGroupManager.cpp
    536693
     694release/moc_BCGroupManager.o: release/moc_BCGroupManager.cpp
     695        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCGroupManager.o release/moc_BCGroupManager.cpp
     696
    537697release/moc_vceditcontact.o: release/moc_vceditcontact.cpp
    538698        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_vceditcontact.o release/moc_vceditcontact.cpp
    … …  
    544704        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_vcaddressbook.o release/moc_vcaddressbook.cpp
    545705
    546 release/moc_DASQLiteStorage.o: release/moc_DASQLiteStorage.cpp
    547         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DASQLiteStorage.o release/moc_DASQLiteStorage.cpp
     706release/moc_BCContactManager.o: release/moc_BCContactManager.cpp
     707        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCContactManager.o release/moc_BCContactManager.cpp
    548708
    549709release/moc_DAContactManager.o: release/moc_DAContactManager.cpp

  • gateways/SwisscomXtraZone/Makefile

    r42 r43  
    11#############################################################################
    22# Makefile for building: libSwisscomXtraZone.so
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Thu Jan 14 08:55:08 2010
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 19 11:57:19 2010
    44# Project:  SwisscomXtraZone.pro
    55# Template: lib
    … …  
    8484                /usr/share/qt4/mkspecs/features/lex.prf \
    8585                /usr/share/qt4/mkspecs/features/include_source_dir.prf \
     86                /usr/lib/libQtSql.prl \
    8687                /usr/lib/libQtGui.prl \
    8788                /usr/lib/libQtNetwork.prl \
    … …  
    108109/usr/share/qt4/mkspecs/features/lex.prf:
    109110/usr/share/qt4/mkspecs/features/include_source_dir.prf:
     111/usr/lib/libQtSql.prl:
    110112/usr/lib/libQtGui.prl:
    111113/usr/lib/libQtNetwork.prl:

  • gateways/SwisscomXtraZone/Makefile.Debug

    r42 r43  
    11#############################################################################
    22# Makefile for building: libSwisscomXtraZone.so
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Thu Jan 14 08:55:08 2010
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 19 11:57:19 2010
    44# Project:  SwisscomXtraZone.pro
    55# Template: lib
    … …  
    1010CC            = gcc
    1111CXX           = g++
    12 DEFINES       = -DQT_PLUGIN -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
     12DEFINES       = -DQT_PLUGIN -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
    1313CFLAGS        = -pipe -g -D_REENTRANT -Wall -W -fPIC $(DEFINES)
    1414CXXFLAGS      = -pipe -g -D_REENTRANT -Wall -W -fPIC $(DEFINES)
    15 INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4 -Iapp -I../../lib/libinterfaces/src/exceptions -I../../lib/libinterfaces/src/business -I../../lib/libinterfaces/src/ui -I../../lib/libinterfaces/src -I../../lib/libgateway/src/exceptions -I../../lib/libgateway/src/business -I../../lib/libgateway/src/persistence -I../../lib/libdatatypes/src/business -I../../lib/libutils/src -Idebug -I.
     15INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtSql -I/usr/include/qt4 -Iapp -I../../lib/libinterfaces/src/exceptions -I../../lib/libinterfaces/src/business -I../../lib/libinterfaces/src/ui -I../../lib/libinterfaces/src -I../../lib/libgateway/src/exceptions -I../../lib/libgateway/src/business -I../../lib/libgateway/src/persistence -I../../lib/libdatatypes/src/business -I../../lib/libdatatypes/src -I../../lib/libutils/src -Idebug -I.
    1616LINK          = g++
    1717LFLAGS        = -shared
    18 LIBS          = $(SUBLIBS)  -L/usr/lib -L../../lib/ -ltntdb -linterfaces -lgateway -ldatatypes -lutils -lpthread -lQtGui -lQtNetwork -lQtCore
     18LIBS          = $(SUBLIBS)  -L/usr/lib -L../../lib/ -ltntdb -lgateway -linterfaces -ldatatypes -lutils -lpthread -lQtSql -lQtGui -lQtNetwork -lQtCore
    1919AR            = ar cqs
    2020RANLIB        =
    … …  
    177177debug/qrc_SwisscomXtraZone.cpp: lib/SwisscomXtraZone.qrc \
    178178                lib/de.qm \
    179                 lib/Swisscom_Root_CA_1_pem.crt
     179                lib/Swisscom_Root_CA_1_pem.crt \
     180                lib/SwisscomXtraZone.ico
    180181        /usr/bin/rcc -name SwisscomXtraZone lib/SwisscomXtraZone.qrc -o debug/qrc_SwisscomXtraZone.cpp
    181182

  • gateways/SwisscomXtraZone/Makefile.Release

    r42 r43  
    11#############################################################################
    22# Makefile for building: libSwisscomXtraZone.so
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Thu Jan 14 08:55:08 2010
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 19 11:57:19 2010
    44# Project:  SwisscomXtraZone.pro
    55# Template: lib
    … …  
    1010CC            = gcc
    1111CXX           = g++
    12 DEFINES       = -DQT_NO_DEBUG -DQT_PLUGIN -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
     12DEFINES       = -DQT_NO_DEBUG -DQT_PLUGIN -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
    1313CFLAGS        = -pipe -O2 -D_REENTRANT -Wall -W -fPIC $(DEFINES)
    1414CXXFLAGS      = -pipe -O2 -D_REENTRANT -Wall -W -fPIC $(DEFINES)
    15 INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4 -Iapp -I../../lib/libinterfaces/src/exceptions -I../../lib/libinterfaces/src/business -I../../lib/libinterfaces/src/ui -I../../lib/libinterfaces/src -I../../lib/libgateway/src/exceptions -I../../lib/libgateway/src/business -I../../lib/libgateway/src/persistence -I../../lib/libdatatypes/src/business -I../../lib/libutils/src -Irelease -I.
     15INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtSql -I/usr/include/qt4 -Iapp -I../../lib/libinterfaces/src/exceptions -I../../lib/libinterfaces/src/business -I../../lib/libinterfaces/src/ui -I../../lib/libinterfaces/src -I../../lib/libgateway/src/exceptions -I../../lib/libgateway/src/business -I../../lib/libgateway/src/persistence -I../../lib/libdatatypes/src/business -I../../lib/libdatatypes/src -I../../lib/libutils/src -Irelease -I.
    1616LINK          = g++
    1717LFLAGS        = -Wl,-O1 -shared
    18 LIBS          = $(SUBLIBS)  -L/usr/lib -L../../lib/ -ltntdb -linterfaces -lgateway -ldatatypes -lutils -lpthread -lQtGui -lQtNetwork -lQtCore
     18LIBS          = $(SUBLIBS)  -L/usr/lib -L../../lib/ -ltntdb -lgateway -linterfaces -ldatatypes -lutils -lpthread -lQtSql -lQtGui -lQtNetwork -lQtCore
    1919AR            = ar cqs
    2020RANLIB        =
    … …  
    177177release/qrc_SwisscomXtraZone.cpp: lib/SwisscomXtraZone.qrc \
    178178                lib/de.qm \
    179                 lib/Swisscom_Root_CA_1_pem.crt
     179                lib/Swisscom_Root_CA_1_pem.crt \
     180                lib/SwisscomXtraZone.ico
    180181        /usr/bin/rcc -name SwisscomXtraZone lib/SwisscomXtraZone.qrc -o release/qrc_SwisscomXtraZone.cpp
    181182

  • gateways/SwisscomXtraZone/SwisscomXtraZone.pro

    r42 r43  
    88QT = core \
    99    network \
    10     gui
     10    gui \
     11    sql
    1112LIBS += -L../../lib/
     13# Attend the order!
    1214LIBS += -ltntdb \
    1315    -linterfaces \
    1416    -lgateway \
     17    -linterfaces \
    1518    -ldatatypes \
    1619    -lutils
    … …  
    2427    ../../lib/libgateway/src/persistence/ \
    2528    ../../lib/libdatatypes/src/business \
     29    ../../lib/libdatatypes/src \
    2630    ../../lib/libutils/src/
    2731HEADERS += src/business/validation/BCAccountValidator.h \

  • gateways/SwisscomXtraZone/lib/SwisscomXtraZone.qrc

    r42 r43  
    66        <file>de.qm</file>
    77    </qresource>
     8    <qresource prefix="/images">
     9        <file>SwisscomXtraZone.ico</file>
     10    </qresource>
    811</RCC>

  • gateways/SwisscomXtraZone/locale/de.ts

    r42 r43  
    33<TS version="2.0" language="de" sourcelanguage="en">
    44<context>
    5     <name>QObject</name>
    6     <message>
    7         <source>Could not get the addon text!</source>
    8         <translation type="obsolete">Der Zusatztext konnte nicht gefunden werden!</translation>
    9     </message>
    10     <message>
    11         <source>Could not get the longSMSLength!</source>
    12         <translation type="obsolete">Die SMS-Länge konnte nicht gefunden werden!</translation>
    13     </message>
    14     <message>
    15         <source>Could not get the free sms count!</source>
    16         <translation type="obsolete">Die Anzahl der Gratis-SMS konnte nicht gefunden werden!</translation>
    17     </message>
    18     <message>
    19         <source>You have only %1 SMS for free. (You need at least %2 SMS left to send this message!</source>
    20         <translation type="obsolete">Es sind nur noch %1 Gratis-SMS vorhanden. (Es braucht jedoch mindestens %2 Gratis-SMS um diese SMS zu versenden!)</translation>
    21     </message>
    22 </context>
    23 <context>
    245    <name>SwisscomXtraZone::BCAccount</name>
    256    <message>
    26         <location filename="../src/business/BCAccount.cpp" line="132"/>
     7        <location filename="../src/business/BCAccount.cpp" line="133"/>
    278        <source>Could not get the addon text!</source>
    289        <translation>Der Zusatztext konnte nicht gefunden werden!</translation>
    2910    </message>
    3011    <message>
    31         <location filename="../src/business/BCAccount.cpp" line="138"/>
     12        <location filename="../src/business/BCAccount.cpp" line="139"/>
    3213        <source>Could not get the longSMSLength!</source>
    3314        <translation>Die SMS-Länge konnte nicht eruiert werden!</translation>
    3415    </message>
    3516    <message>
    36         <location filename="../src/business/BCAccount.cpp" line="144"/>
     17        <location filename="../src/business/BCAccount.cpp" line="145"/>
    3718        <source>Could not get the free sms count!</source>
    3819        <translation>Die Anzahl der Gratis-SMS konnte nicht gefunden werden!</translation>
    3920    </message>
    4021    <message>
    41         <location filename="../src/business/BCAccount.cpp" line="217"/>
     22        <location filename="../src/business/BCAccount.cpp" line="218"/>
    4223        <source>You have only %1 SMS for free. (You need at least %2 SMS left to send this message!)</source>
    4324        <translation>Es sind nur noch %1 Gratis-SMS verfügbar. (Zum versenden dieser SMS werden jedoch %2 Gratis-SMS benötigt!)</translation>

  • gateways/SwisscomXtraZone/src/business/BCAccount.cpp

    r42 r43  
    1616#include <LoginAccountExceptions.h>
    1717
     18#include <snumber.h>
    1819#include <typeconvert.h>
    1920
    … …  
    2425namespace SwisscomXtraZone {
    2526
    26 BCAccount::BCAccount(ISQLiteStorage* storage)
     27BCAccount::BCAccount(IStorage* storage)
    2728    : AbstractLoginAccount(new DAAccountStorageOfficer(this, storage), new BCAccountValidator(this))
    2829
    … …  
    5253
    5354IAccount* BCAccount::getClonedInstance() const {
    54     return new BCAccount(dynamic_cast<ISQLiteStorage*>(getStorageOfficer()->storage()));
     55    return new BCAccount(getStorageOfficer()->storage());
    5556}
    5657
    … …  
    159160    QMap<QString, QString> posts;
    160161    posts.insert("CobYouthSMSSenden:btnAddReceiver", "");
    161     posts.insert("CobYouthSMSSenden:txtNewReceiver", recipient->number()->toString("aau"));
     162    posts.insert("CobYouthSMSSenden:txtNewReceiver", recipient->number().toString("aaau"));
    162163
    163164    _doPost(posts);
    … …  
    178179
    179180
    180 void BCAccount::sendSMS(const QString& message, const QList<IContact*>& recipients) {
     181void BCAccount::sendSMS(const QString& message, const QSet<IContact*>& recipients) {
    181182    if ((message == "") || recipients.empty()){
    182183        return;
    … …  
    228229        int y = 0;
    229230
    230         QListIterator<IContact*> j(recipients);
     231        QSetIterator<IContact*> j(recipients);
    231232        do {
    232233            setStatus(LoginAccount::Status::RemovingRecipients);

  • gateways/SwisscomXtraZone/src/business/BCAccount.h

    r42 r43  
    1010
    1111#include <AbstractLoginAccount.h>
    12 #include <persistence/isqlitestorage.h>
     12#include <persistence/istorage.h>
    1313
    1414#include <HttpHelper.h>
    … …  
    2020
    2121public:
    22     explicit BCAccount(ISQLiteStorage* storage);
     22    explicit BCAccount(IStorage* storage);
    2323    virtual ~BCAccount();
    2424
    … …  
    2727
    2828    /* IAccount */
    29     virtual void             sendSMS(const QString& message, const QList<IContact*>& recipients);
     29    virtual void             sendSMS(const QString& message, const QSet<IContact*>& recipients);
    3030    virtual void             cancelSMSSending();
    3131

  • gateways/SwisscomXtraZone/src/business/BCGateway.cpp

    r42 r43  
    2323}
    2424
     25QImage BCGateway::icon() const {
     26    return QImage(":/images/SwisscomXtraZone.ico");
     27}
     28
    2529IAccount* BCGateway::createAccountInstance(IStorage* storage) const {
    26     return new BCAccount(static_cast<ISQLiteStorage*>(storage));
     30    return new BCAccount(storage);
    2731}
    2832

  • gateways/SwisscomXtraZone/src/business/BCGateway.h

    r42 r43  
    1010
    1111#include <AbstractLoginGateway.h>
    12 #include <persistence/isqlitestorage.h>
     12#include <persistence/istorage.h>
    1313
    1414
    … …  
    2727    /* IGateway */
    2828    virtual QString        name() const;
     29    virtual QImage         icon() const;
     30
    2931    virtual IAccount*      createAccountInstance(IStorage* storage) const;
    3032

  • gateways/SwisscomXtraZone/src/persistence/DAAccountStorageOfficer.h

    r42 r43  
    1717
    1818public:
    19     DAAccountStorageOfficer(ILoginAccount* account, ISQLiteStorage* storage)
     19    DAAccountStorageOfficer(ILoginAccount* account, IStorage* storage)
    2020        : AbstractLoginAccountStorageOfficer(account, storage, "sdo2o0034_k!Qdoc0DiwnfDaLdY<ymWWpovDmwpovDö__dmkosadDLDd.:easdfDSs")
    2121    {};

  • gateways/SwisscomXtraZone/src/ui/vcsettingswidget.cpp

    r42 r43  
    3232    BCAccount* account_;
    3333    try {
     34        // TODO: this gives no error...
    3435        account_ = dynamic_cast<BCAccount*>(account);
    3536    } catch (...) {

  • gateways/SwisscomXtraZone/ui_vcsettingswidget.h

    r42 r43  
    22** Form generated from reading ui file 'vcsettingswidget.ui'
    33**
    4 ** Created: Thu Jan 14 08:55:41 2010
     4** Created: Tue Jan 26 20:40:48 2010
    55**      by: Qt User Interface Compiler version 4.5.2
    66**

  • lib/libdatatypes/datatypes.pro

    r41 r43  
    1818    src/business/BCContact.h \
    1919    src/business/BCGroup.h \
    20     src/business/BCNumber.h \
    21     src/business/BCShortcut.h
     20    src/snumber.h \
     21    src/sshortcut.h
    2222SOURCES += src/business/BCBinary.cpp \
    2323    src/business/BCContact.cpp \
    2424    src/business/BCGroup.cpp \
    25     src/business/BCNumber.cpp \
    26     src/business/BCShortcut.cpp
     25    src/snumber.cpp \
     26    src/sshortcut.cpp
    2727FORMS +=
    2828RESOURCES +=

  • lib/libdatatypes/src/business/BCContact.cpp

    r41 r43  
    88#include "BCContact.h"
    99
    10 #include "BCBinary.h"
    11 #include "BCNumber.h"
     10BCContact::BCContact()
     11  : id_(-1)
     12  , name_("")
     13  , number_(SNumber())
     14  , image_(QImage())
     15{
     16    eventMapper_ = new ContactEventMapper(this);
     17}
    1218
     19ContactEventMapper* BCContact::eventMapper() const {
     20    return eventMapper_;
     21}
     22IContactEvents* BCContact::contactEvents() const {
     23    return static_cast<IContactEvents*>(eventMapper());
     24}
    1325
    14 BCContact::BCContact() {
    15     id_     = -1;
    16     name_   = "";
    17     number_ = new BCNumber();
    18     image_  = new BCBinary();
    19 }
    2026
    2127int BCContact::id() const{
    2228    return id_;
    2329}
    24 
    2530QString BCContact::name() const{
    2631    return name_;
    2732}
    28 
    29 INumber* BCContact::number() const{
     33SNumber BCContact::number() const{
    3034    return number_;
    3135}
    32 
    3336QStringList BCContact::aliases() const{
    3437    return aliases_;
    3538}
    36 
    37 IBinary* BCContact::image() const{
     39QImage BCContact::image() const{
    3840    return image_;
    3941}
    4042
    4143
    42 void BCContact::setID(int id){
     44void BCContact::setId(int id){
     45    if (id_ == id) return;
     46
     47    int oldId = id_;
    4348    id_ = id;
     49
     50    emit contactEvents()->idChanged(oldId, id);
     51    emit contactEvents()->dataChanged();
    4452}
    45 
    4653void BCContact::setName(const QString& name){
    47     name_ = name.trimmed();
     54    SET_IF_DIFFERENT(name_, name.trimmed());
     55    emit contactEvents()->dataChanged();
    4856}
    49 
    50 void BCContact::setNumber(const INumber& number){
    51     number_ = const_cast<INumber*>(&number);
     57void BCContact::setNumber(const SNumber& number){
     58    SET_IF_DIFFERENT(number_, number);
     59    emit contactEvents()->dataChanged();
    5260}
    53 
    54 void BCContact::setNumber(const QString& numberStr){
    55     number_ = new BCNumber(numberStr);
     61void BCContact::setAliases(const QStringList& aliases){
     62    SET_IF_DIFFERENT(aliases_, aliases);
     63    emit contactEvents()->dataChanged();
    5664}
    57 
    58 void BCContact::setAliases(const QStringList& aliases){
    59     aliases_ = aliases;
     65void BCContact::setImage(const QImage& image){
     66    SET_IF_DIFFERENT(image_, image);
     67    emit contactEvents()->dataChanged();
    6068}
    61 
    62 void BCContact::setImage(const IBinary& image){
    63     image_ = const_cast<IBinary*>(&image);
    64 }

  • lib/libdatatypes/src/business/BCContact.h

    r41 r43  
    99#define BCCONTACT_H_
    1010
     11#include <QObject>
     12
    1113#include <icontact.h>
    1214
    13 class BCContact: public IContact {
     15#include "../snumber.h"
     16
     17class BCContact: public QObject, public IContact {
     18    Q_OBJECT
     19    Q_INTERFACES(IContact)
     20
    1421public:
    1522    BCContact();
    … …  
    1724    virtual int         id() const;
    1825    virtual QString     name() const;
    19     virtual INumber*    number() const;
     26    virtual SNumber     number() const;
    2027    virtual QStringList aliases() const;
    21     virtual IBinary*    image() const;
     28    virtual QImage      image() const;
    2229
    23     virtual void setID(int id);
     30    virtual void setId(int id);
    2431    virtual void setName(const QString& name);
    25     virtual void setNumber(const INumber& number);
    26     virtual void setNumber(const QString& numberStr);
     32    virtual void setNumber(const SNumber& number);
    2733    virtual void setAliases(const QStringList& aliases);
    28     virtual void setImage(const IBinary& image);
     34    virtual void setImage(const QImage& image);
     35
     36    virtual ContactEventMapper* eventMapper() const;
     37
     38protected:
     39    virtual IContactEvents* contactEvents() const;
    2940
    3041private:
     42    ContactEventMapper* eventMapper_;
     43
    3144    int id_;
    3245    QString name_;
    33     INumber* number_;
     46    SNumber number_;
    3447    QStringList aliases_;
    35     IBinary* image_;
     48    QImage image_;
    3649};
    3750

  • lib/libdatatypes/src/business/BCGroup.cpp

    r41 r43  
    99
    1010#include "BCBinary.h"
    11 #include "BCNumber.h"
    1211
    13 BCGroup::BCGroup() {
    14     id_         = -1;
    15     name_       = "";
    16     image_      = new BCBinary();
     12BCGroup::BCGroup()
     13  : id_(-1)
     14  , name_("")
     15  , image_(QImage())
     16{
     17    eventMapper_ = new GroupEventMapper(this);
    1718}
     19
     20GroupEventMapper* BCGroup::eventMapper() const {
     21    return eventMapper_;
     22}
     23IGroupEvents* BCGroup::groupEvents() const {
     24    return static_cast<IGroupEvents*>(eventMapper());
     25}
     26
    1827
    1928int BCGroup::id() const{
    2029    return id_;
    2130}
    22 
    2331QString BCGroup::name() const{
    2432    return name_;
    2533}
    26 
    27 IBinary* BCGroup::image() const{
     34QImage BCGroup::image() const{
    2835    return image_;
    2936}
    30 
    31 QList<IContact*> BCGroup::contacts() const{
    32     return contacts_.values();
     37QSet<IContact*> BCGroup::contacts() const{
     38    return contactList_.values().toSet();
    3339}
    3440
    3541
    36 void BCGroup::setID(int id){
    37     //TODO: implement observer-pattern to inform groups about this change. Or just change it there...
     42void BCGroup::setId(int id){
     43    if (id_ == id) return;
     44
     45    int oldId = id_;
    3846    id_ = id;
     47
     48    emit groupEvents()->idChanged(oldId, id);
     49    emit groupEvents()->dataChanged();
    3950}
    40 
    4151void BCGroup::setName(const QString& name){
    42     name_ = name.trimmed();
     52    SET_IF_DIFFERENT(name_, name.trimmed());
     53    emit groupEvents()->dataChanged();
    4354}
    44 
    45 void BCGroup::setImage(const IBinary& image){
    46     image_ = const_cast<IBinary*>(&image);
     55void BCGroup::setImage(const QImage& image){
     56    SET_IF_DIFFERENT(image_, image);
     57    emit groupEvents()->dataChanged();
    4758}
    48 
    49 /*void BCGroup::setContacts(const QSet<int>& contactIds){
    50     contactIds_ = contactIds;
    51 }*/
    52 void BCGroup::setContacts(const QList<IContact*>& contacts){
    53     contacts_.clear();
    54 
     59void BCGroup::setContacts(const QSet<IContact*>& contacts){
     60    foreach (IContact* contact, contactList_) {
     61        if (!contacts.contains(contact))
     62            removeContactFromList(contact);
     63    }
    5564    foreach (IContact* contact, contacts) {
    56         addContact(contact);
     65        addContactToList(contact);
    5766    }
     67}
     68void BCGroup::addContact(IContact* contact){
     69    addContactToList(contact);
     70}
     71void BCGroup::removeContact(int contactId){
     72    removeContact(contactList_[contactId]);
     73}
     74void BCGroup::removeContact(IContact* contact){
     75    removeContactFromList(contact);
    5876}
    5977
    6078
    61 /*void BCGroup::addContact(int contactId){
    62     contactIds_.insert(contactId);
    63 }*/
    64 void BCGroup::addContact(IContact* contact){
    65     contacts_.insert(contact->id(), contact);
     79void BCGroup::addContactToList(IContact* contact) {
     80    if ((contact == NULL) || contactList_.contains(contact->id()))
     81        return;
     82
     83    connect(contact->eventMapper(), SIGNAL(idChanged(int, int)),
     84            this, SLOT(contactIdChanged(int, int)));
     85
     86    contactList_.insert(contact->id(), contact);
     87    emit groupEvents()->contactAdded(contact);
     88}
     89void BCGroup::removeContactFromList(IContact* contact) {
     90    if ((contact == NULL) || !contactList_.contains(contact->id()))
     91        return;
     92
     93    disconnect(contact->eventMapper(), SIGNAL(idChanged(int, int)),
     94               this, SLOT(contactIdChanged(int, int)));
     95
     96    contactList_.remove(contact->id());
     97    emit groupEvents()->contactRemoved(contact);
    6698}
    6799
    68 void BCGroup::removeContact(int contactId){
    69     contacts_.remove(contactId);
     100
     101void BCGroup::contactIdChanged(int oldId, int newId) {
     102    IContact* contact = contactList_.take(oldId);
     103    if (contact != NULL)
     104        contactList_.insert(newId, contact);
    70105}
    71 void BCGroup::removeContact(IContact* contact){
    72     removeContact(contacts_.key(contact));
    73     //removeContact(contact->id());
    74 }

  • lib/libdatatypes/src/business/BCGroup.h

    r41 r43  
    99#define BCGROUP_H_
    1010
     11#include <QObject>
    1112#include <QMap>
    1213
    1314#include <igroup.h>
    1415
    15 class BCGroup: public IGroup {
     16class BCGroup: public QObject, public IGroup {
     17    Q_OBJECT
     18    Q_INTERFACES(IGroup)
     19
    1620public:
    1721    BCGroup();
    1822
    19     virtual int              id() const;
    20     virtual QString          name() const;
    21     virtual IBinary*         image() const;
    22     virtual QList<IContact*> contacts() const;
     23    virtual int             id() const;
     24    virtual QString         name() const;
     25    virtual QImage          image() const;
     26    virtual QSet<IContact*> contacts() const;
    2327
    24     virtual void setID(int id);
     28    virtual void setId(int id);
    2529    virtual void setName(const QString& name);
    26     virtual void setImage(const IBinary& image);
     30    virtual void setImage(const QImage& image);
    2731//    virtual void setContacts(const QSet<int>& contactIds);
    28     virtual void setContacts(const QList<IContact*>& contacts);
     32    virtual void setContacts(const QSet<IContact*>& contacts);
    2933
    3034    virtual void addContact(IContact* contact);
    … …  
    3236    virtual void removeContact(IContact* contact);
    3337
     38    virtual GroupEventMapper* eventMapper() const;
     39
     40protected:
     41    virtual IGroupEvents* groupEvents() const;
     42
     43protected slots:
     44    void contactIdChanged(int oldId, int newId);
    3445
    3546private:
     47    GroupEventMapper* eventMapper_;
     48
    3649    int id_;
    3750    QString name_;
    38     QMap<int, IContact*> contacts_;
    39     IBinary* image_;
     51    QMap<int, IContact*> contactList_;
     52    QImage image_;
     53
     54    void addContactToList(IContact* contact);
     55    void removeContactFromList(IContact* contact);
    4056};
    4157

  • lib/libgateway/Makefile

    r41 r43  
    11#############################################################################
    22# Makefile for building: libgateway.a
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 12 16:59:06 2010
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Sun Jan 17 14:52:09 2010
    44# Project:  gateway.pro
    55# Template: lib
    … …  
    8686                /usr/share/qt4/mkspecs/features/lex.prf \
    8787                /usr/share/qt4/mkspecs/features/include_source_dir.prf \
     88                /usr/lib/libQtSql.prl \
    8889                /usr/lib/libQtGui.prl \
    8990                /usr/lib/libQtNetwork.prl \
    … …  
    112113/usr/share/qt4/mkspecs/features/lex.prf:
    113114/usr/share/qt4/mkspecs/features/include_source_dir.prf:
     115/usr/lib/libQtSql.prl:
    114116/usr/lib/libQtGui.prl:
    115117/usr/lib/libQtNetwork.prl:

  • lib/libgateway/Makefile.Debug

    r41 r43  
    11#############################################################################
    22# Makefile for building: libgateway.a
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 12 16:59:06 2010
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Sun Jan 17 14:52:09 2010
    44# Project:  gateway.pro
    55# Template: lib
    … …  
    1010CC            = gcc
    1111CXX           = g++
    12 DEFINES       = -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
     12DEFINES       = -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
    1313CFLAGS        = -pipe -g -D_REENTRANT -fPIC -Wall -W $(DEFINES)
    1414CXXFLAGS      = -pipe -g -D_REENTRANT -fPIC -Wall -W $(DEFINES)
    15 INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4 -Iapp -I../libinterfaces/src/exceptions -I../libinterfaces/src/business -I../libinterfaces/src -I../libutils/src -Idebug
     15INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtSql -I/usr/include/qt4 -Iapp -I../libinterfaces/src/exceptions -I../libinterfaces/src/business -I../libinterfaces/src -I../libutils/src -Idebug
    1616AR            = ar cqs
    1717RANLIB        =
    … …  
    3939####### Files
    4040
    41 SOURCES       = src/business/validation/BCLoginAccountValidator.cpp \
     41SOURCES       = src/persistence/AbstractStorageOfficer.cpp \
     42                src/business/validation/BCLoginAccountValidator.cpp \
    4243                src/business/AbstractAccount.cpp \
    4344                src/business/AbstractLoginAccount.cpp \
    … …  
    4950                src/business/validation/BCStdAccountValidator.cpp \
    5051                src/business/validation/BCLoginAccountValidator.cpp \
     52                src/persistence/AbstractStorageOfficer.cpp \
    5153                src/persistence/AbstractAccountStorageOfficer.cpp \
    52                 src/persistence/AbstractLoginAccountStorageOfficer.cpp \
    53                 src/persistence/AbstractSQLiteStorageOfficer.cpp debug/moc_BCLoginAccountValidator.cpp \
     54                src/persistence/AbstractLoginAccountStorageOfficer.cpp debug/moc_BCLoginAccountValidator.cpp \
    5455                debug/moc_AbstractAccount.cpp \
    5556                debug/moc_AbstractLoginAccount.cpp \
    … …  
    6061                debug/moc_BCStdAccountValidator.cpp \
    6162                debug/moc_BCValidationResult.cpp \
     63                debug/moc_AbstractStorageOfficer.cpp \
    6264                debug/moc_AbstractAccountStorageOfficer.cpp \
    63                 debug/moc_AbstractLoginAccountStorageOfficer.cpp \
    64                 debug/moc_AbstractSQLiteStorageOfficer.cpp
    65 OBJECTS       = debug/BCLoginAccountValidator.o \
     65                debug/moc_AbstractLoginAccountStorageOfficer.cpp
     66OBJECTS       = debug/AbstractStorageOfficer.o \
     67                debug/BCLoginAccountValidator.o \
    6668                debug/AbstractAccount.o \
    6769                debug/AbstractLoginAccount.o \
    … …  
    7375                debug/BCStdAccountValidator.o \
    7476                debug/BCLoginAccountValidator.o \
     77                debug/AbstractStorageOfficer.o \
    7578                debug/AbstractAccountStorageOfficer.o \
    7679                debug/AbstractLoginAccountStorageOfficer.o \
    77                 debug/AbstractSQLiteStorageOfficer.o \
    7880                debug/moc_BCLoginAccountValidator.o \
    7981                debug/moc_AbstractAccount.o \
    … …  
    8587                debug/moc_BCStdAccountValidator.o \
    8688                debug/moc_BCValidationResult.o \
     89                debug/moc_AbstractStorageOfficer.o \
    8790                debug/moc_AbstractAccountStorageOfficer.o \
    88                 debug/moc_AbstractLoginAccountStorageOfficer.o \
    89                 debug/moc_AbstractSQLiteStorageOfficer.o
     91                debug/moc_AbstractLoginAccountStorageOfficer.o
    9092DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
    9193                /usr/share/qt4/mkspecs/common/unix.conf \
    … …  
    155157dist:
    156158        @$(CHK_DIR_EXISTS) debug/gateway2.0.0 || $(MKDIR) debug/gateway2.0.0
    157         $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/gateway2.0.0/ && $(COPY_FILE) --parents src/business/validation/BCLoginAccountValidator.h src/business/AbstractAccount.h src/business/AbstractLoginAccount.h src/business/AbstractGateway.h src/business/AbstractLoginGateway.h src/business/HttpHelper.h src/business/HttpCookieManager.h src/business/exceptions/ELoginAccountLoginException.h src/business/exceptions/LoginAccountExceptions.h src/business/validation/BCStdAccountValidator.h src/business/validation/BCLoginAccountValidator.h src/business/validation/BCValidationResult.h src/exceptions/LoginAccountExceptions.h src/persistence/AbstractAccountStorageOfficer.h src/persistence/AbstractLoginAccountStorageOfficer.h src/persistence/AbstractSQLiteStorageOfficer.h debug/gateway2.0.0/ && $(COPY_FILE) --parents src/business/validation/BCLoginAccountValidator.cpp src/business/AbstractAccount.cpp src/business/AbstractLoginAccount.cpp src/business/AbstractGateway.cpp src/business/AbstractLoginGateway.cpp src/business/HttpHelper.cpp src/business/HttpCookieManager.cpp src/business/validation/BCValidationResult.cpp src/business/validation/BCStdAccountValidator.cpp src/business/validation/BCLoginAccountValidator.cpp src/persistence/AbstractAccountStorageOfficer.cpp src/persistence/AbstractLoginAccountStorageOfficer.cpp src/persistence/AbstractSQLiteStorageOfficer.cpp debug/gateway2.0.0/ && (cd `dirname debug/gateway2.0.0` && $(TAR) gateway2.0.0.tar gateway2.0.0 && $(COMPRESS) gateway2.0.0.tar) && $(MOVE) `dirname debug/gateway2.0.0`/gateway2.0.0.tar.gz . && $(DEL_FILE) -r debug/gateway2.0.0
     159        $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/gateway2.0.0/ && $(COPY_FILE) --parents src/business/validation/BCLoginAccountValidator.h src/business/AbstractAccount.h src/business/AbstractLoginAccount.h src/business/AbstractGateway.h src/business/AbstractLoginGateway.h src/business/HttpHelper.h src/business/HttpCookieManager.h src/business/exceptions/ELoginAccountLoginException.h src/business/exceptions/LoginAccountExceptions.h src/business/validation/BCStdAccountValidator.h src/business/validation/BCLoginAccountValidator.h src/business/validation/BCValidationResult.h src/exceptions/LoginAccountExceptions.h src/persistence/AbstractStorageOfficer.h src/persistence/AbstractAccountStorageOfficer.h src/persistence/AbstractLoginAccountStorageOfficer.h debug/gateway2.0.0/ && $(COPY_FILE) --parents src/persistence/AbstractStorageOfficer.cpp src/business/validation/BCLoginAccountValidator.cpp src/business/AbstractAccount.cpp src/business/AbstractLoginAccount.cpp src/business/AbstractGateway.cpp src/business/AbstractLoginGateway.cpp src/business/HttpHelper.cpp src/business/HttpCookieManager.cpp src/business/validation/BCValidationResult.cpp src/business/validation/BCStdAccountValidator.cpp src/business/validation/BCLoginAccountValidator.cpp src/persistence/AbstractStorageOfficer.cpp src/persistence/AbstractAccountStorageOfficer.cpp src/persistence/AbstractLoginAccountStorageOfficer.cpp debug/gateway2.0.0/ && (cd `dirname debug/gateway2.0.0` && $(TAR) gateway2.0.0.tar gateway2.0.0 && $(COMPRESS) gateway2.0.0.tar) && $(MOVE) `dirname debug/gateway2.0.0`/gateway2.0.0.tar.gz . && $(DEL_FILE) -r debug/gateway2.0.0
    158160
    159161
    … …  
    174176mocables: compiler_moc_header_make_all compiler_moc_source_make_all
    175177
    176 compiler_moc_header_make_all: debug/moc_BCLoginAccountValidator.cpp debug/moc_AbstractAccount.cpp debug/moc_AbstractLoginAccount.cpp debug/moc_AbstractGateway.cpp debug/moc_AbstractLoginGateway.cpp debug/moc_HttpHelper.cpp debug/moc_HttpCookieManager.cpp debug/moc_BCStdAccountValidator.cpp debug/moc_BCLoginAccountValidator.cpp debug/moc_BCValidationResult.cpp debug/moc_AbstractAccountStorageOfficer.cpp debug/moc_AbstractLoginAccountStorageOfficer.cpp debug/moc_AbstractSQLiteStorageOfficer.cpp
     178compiler_moc_header_make_all: debug/moc_BCLoginAccountValidator.cpp debug/moc_AbstractAccount.cpp debug/moc_AbstractLoginAccount.cpp debug/moc_AbstractGateway.cpp debug/moc_AbstractLoginGateway.cpp debug/moc_HttpHelper.cpp debug/moc_HttpCookieManager.cpp debug/moc_BCStdAccountValidator.cpp debug/moc_BCLoginAccountValidator.cpp debug/moc_BCValidationResult.cpp debug/moc_AbstractStorageOfficer.cpp debug/moc_AbstractAccountStorageOfficer.cpp debug/moc_AbstractLoginAccountStorageOfficer.cpp
    177179compiler_moc_header_clean:
    178         -$(DEL_FILE) debug/moc_BCLoginAccountValidator.cpp debug/moc_AbstractAccount.cpp debug/moc_AbstractLoginAccount.cpp debug/moc_AbstractGateway.cpp debug/moc_AbstractLoginGateway.cpp debug/moc_HttpHelper.cpp debug/moc_HttpCookieManager.cpp debug/moc_BCStdAccountValidator.cpp debug/moc_BCLoginAccountValidator.cpp debug/moc_BCValidationResult.cpp debug/moc_AbstractAccountStorageOfficer.cpp debug/moc_AbstractLoginAccountStorageOfficer.cpp debug/moc_AbstractSQLiteStorageOfficer.cpp
     180        -$(DEL_FILE) debug/moc_BCLoginAccountValidator.cpp debug/moc_AbstractAccount.cpp debug/moc_AbstractLoginAccount.cpp debug/moc_AbstractGateway.cpp debug/moc_AbstractLoginGateway.cpp debug/moc_HttpHelper.cpp debug/moc_HttpCookieManager.cpp debug/moc_BCStdAccountValidator.cpp debug/moc_BCLoginAccountValidator.cpp debug/moc_BCValidationResult.cpp debug/moc_AbstractStorageOfficer.cpp debug/moc_AbstractAccountStorageOfficer.cpp debug/moc_AbstractLoginAccountStorageOfficer.cpp
    179181debug/moc_BCLoginAccountValidator.cpp: src/business/validation/BCStdAccountValidator.h \
    180182                src/business/validation/BCLoginAccountValidator.h
    … …  
    212214        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/validation/BCValidationResult.h -o debug/moc_BCValidationResult.cpp
    213215
    214 debug/moc_AbstractAccountStorageOfficer.cpp: src/persistence/AbstractSQLiteStorageOfficer.h \
     216debug/moc_AbstractStorageOfficer.cpp: src/persistence/AbstractStorageOfficer.h
     217        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/AbstractStorageOfficer.h -o debug/moc_AbstractStorageOfficer.cpp
     218
     219debug/moc_AbstractAccountStorageOfficer.cpp: src/persistence/AbstractStorageOfficer.h \
    215220                src/persistence/AbstractAccountStorageOfficer.h
    216221        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/AbstractAccountStorageOfficer.h -o debug/moc_AbstractAccountStorageOfficer.cpp
    217222
    218223debug/moc_AbstractLoginAccountStorageOfficer.cpp: src/persistence/AbstractAccountStorageOfficer.h \
    219                 src/persistence/AbstractSQLiteStorageOfficer.h \
     224                src/persistence/AbstractStorageOfficer.h \
    220225                src/persistence/AbstractLoginAccountStorageOfficer.h
    221226        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/AbstractLoginAccountStorageOfficer.h -o debug/moc_AbstractLoginAccountStorageOfficer.cpp
    222 
    223 debug/moc_AbstractSQLiteStorageOfficer.cpp: src/persistence/AbstractSQLiteStorageOfficer.h
    224         /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/AbstractSQLiteStorageOfficer.h -o debug/moc_AbstractSQLiteStorageOfficer.cpp
    225227
    226228compiler_rcc_make_all:
    … …  
    243245####### Compile
    244246
     247debug/AbstractStorageOfficer.o: src/persistence/AbstractStorageOfficer.cpp src/persistence/AbstractStorageOfficer.h
     248        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/AbstractStorageOfficer.o src/persistence/AbstractStorageOfficer.cpp
     249
    245250debug/BCLoginAccountValidator.o: src/business/validation/BCLoginAccountValidator.cpp src/business/validation/BCLoginAccountValidator.h \
    246251                src/business/validation/BCStdAccountValidator.h \
    … …  
    283288        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BCLoginAccountValidator.o src/business/validation/BCLoginAccountValidator.cpp
    284289
     290debug/AbstractStorageOfficer.o: src/persistence/AbstractStorageOfficer.cpp src/persistence/AbstractStorageOfficer.h
     291        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/AbstractStorageOfficer.o src/persistence/AbstractStorageOfficer.cpp
     292
    285293debug/AbstractAccountStorageOfficer.o: src/persistence/AbstractAccountStorageOfficer.cpp src/persistence/AbstractAccountStorageOfficer.h \
    286                 src/persistence/AbstractSQLiteStorageOfficer.h
     294                src/persistence/AbstractStorageOfficer.h
    287295        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/AbstractAccountStorageOfficer.o src/persistence/AbstractAccountStorageOfficer.cpp
    288296
    289297debug/AbstractLoginAccountStorageOfficer.o: src/persistence/AbstractLoginAccountStorageOfficer.cpp src/persistence/AbstractLoginAccountStorageOfficer.h \
    290298                src/persistence/AbstractAccountStorageOfficer.h \
    291                 src/persistence/AbstractSQLiteStorageOfficer.h
     299                src/persistence/AbstractStorageOfficer.h
    292300        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/AbstractLoginAccountStorageOfficer.o src/persistence/AbstractLoginAccountStorageOfficer.cpp
    293 
    294 debug/AbstractSQLiteStorageOfficer.o: src/persistence/AbstractSQLiteStorageOfficer.cpp src/persistence/AbstractSQLiteStorageOfficer.h
    295         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/AbstractSQLiteStorageOfficer.o src/persistence/AbstractSQLiteStorageOfficer.cpp
    296301
    297302debug/moc_BCLoginAccountValidator.o: debug/moc_BCLoginAccountValidator.cpp
    … …  
    322327        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCValidationResult.o debug/moc_BCValidationResult.cpp
    323328
     329debug/moc_AbstractStorageOfficer.o: debug/moc_AbstractStorageOfficer.cpp
     330        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_AbstractStorageOfficer.o debug/moc_AbstractStorageOfficer.cpp
     331
    324332debug/moc_AbstractAccountStorageOfficer.o: debug/moc_AbstractAccountStorageOfficer.cpp
    325333        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_AbstractAccountStorageOfficer.o debug/moc_AbstractAccountStorageOfficer.cpp
    … …  
    328336        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_AbstractLoginAccountStorageOfficer.o debug/moc_AbstractLoginAccountStorageOfficer.cpp
    329337
    330 debug/moc_AbstractSQLiteStorageOfficer.o: debug/moc_AbstractSQLiteStorageOfficer.cpp
    331         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_AbstractSQLiteStorageOfficer.o debug/moc_AbstractSQLiteStorageOfficer.cpp
    332 
    333338####### Install
    334339

  • lib/libgateway/Makefile.Release

    r41 r43  
    11#############################################################################
    22# Makefile for building: libgateway.a
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 12 16:59:06 2010
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Sun Jan 17 14:52:09 2010
    44# Project:  gateway.pro
    55# Template: lib
    … …  
    1010CC            = gcc
    1111CXX           = g++
    12 DEFINES       = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
     12DEFINES       = -DQT_NO_DEBUG -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
    1313CFLAGS        = -pipe -O2 -D_REENTRANT -fPIC -Wall -W $(DEFINES)
    1414CXXFLAGS      = -pipe -O2 -D_REENTRANT -fPIC -Wall -W $(DEFINES)
    15 INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4 -Iapp -I../libinterfaces/src/exceptions -I../libinterfaces/src/business -I../libinterfaces/src -I../libutils/src -Irelease
     15INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtSql -I/usr/include/qt4 -Iapp -I../libinterfaces/src/exceptions -I../libinterfaces/src/business -I../libinterfaces/src -I../libutils/src -Irelease
    1616AR            = ar cqs
    1717RANLIB        =
    … …  
    3939####### Files
    4040
    41 SOURCES       = src/business/validation/BCLoginAccountValidator.cpp \
     41SOURCES       = src/persistence/AbstractStorageOfficer.cpp \
     42                src/business/validation/BCLoginAccountValidator.cpp \
    4243                src/business/AbstractAccount.cpp \
    4344                src/business/AbstractLoginAccount.cpp \
    … …  
    4950                src/business/validation/BCStdAccountValidator.cpp \
    5051                src/business/validation/BCLoginAccountValidator.cpp \
     52                src/persistence/AbstractStorageOfficer.cpp \
    5153                src/persistence/AbstractAccountStorageOfficer.cpp \
    52                 src/persistence/AbstractLoginAccountStorageOfficer.cpp \
    53                 src/persistence/AbstractSQLiteStorageOfficer.cpp release/moc_BCLoginAccountValidator.cpp \
     54                src/persistence/AbstractLoginAccountStorageOfficer.cpp release/moc_BCLoginAccountValidator.cpp \
    5455                release/moc_AbstractAccount.cpp \
    5556                release/moc_AbstractLoginAccount.cpp \
    … …  
    6061                release/moc_BCStdAccountValidator.cpp \
    6162                release/moc_BCValidationResult.cpp \
     63                release/moc_AbstractStorageOfficer.cpp \
    6264                release/moc_AbstractAccountStorageOfficer.cpp \
    63                 release/moc_AbstractLoginAccountStorageOfficer.cpp \
    64                 release/moc_AbstractSQLiteStorageOfficer.cpp
    65 OBJECTS       = release/BCLoginAccountValidator.o \
     65                release/moc_AbstractLoginAccountStorageOfficer.cpp
     66OBJECTS       = release/AbstractStorageOfficer.o \
     67                release/BCLoginAccountValidator.o \
    6668                release/AbstractAccount.o \
    6769                release/AbstractLoginAccount.o \
    … …  
    7375                release/BCStdAccountValidator.o \
    7476                release/BCLoginAccountValidator.o \
     77                release/AbstractStorageOfficer.o \
    7578                release/AbstractAccountStorageOfficer.o \
    7679                release/AbstractLoginAccountStorageOfficer.o \
    77                 release/AbstractSQLiteStorageOfficer.o \
    7880                release/moc_BCLoginAccountValidator.o \
    7981                release/moc_AbstractAccount.o \
    … …  
    8587                release/moc_BCStdAccountValidator.o \
    8688                release/moc_BCValidationResult.o \
     89                release/moc_AbstractStorageOfficer.o \
    8790                release/moc_AbstractAccountStorageOfficer.o \
    88                 release/moc_AbstractLoginAccountStorageOfficer.o \
    89                 release/moc_AbstractSQLiteStorageOfficer.o
     91                release/moc_AbstractLoginAccountStorageOfficer.o
    9092DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
    9193                /usr/share/qt4/mkspecs/common/unix.conf \
    … …  
    155157dist:
    156158        @$(CHK_DIR_EXISTS) release/gateway2.0.0 || $(MKDIR) release/gateway2.0.0
    157         $(COPY_FILE) --parents $(SOURCES) $(DIST) release/gateway2.0.0/ && $(COPY_FILE) --parents src/business/validation/BCLoginAccountValidator.h src/business/AbstractAccount.h src/business/AbstractLoginAccount.h src/business/AbstractGateway.h src/business/AbstractLoginGateway.h src/business/HttpHelper.h src/business/HttpCookieManager.h src/business/exceptions/ELoginAccountLoginException.h src/business/exceptions/LoginAccountExceptions.h src/business/validation/BCStdAccountValidator.h src/business/validation/BCLoginAccountValidator.h src/business/validation/BCValidationResult.h src/exceptions/LoginAccountExceptions.h src/persistence/AbstractAccountStorageOfficer.h src/persistence/AbstractLoginAccountStorageOfficer.h src/persistence/AbstractSQLiteStorageOfficer.h release/gateway2.0.0/ && $(COPY_FILE) --parents src/business/validation/BCLoginAccountValidator.cpp src/business/AbstractAccount.cpp src/business/AbstractLoginAccount.cpp src/business/AbstractGateway.cpp src/business/AbstractLoginGateway.cpp src/business/HttpHelper.cpp src/business/HttpCookieManager.cpp src/business/validation/BCValidationResult.cpp src/business/validation/BCStdAccountValidator.cpp src/business/validation/BCLoginAccountValidator.cpp src/persistence/AbstractAccountStorageOfficer.cpp src/persistence/AbstractLoginAccountStorageOfficer.cpp src/persistence/AbstractSQLiteStorageOfficer.cpp release/gateway2.0.0/ && (cd `dirname release/gateway2.0.0` && $(TAR) gateway2.0.0.tar gateway2.0.0 && $(COMPRESS) gateway2.0.0.tar) && $(MOVE) `dirname release/gateway2.0.0`/gateway2.0.0.tar.gz . && $(DEL_FILE) -r release/gateway2.0.0
     159        $(COPY_FILE) --parents $(SOURCES) $(DIST) release/gateway2.0.0/ && $(COPY_FILE) --parents src/business/validation/BCLoginAccountValidator.h src/business/AbstractAccount.h src/business/AbstractLoginAccount.h src/business/AbstractGateway.h src/business/AbstractLoginGateway.h src/business/HttpHelper.h src/business/HttpCookieManager.h src/business/exceptions/ELoginAccountLoginException.h src/business/exceptions/LoginAccountExceptions.h src/business/validation/BCStdAccountValidator.h src/business/validation/BCLoginAccountValidator.h src/business/validation/BCValidationResult.h src/exceptions/LoginAccountExceptions.h src/persistence/AbstractStorageOfficer.h src/persistence/AbstractAccountStorageOfficer.h src/persistence/AbstractLoginAccountStorageOfficer.h release/gateway2.0.0/ && $(COPY_FILE) --parents src/persistence/AbstractStorageOfficer.cpp src/business/validation/BCLoginAccountValidator.cpp src/business/AbstractAccount.cpp src/business/AbstractLoginAccount.cpp src/business/AbstractGateway.cpp src/business/AbstractLoginGateway.cpp src/business/HttpHelper.cpp src/business/HttpCookieManager.cpp src/business/validation/BCValidationResult.cpp src/business/validation/BCStdAccountValidator.cpp src/business/validation/BCLoginAccountValidator.cpp src/persistence/AbstractStorageOfficer.cpp src/persistence/AbstractAccountStorageOfficer.cpp src/persistence/AbstractLoginAccountStorageOfficer.cpp release/gateway2.0.0/ && (cd `dirname release/gateway2.0.0` && $(TAR) gateway2.0.0.tar gateway2.0.0 && $(COMPRESS) gateway2.0.0.tar) && $(MOVE) `dirname release/gateway2.0.0`/gateway2.0.0.tar.gz . && $(DEL_FILE) -r release/gateway2.0.0
    158160
    159161
    … …  
    174176mocables: compiler_moc_header_make_all compiler_moc_source_make_all
    175177
    176 compiler_moc_header_make_all: release/moc_BCLoginAccountValidator.cpp release/moc_AbstractAccount.cpp release/moc_AbstractLoginAccount.cpp release/moc_AbstractGateway.cpp release/moc_AbstractLoginGateway.cpp release/moc_HttpHelper.cpp release/moc_HttpCookieManager.cpp release/moc_BCStdAccountValidator.cpp release/moc_BCLoginAccountValidator.cpp release/moc_BCValidationResult.cpp release/moc_AbstractAccountStorageOfficer.cpp release/moc_AbstractLoginAccountStorageOfficer.cpp release/moc_AbstractSQLiteStorageOfficer.cpp
     178compiler_moc_header_make_all: release/moc_BCLoginAccountValidator.cpp release/moc_AbstractAccount.cpp release/moc_AbstractLoginAccount.cpp release/moc_AbstractGateway.cpp release/moc_AbstractLoginGateway.cpp release/moc_HttpHelper.cpp release/moc_HttpCookieManager.cpp release/moc_BCStdAccountValidator.cpp release/moc_BCLoginAccountValidator.cpp release/moc_BCValidationResult.cpp release/moc_AbstractStorageOfficer.cpp release/moc_AbstractAccountStorageOfficer.cpp release/moc_AbstractLoginAccountStorageOfficer.cpp
    177179compiler_moc_header_clean:
    178         -$(DEL_FILE) release/moc_BCLoginAccountValidator.cpp release/moc_AbstractAccount.cpp release/moc_AbstractLoginAccount.cpp release/moc_AbstractGateway.cpp release/moc_AbstractLoginGateway.cpp release/moc_HttpHelper.cpp release/moc_HttpCookieManager.cpp release/moc_BCStdAccountValidator.cpp release/moc_BCLoginAccountValidator.cpp release/moc_BCValidationResult.cpp release/moc_AbstractAccountStorageOfficer.cpp release/moc_AbstractLoginAccountStorageOfficer.cpp release/moc_AbstractSQLiteStorageOfficer.cpp
     180        -$(DEL_FILE) release/moc_BCLoginAccountValidator.cpp release/moc_AbstractAccount.cpp release/moc_AbstractLoginAccount.cpp release/moc_AbstractGateway.cpp release/moc_AbstractLoginGateway.cpp release/moc_HttpHelper.cpp release/moc_HttpCookieManager.cpp release/moc_BCStdAccountValidator.cpp release/moc_BCLoginAccountValidator.cpp release/moc_BCValidationResult.cpp release/moc_AbstractStorageOfficer.cpp release/moc_AbstractAccountStorageOfficer.cpp release/moc_AbstractLoginAccountStorageOfficer.cpp
    179181release/moc_BCLoginAccountValidator.cpp: src/business/validation/BCStdAccountValidator.h \
    180182                src/business/validation/BCLoginAccountValidator.h
    … …  
    212214        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/validation/BCValidationResult.h -o release/moc_BCValidationResult.cpp
    213215
    214 release/moc_AbstractAccountStorageOfficer.cpp: src/persistence/AbstractSQLiteStorageOfficer.h \
     216release/moc_AbstractStorageOfficer.cpp: src/persistence/AbstractStorageOfficer.h
     217        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/AbstractStorageOfficer.h -o release/moc_AbstractStorageOfficer.cpp
     218
     219release/moc_AbstractAccountStorageOfficer.cpp: src/persistence/AbstractStorageOfficer.h \
    215220                src/persistence/AbstractAccountStorageOfficer.h
    216221        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/AbstractAccountStorageOfficer.h -o release/moc_AbstractAccountStorageOfficer.cpp
    217222
    218223release/moc_AbstractLoginAccountStorageOfficer.cpp: src/persistence/AbstractAccountStorageOfficer.h \
    219                 src/persistence/AbstractSQLiteStorageOfficer.h \
     224                src/persistence/AbstractStorageOfficer.h \
    220225                src/persistence/AbstractLoginAccountStorageOfficer.h
    221226        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/AbstractLoginAccountStorageOfficer.h -o release/moc_AbstractLoginAccountStorageOfficer.cpp
    222 
    223 release/moc_AbstractSQLiteStorageOfficer.cpp: src/persistence/AbstractSQLiteStorageOfficer.h
    224         /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/AbstractSQLiteStorageOfficer.h -o release/moc_AbstractSQLiteStorageOfficer.cpp
    225227
    226228compiler_rcc_make_all:
    … …  
    243245####### Compile
    244246
     247release/AbstractStorageOfficer.o: src/persistence/AbstractStorageOfficer.cpp src/persistence/AbstractStorageOfficer.h
     248        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/AbstractStorageOfficer.o src/persistence/AbstractStorageOfficer.cpp
     249
    245250release/BCLoginAccountValidator.o: src/business/validation/BCLoginAccountValidator.cpp src/business/validation/BCLoginAccountValidator.h \
    246251                src/business/validation/BCStdAccountValidator.h \
    … …  
    283288        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BCLoginAccountValidator.o src/business/validation/BCLoginAccountValidator.cpp
    284289
     290release/AbstractStorageOfficer.o: src/persistence/AbstractStorageOfficer.cpp src/persistence/AbstractStorageOfficer.h
     291        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/AbstractStorageOfficer.o src/persistence/AbstractStorageOfficer.cpp
     292
    285293release/AbstractAccountStorageOfficer.o: src/persistence/AbstractAccountStorageOfficer.cpp src/persistence/AbstractAccountStorageOfficer.h \
    286                 src/persistence/AbstractSQLiteStorageOfficer.h
     294                src/persistence/AbstractStorageOfficer.h
    287295        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/AbstractAccountStorageOfficer.o src/persistence/AbstractAccountStorageOfficer.cpp
    288296
    289297release/AbstractLoginAccountStorageOfficer.o: src/persistence/AbstractLoginAccountStorageOfficer.cpp src/persistence/AbstractLoginAccountStorageOfficer.h \
    290298                src/persistence/AbstractAccountStorageOfficer.h \
    291                 src/persistence/AbstractSQLiteStorageOfficer.h
     299                src/persistence/AbstractStorageOfficer.h
    292300        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/AbstractLoginAccountStorageOfficer.o src/persistence/AbstractLoginAccountStorageOfficer.cpp
    293 
    294 release/AbstractSQLiteStorageOfficer.o: src/persistence/AbstractSQLiteStorageOfficer.cpp src/persistence/AbstractSQLiteStorageOfficer.h
    295         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/AbstractSQLiteStorageOfficer.o src/persistence/AbstractSQLiteStorageOfficer.cpp
    296301
    297302release/moc_BCLoginAccountValidator.o: release/moc_BCLoginAccountValidator.cpp
    … …  
    322327        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCValidationResult.o release/moc_BCValidationResult.cpp
    323328
     329release/moc_AbstractStorageOfficer.o: release/moc_AbstractStorageOfficer.cpp
     330        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_AbstractStorageOfficer.o release/moc_AbstractStorageOfficer.cpp
     331
    324332release/moc_AbstractAccountStorageOfficer.o: release/moc_AbstractAccountStorageOfficer.cpp
    325333        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_AbstractAccountStorageOfficer.o release/moc_AbstractAccountStorageOfficer.cpp
    … …  
    328336        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_AbstractLoginAccountStorageOfficer.o release/moc_AbstractLoginAccountStorageOfficer.cpp
    329337
    330 release/moc_AbstractSQLiteStorageOfficer.o: release/moc_AbstractSQLiteStorageOfficer.cpp
    331         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_AbstractSQLiteStorageOfficer.o release/moc_AbstractSQLiteStorageOfficer.cpp
    332 
    333338####### Install
    334339

  • lib/libgateway/gateway.pro

    r41 r43  
    88QT += core \
    99    gui \
    10     network
     10    network \
     11    sql
    1112LIBS += -L../
    1213LIBS += -linterfaces \
    … …  
    3031    src/business/validation/BCValidationResult.h \
    3132    src/exceptions/LoginAccountExceptions.h \
     33    src/persistence/AbstractStorageOfficer.h \
    3234    src/persistence/AbstractAccountStorageOfficer.h \
    33     src/persistence/AbstractLoginAccountStorageOfficer.h \
    34     src/persistence/AbstractSQLiteStorageOfficer.h
    35 SOURCES += src/business/validation/BCLoginAccountValidator.cpp \
     35    src/persistence/AbstractLoginAccountStorageOfficer.h
     36SOURCES += src/persistence/AbstractStorageOfficer.cpp \
     37    src/business/validation/BCLoginAccountValidator.cpp \
    3638    src/business/AbstractAccount.cpp \
    3739    src/business/AbstractLoginAccount.cpp \
    … …  
    4345    src/business/validation/BCStdAccountValidator.cpp \
    4446    src/business/validation/BCLoginAccountValidator.cpp \
     47    src/persistence/AbstractStorageOfficer.cpp \
    4548    src/persistence/AbstractAccountStorageOfficer.cpp \
    46     src/persistence/AbstractLoginAccountStorageOfficer.cpp \
    47     src/persistence/AbstractSQLiteStorageOfficer.cpp
     49    src/persistence/AbstractLoginAccountStorageOfficer.cpp
    4850FORMS +=
    4951RESOURCES +=

  • lib/libgateway/src/business/AbstractAccount.cpp

    r41 r43  
    11
    22#include "AbstractAccount.h"
     3
     4AbstractAccount::AbstractAccount(IStorageOfficer* storageOfficer, IValidator* validator)
     5    : id_(-1)
     6
     7    , enabled_(true)
     8
     9    , freeSMSCount_(-1)
     10
     11    , initializing_(false)
     12    , initialized_(false)
     13    , stoppingInitialization_(false)
     14
     15    , cancelSMSSending_(false)
     16    , storageOfficer_(storageOfficer)
     17    , validator_(validator)
     18{
     19    eventMapper_ = new AccountEventMapper(this);
     20}
     21
     22AccountEventMapper* AbstractAccount::eventMapper() const {
     23    return eventMapper_;
     24}
     25IAccountEvents* AbstractAccount::accountEvents() const {
     26    return static_cast<IAccountEvents*>(eventMapper());
     27}
    328
    429int AbstractAccount::id() const {
    … …  
    631}
    732void AbstractAccount::setId(int id) {
     33    if (id_ == id) return;
     34
     35    int oldId = id_;
    836    id_ = id;
     37
     38    emit accountEvents()->idChanged(oldId, id);
     39    emit accountEvents()->dataChanged();
    940}
    1041
    … …  
    1344}
    1445void AbstractAccount::setName(const QString& name) {
    15     name_ = name.trimmed();
     46    SET_IF_DIFFERENT(name_, name.trimmed());
     47    emit accountEvents()->dataChanged();
    1648}
    1749
    1850
    1951void AbstractAccount::setStatus(const QString& status, int progress /* = -1 */, const ProgressMethod& progressMethod /* = SetProgress*/) {
     52    if (status_ != status) {
     53        status_ = status;
     54
     55        emit accountEvents()->statusChanged(status);
     56    }
     57
    2058    if (progress > -1) {
    2159        setProgress(progress, progressMethod);
    2260    }
    23 
    24     // TODO (inform observer about status change & progress...)
    2561}
    2662void AbstractAccount::setProgress(int progress, const ProgressMethod& progressMethod /* = SetProgress */) {
    … …  
    3167
    3268        case SetProgress:
    33             progress_ = progress;
     69            SET_IF_DIFFERENT(progress_, progress);
    3470            break;
    3571    }
    3672
    37     // TODO inform the observers about the progress change
     73    emit accountEvents()->progressChanged(progress_);
    3874}
    3975
    … …  
    4278}
    4379void AbstractAccount::setEnabled(bool enabled) {
    44     enabled_ = enabled;
     80    SET_IF_DIFFERENT(enabled_, enabled);
     81    emit accountEvents()->dataChanged();
     82
    4583    if (!enabled) {
    4684        unInitialize();
    … …  
    5391}
    5492void AbstractAccount::setFreeSMSCount(int freeSMSCount) {
    55     freeSMSCount_ = freeSMSCount;
     93    SET_IF_DIFFERENT(freeSMSCount_, freeSMSCount);
     94    emit accountEvents()->dataChanged();
    5695}
    5796
    … …  
    5998    return validator_;
    6099}
    61 ISQLiteStorageOfficer* AbstractAccount::getStorageOfficer() const {
     100IStorageOfficer* AbstractAccount::getStorageOfficer() const {
    62101    return storageOfficer_;
    63102}
    … …  
    69108        return;
    70109    }
     110
     111    /* TODO: Do this in a queue... */
    71112
    72113    while (stoppingInitialization_){

  • lib/libgateway/src/business/AbstractAccount.h

    r41 r43  
    1010
    1111#include <iaccount.h>
    12 #include <persistence/isqlitestorageofficer.h>
     12#include <persistence/istorageofficer.h>
    1313
    1414class AbstractAccount: public QObject, virtual public IAccount {
    … …  
    1717
    1818public:
    19     AbstractAccount(ISQLiteStorageOfficer* storageOfficer, IValidator* validator)
    20         : freeSMSCount_(-1)
    21 
    22         , enabled_(true)
    23 
    24         , initializing_(false)
    25         , initialized_(false)
    26         , stoppingInitialization_(false)
    27 
    28         , cancelSMSSending_(false)
    29         , storageOfficer_(storageOfficer)
    30         , validator_(validator)
    31     {};
     19    AbstractAccount(IStorageOfficer* storageOfficer, IValidator* validator);
    3220
    3321    /* IAccount */
    … …  
    5240    virtual void        cancelSMSSending();
    5341
     42    AccountEventMapper* eventMapper() const;
     43
    5444    /* IValidatable */
    55     virtual IValidator*            getValidator() const;
     45    virtual IValidator*      getValidator() const;
    5646
    5747    /* IStorable */
    58     virtual ISQLiteStorageOfficer* getStorageOfficer() const;
     48    virtual IStorageOfficer* getStorageOfficer() const;
    5949
    6050protected:
    … …  
    6858    virtual void        uncancelSendingSMS();
    6959
     60    virtual IAccountEvents* accountEvents() const;
     61
    7062private:
     63    AccountEventMapper* eventMapper_;
     64
    7165    int     id_;
    7266    QString name_;
    … …  
    7468    bool    enabled_;
    7569
     70    QString status_;
    7671    int     progress_;
    7772    int     freeSMSCount_;
    … …  
    8378    bool    cancelSMSSending_;
    8479
    85     ISQLiteStorageOfficer* storageOfficer_;
     80    IStorageOfficer* storageOfficer_;
    8681    IValidator*            validator_;
    8782};

  • lib/libgateway/src/business/AbstractLoginAccount.cpp

    r41 r43  
    11#include "AbstractLoginAccount.h"
     2
     3AbstractLoginAccount::AbstractLoginAccount(IStorageOfficer* storageOfficer, IValidator* validator)
     4    : AbstractAccount(storageOfficer, validator)
     5
     6    , username_("")
     7    , password_("")
     8
     9    , loggedIn_(false)
     10{
     11    eventMapper_ = new LoginAccountEventMapper(this);
     12}
     13
     14LoginAccountEventMapper* AbstractLoginAccount::eventMapper() const {
     15    return eventMapper_;
     16}
     17ILoginAccountEvents* AbstractLoginAccount::accountEvents() const {
     18    return static_cast<ILoginAccountEvents*>(eventMapper());
     19}
     20
    221
    322
    … …  
    726
    827void AbstractLoginAccount::setUsername(const QString& username){
    9     username_ = username.trimmed();
     28    SET_IF_DIFFERENT(username_, username.trimmed());
     29    emit accountEvents()->dataChanged();
    1030}
    1131
    … …  
    1535
    1636void AbstractLoginAccount::setPassword(const QString& password) {
    17     password_ = password;
     37    SET_IF_DIFFERENT(password_, password);
     38    emit accountEvents()->dataChanged();
    1839}
    1940
    2041
    2142
    22 void AbstractLoginAccount::setLoggedIn(bool loggedIn) {
    23     loggedIn_ = loggedIn;
     43void AbstractLoginAccount::setLoggedIn(bool newLoggedIn) {
     44    SET_IF_DIFFERENT(loggedIn_, newLoggedIn);
     45    (loggedIn_) ? emit accountEvents()->loggedIn() : emit accountEvents()->loggedOut();
    2446}
    2547
    … …  
    5274        } catch (...) {
    5375            setLoggedIn(false);
     76            throw;
    5477        }
    5578    }

  • lib/libgateway/src/business/AbstractLoginAccount.h

    r41 r43  
    1717
    1818public:
    19     AbstractLoginAccount(ISQLiteStorageOfficer* storageOfficer, IValidator* validator)
    20       : AbstractAccount(storageOfficer, validator)
    21 
    22       , username_("")
    23       , password_("")
    24 
    25       , loggedIn_(false)
    26     { };
    27 
     19    AbstractLoginAccount(IStorageOfficer* storageOfficer, IValidator* validator);
    2820
    2921    virtual QString   username() const;
    … …  
    3830    virtual void      logout(bool FORCE = false);
    3931
     32    LoginAccountEventMapper* eventMapper() const;
     33
    4034protected:
    4135    /* ILoginAccount */
    42     virtual void      setLoggedIn(bool loggedIn);
     36    virtual void      setLoggedIn(bool newLoggedIn);
    4337
    4438    virtual void      doLogin() =0;
    … …  
    4640    virtual bool      stillLoggedIn() =0;
    4741
     42    virtual ILoginAccountEvents* accountEvents() const;
     43
    4844private:
     45    LoginAccountEventMapper* eventMapper_;
     46
    4947    QString username_;
    5048    QString password_;

  • lib/libgateway/src/business/validation/BCLoginAccountValidator.cpp

    r41 r43  
    1717
    1818    if (acc->username().trimmed() == "") {
    19         result->addError(QObject::tr("The username can't be empty."));
     19        result->addError(tr("The username can't be empty."));
    2020    }
    2121
    2222    if (acc->password().trimmed() == "") {
    23         result->addError(QObject::tr("The password can't be empty."));
     23        result->addError(tr("The password can't be empty."));
    2424    }
    2525

  • lib/libgateway/src/persistence/AbstractAccountStorageOfficer.cpp

    r41 r43  
    11#include "AbstractAccountStorageOfficer.h"
    22
    3 #include <tntdb/error.h>
    4 #include <tntdb/result.h>
    5 #include <tntdb/row.h>
     3#include <QVariant>
     4#include <QSqlQuery>
     5#include <QDebug>
     6#include <QSqlError>
    67
    78#include <typeconvert.h>
    … …  
    910
    1011
    11 AbstractAccountStorageOfficer::AbstractAccountStorageOfficer(IAccount* account, ISQLiteStorage* storage)
    12     : AbstractSQLiteStorageOfficer(storage)
     12AbstractAccountStorageOfficer::AbstractAccountStorageOfficer(IAccount* account, IStorage* storage)
     13    : AbstractStorageOfficer(storage)
    1314    , account_(account)
    1415{
    15     storage->connection().execute("CREATE TABLE IF NOT EXISTS t_accounts ("
    16                                     "accountId INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, "
    17                                     "name      TEXT    NOT NULL UNIQUE, "
    18                                     "type      TEXT    NOT NULL "
    19                                   "); ");
     16    QSqlQuery query = storage->createQuery();
     17    query.prepare("CREATE TABLE IF NOT EXISTS t_accounts ("
     18                    "accountId INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, "
     19                    "name      TEXT    NOT NULL UNIQUE, "
     20                    "type      TEXT    NOT NULL "
     21                  "); ");
     22    if (!query.exec()) {
     23        throw Storage::EWriteException(tr("Could not create the account table in the database."));
     24    }
    2025}
    2126
    2227
    2328void AbstractAccountStorageOfficer::readFromStorage(){
    24     try{
    25         tntdb::Row row = storage()->connection().selectRow(s("SELECT name "
    26                                                                "FROM t_accounts "
    27                                                                "WHERE (accountId = '" + to_string(account()->id()) + "'); "));
    28         account()->setName(QString::fromUtf8(row.getString("name").c_str()));
    29         account()->setEnabled(storage()->readBool(getNamespace(), "enabled", true));
    30     }catch(const tntdb::NotFound& e){
    31         // No such contact
    32         throw Storage::EReadException("No such account in the database! [accountId: " + to_string(account()->id()) + "]");
     29    QSqlQuery query = storage()->createQuery();
     30    query.exec("SELECT name "
     31                 "FROM t_accounts "
     32                 "WHERE (accountId = '" + QString::number(account()->id()) + "'); ");
     33    if (!query.next()) {
     34        throw Storage::EReadException(tr("No such account in the database! [accountId: %1]").arg(account()->id()));
    3335    }
     36
     37    account()->setName(query.value(0).toString());
     38    account()->setEnabled(storage()->readBool(getNamespace(), "enabled", true));
    3439}
    3540
    3641void AbstractAccountStorageOfficer::writeToStorage() const {
    37     tntdb::Result res = storage()->connection().select(s("SELECT accountId "
    38                                                            "FROM t_accounts "
    39                                                            "WHERE (accountId = '" + to_string(account()->id()) + "'); "));
    40     if (res.getFieldCount() == 0){
     42    QSqlQuery query = storage()->createQuery();
     43    query.exec("SELECT accountId "
     44                 "FROM t_accounts "
     45                 "WHERE (accountId = '" + QString::number(account()->id()) + "'); ");
     46
     47    if (!query.next()){
    4148        // Insert
    4249
    43         storage()->connection().execute(s("INSERT INTO t_accounts (name, type) "
    44                                             "VALUES ("
    45                                               "'" + account()->name() + "', "
    46                                               "'" + account()->gateway()->name() + "'"
    47                                             "); "));
     50        query.prepare("INSERT INTO t_accounts (name, type) "
     51                        "VALUES ("
     52                          ":accountName, "
     53                          ":gatewayName"
     54                        "); ");
     55        query.bindValue(":accountName", account()->name());
     56        query.bindValue(":gatewayName", account()->gateway()->name());
     57        if (!query.exec()) {
     58            throw Storage::EWriteException(tr("The account could not have been written to the database."));
     59        }
    4860
    4961        // Set the accountId since it is undefined if the account was not saved before.
    50         account()->setId(storage()->connection().selectValue(s("SELECT accountId "
    51                                                                  "FROM t_accounts "
    52                                                                  "WHERE (name = '" + account()->name() + "'); ")).getInt());
     62        query.exec("SELECT accountId "
     63                     "FROM t_accounts "
     64                     "WHERE (name = '" + account()->name() + "'); ");
     65        if (!query.next()) {
     66            throw Storage::EWriteException(tr("The account could not have been written to the database."));
     67        }
     68        account()->setId(query.value(0).toInt());
    5369    }else{
    5470        // Update
    55         storage()->connection().execute(s("UPDATE t_accounts SET "
    56                                             "name='" + account()->name() + "', "
    57                                             "type='" + account()->gateway()->name() + "' "
    58                                           "WHERE (accountId = '" + to_string(account()->id()) + "'); "));
     71        query.prepare("UPDATE t_accounts SET "
     72                        "name=:accountName, "
     73                        "type=:gatewayName "
     74                      "WHERE (accountId = :accountId); ");
     75        query.bindValue(":accountName", account()->name());
     76        query.bindValue(":gatewayName", account()->gateway()->name());
     77        query.bindValue(":accountId", account()->id());
     78
     79        if (!query.exec()) {
     80            qCritical() << query.lastError().text();
     81            throw Storage::EWriteException(tr("The account could not have been written to the database."));
     82        }
    5983    }
    6084    storage()->writeBool(getNamespace(), "enabled", account()->isEnabled());
    … …  
    6488    storage()->removeValues(getNamespace());
    6589
    66     storage()->connection().execute(s("DELETE FROM t_accounts "
    67                                         "WHERE (accountId = '" + to_string(account()->id()) + "'); "));
     90    QSqlQuery query = storage()->createQuery();
     91    query.prepare("DELETE FROM t_accounts "
     92                    "WHERE (accountId = '" + QString::number(account()->id()) + "'); ");
     93    if (!query.exec()) {
     94        throw Storage::EWriteException(tr("Could not remove the account from the database."));
     95    }
    6896
    6997    account()->setId(-1); // Invalidate
    … …  
    73101
    74102QString AbstractAccountStorageOfficer::getNamespace() const {
    75     return "account_" + to_string(account()->id());
     103    return "account_" + QString::number(account()->id());
    76104}
    77105

  • lib/libgateway/src/persistence/AbstractAccountStorageOfficer.h

    r41 r43  
    1212
    1313#include <iaccount.h>
     14#include <persistence/istorage.h>
    1415
    15 #include "AbstractSQLiteStorageOfficer.h"
     16#include "AbstractStorageOfficer.h"
    1617
    17 class AbstractAccountStorageOfficer: public AbstractSQLiteStorageOfficer {
     18class AbstractAccountStorageOfficer: public AbstractStorageOfficer {
    1819    Q_OBJECT
    1920
    2021public:
    21     AbstractAccountStorageOfficer(IAccount* account, ISQLiteStorage* storage);
     22    AbstractAccountStorageOfficer(IAccount* account, IStorage* storage);
    2223
    2324    virtual void readFromStorage();

  • lib/libgateway/src/persistence/AbstractLoginAccountStorageOfficer.h

    r41 r43  
    1010
    1111#include <iloginaccount.h>
    12 #include <persistence/isqlitestorage.h>
     12#include <persistence/istorage.h>
    1313
    1414#include "AbstractAccountStorageOfficer.h"
    … …  
    1818
    1919public:
    20     AbstractLoginAccountStorageOfficer(ILoginAccount* account, ISQLiteStorage* storage, const QString& encryptionPassword)
     20    AbstractLoginAccountStorageOfficer(ILoginAccount* account, IStorage* storage, const QString& encryptionPassword)
    2121        : AbstractAccountStorageOfficer(reinterpret_cast<IAccount*>(account), storage)
    2222        , ENCRYPTION_PWD(encryptionPassword)

  • lib/libinterfaces/Makefile

    r37 r43  
    11#############################################################################
    22# Makefile for building: libinterfaces.a
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Sat Nov 21 17:21:11 2009
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 19 13:13:22 2010
    44# Project:  interfaces.pro
    55# Template: lib
    … …  
    7575                /usr/share/qt4/mkspecs/features/debug_and_release.prf \
    7676                /usr/share/qt4/mkspecs/features/default_post.prf \
     77                /usr/share/qt4/mkspecs/features/unix/thread.prf \
    7778                /usr/share/qt4/mkspecs/features/staticlib.prf \
    7879                /usr/share/qt4/mkspecs/features/static.prf \
    7980                /usr/share/qt4/mkspecs/features/warn_on.prf \
    8081                /usr/share/qt4/mkspecs/features/qt.prf \
    81                 /usr/share/qt4/mkspecs/features/unix/thread.prf \
    8282                /usr/share/qt4/mkspecs/features/moc.prf \
    8383                /usr/share/qt4/mkspecs/features/resources.prf \
    … …  
    8686                /usr/share/qt4/mkspecs/features/lex.prf \
    8787                /usr/share/qt4/mkspecs/features/include_source_dir.prf \
     88                /usr/lib/libQtSql.prl \
    8889                /usr/lib/libQtGui.prl \
    8990                /usr/lib/libQtNetwork.prl \
    … …  
    101102/usr/share/qt4/mkspecs/features/debug_and_release.prf:
    102103/usr/share/qt4/mkspecs/features/default_post.prf:
     104/usr/share/qt4/mkspecs/features/unix/thread.prf:
    103105/usr/share/qt4/mkspecs/features/staticlib.prf:
    104106/usr/share/qt4/mkspecs/features/static.prf:
    105107/usr/share/qt4/mkspecs/features/warn_on.prf:
    106108/usr/share/qt4/mkspecs/features/qt.prf:
    107 /usr/share/qt4/mkspecs/features/unix/thread.prf:
    108109/usr/share/qt4/mkspecs/features/moc.prf:
    109110/usr/share/qt4/mkspecs/features/resources.prf:
    … …  
    112113/usr/share/qt4/mkspecs/features/lex.prf:
    113114/usr/share/qt4/mkspecs/features/include_source_dir.prf:
     115/usr/lib/libQtSql.prl:
    114116/usr/lib/libQtGui.prl:
    115117/usr/lib/libQtNetwork.prl:

  • lib/libinterfaces/Makefile.Debug

    r37 r43  
    11#############################################################################
    22# Makefile for building: libinterfaces.a
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Sat Nov 21 17:21:11 2009
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 19 13:13:22 2010
    44# Project:  interfaces.pro
    55# Template: lib
    … …  
    1010CC            = gcc
    1111CXX           = g++
    12 DEFINES       = -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
    13 CFLAGS        = -pipe -g -fPIC -Wall -W -D_REENTRANT $(DEFINES)
    14 CXXFLAGS      = -pipe -g -fPIC -Wall -W -D_REENTRANT $(DEFINES)
    15 INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4 -Iapp -Isrc/interfaces/business/ -Isrc/interfaces/ -I../../src/exceptions -I../../src/utils -Idebug
     12DEFINES       = -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
     13CFLAGS        = -pipe -g -D_REENTRANT -fPIC -Wall -W $(DEFINES)
     14CXXFLAGS      = -pipe -g -D_REENTRANT -fPIC -Wall -W $(DEFINES)
     15INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtSql -I/usr/include/qt4 -Iapp -Idebug
    1616AR            = ar cqs
    1717RANLIB        =
    … …  
    4141SOURCES       = src/business/iaccount.cpp \
    4242                src/business/iloginaccount.cpp \
    43                 src/business/inumber.cpp \
    44                 src/persistence/AbstractSQLiteStorageOfficer.cpp
     43                src/business/inumber.cpp debug/moc_accounteventmapper.cpp \
     44                debug/moc_loginaccounteventmapper.cpp \
     45                debug/moc_groupeventmapper.cpp \
     46                debug/moc_contacteventmapper.cpp \
     47                debug/moc_iaccountsettingswidget.cpp
    4548OBJECTS       = debug/iaccount.o \
    4649                debug/iloginaccount.o \
    4750                debug/inumber.o \
    48                 debug/AbstractSQLiteStorageOfficer.o
     51                debug/moc_accounteventmapper.o \
     52                debug/moc_loginaccounteventmapper.o \
     53                debug/moc_groupeventmapper.o \
     54                debug/moc_contacteventmapper.o \
     55                debug/moc_iaccountsettingswidget.o
    4956DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
    5057                /usr/share/qt4/mkspecs/common/unix.conf \
    … …  
    5966                /usr/share/qt4/mkspecs/features/default_post.prf \
    6067                /usr/share/qt4/mkspecs/features/build_pass.prf \
     68                /usr/share/qt4/mkspecs/features/unix/thread.prf \
    6169                /usr/share/qt4/mkspecs/features/staticlib.prf \
    6270                /usr/share/qt4/mkspecs/features/static.prf \
    6371                /usr/share/qt4/mkspecs/features/warn_on.prf \
    6472                /usr/share/qt4/mkspecs/features/qt.prf \
    65                 /usr/share/qt4/mkspecs/features/unix/thread.prf \
    6673                /usr/share/qt4/mkspecs/features/moc.prf \
    6774                /usr/share/qt4/mkspecs/features/resources.prf \
    … …  
    114121dist:
    115122        @$(CHK_DIR_EXISTS) debug/interfaces2.0.0 || $(MKDIR) debug/interfaces2.0.0
    116         $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/interfaces2.0.0/ && $(COPY_FILE) --parents src/business/iaccount.h src/business/ibinary.h src/business/icontact.h src/business/igateway.h src/business/igroup.h src/business/iinterface.h src/business/ilibrary.h src/business/ilibraryloader.h src/business/iloginaccount.h src/business/ilogingateway.h src/business/inumber.h src/business/ishortcut.h src/business/istorable.h src/business/istreamable.h src/persistence/iaccountmanager.h src/persistence/icontactmanager.h src/persistence/igroupmanager.h src/persistence/isettings.h src/persistence/isqlitestorage.h src/persistence/istorage.h src/persistence/istorageofficer.h src/persistence/AbstractSQLiteStorageOfficer.h src/ui/iaccountsettingswidget.h debug/interfaces2.0.0/ && $(COPY_FILE) --parents src/business/iaccount.cpp src/business/iloginaccount.cpp src/business/inumber.cpp src/persistence/AbstractSQLiteStorageOfficer.cpp debug/interfaces2.0.0/ && (cd `dirname debug/interfaces2.0.0` && $(TAR) interfaces2.0.0.tar interfaces2.0.0 && $(COMPRESS) interfaces2.0.0.tar) && $(MOVE) `dirname debug/interfaces2.0.0`/interfaces2.0.0.tar.gz . && $(DEL_FILE) -r debug/interfaces2.0.0
     123        $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/interfaces2.0.0/ && $(COPY_FILE) --parents src/business/iaccount.h src/business/ibinary.h src/business/icontact.h src/business/igateway.h src/business/igroup.h src/business/iinterface.h src/business/ilibrary.h src/business/ilibraryloader.h src/business/iloginaccount.h src/business/ilogingateway.h src/business/inumber.h src/business/istorable.h src/business/istreamable.h src/business/ivalidatable.h src/business/ivalidator.h src/business/ivalidationresult.h src/business/eventmappers/eventinterfaces.h src/business/eventmappers/accounteventmapper.h src/business/eventmappers/loginaccounteventmapper.h src/business/eventmappers/groupeventmapper.h src/business/eventmappers/contacteventmapper.h src/business/exceptions/EException.h src/business/exceptions/EHttpReadException.h src/business/exceptions/ELibraryLoadException.h src/business/exceptions/EParseException.h src/business/exceptions/HttpExceptions.h src/business/exceptions/LibraryExceptions.h src/business/exceptions/StdExceptions.h src/exceptions/HttpExceptions.h src/exceptions/LibraryExceptions.h src/exceptions/StdExceptions.h src/exceptions/StorageExceptions.h src/persistence/iaccountmanager.h src/persistence/icontactmanager.h src/persistence/igroupmanager.h src/persistence/isettings.h src/persistence/istorage.h src/persistence/istorageofficer.h src/persistence/exceptions/EStorageReadException.h src/persistence/exceptions/EStorageWriteException.h src/persistence/exceptions/StorageExceptions.h src/ui/iaccountsettingswidget.h debug/interfaces2.0.0/ && $(COPY_FILE) --parents src/business/iaccount.cpp src/business/iloginaccount.cpp src/business/inumber.cpp debug/interfaces2.0.0/ && (cd `dirname debug/interfaces2.0.0` && $(TAR) interfaces2.0.0.tar interfaces2.0.0 && $(COMPRESS) interfaces2.0.0.tar) && $(MOVE) `dirname debug/interfaces2.0.0`/interfaces2.0.0.tar.gz . && $(DEL_FILE) -r debug/interfaces2.0.0
    117124
    118125
    … …  
    133140mocables: compiler_moc_header_make_all compiler_moc_source_make_all
    134141
    135 compiler_moc_header_make_all:
     142compiler_moc_header_make_all: debug/moc_accounteventmapper.cpp debug/moc_loginaccounteventmapper.cpp debug/moc_groupeventmapper.cpp debug/moc_contacteventmapper.cpp debug/moc_iaccountsettingswidget.cpp
    136143compiler_moc_header_clean:
     144        -$(DEL_FILE) debug/moc_accounteventmapper.cpp debug/moc_loginaccounteventmapper.cpp debug/moc_groupeventmapper.cpp debug/moc_contacteventmapper.cpp debug/moc_iaccountsettingswidget.cpp
     145debug/moc_accounteventmapper.cpp: src/business/eventmappers/eventinterfaces.h \
     146                src/business/iinterface.h \
     147                src/business/icontact.h \
     148                src/business/eventmappers/contacteventmapper.h \
     149                src/business/iaccount.h \
     150                src/business/istorable.h \
     151                src/persistence/istorageofficer.h \
     152                src/persistence/istorage.h \
     153                src/business/ibinary.h \
     154                src/business/igroup.h \
     155                src/business/eventmappers/groupeventmapper.h \
     156                src/business/ivalidatable.h \
     157                src/business/ivalidator.h \
     158                src/business/ivalidationresult.h \
     159                src/business/igateway.h \
     160                src/ui/iaccountsettingswidget.h \
     161                src/business/eventmappers/accounteventmapper.h \
     162                src/business/eventmappers/accounteventmapper.h
     163        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/eventmappers/accounteventmapper.h -o debug/moc_accounteventmapper.cpp
     164
     165debug/moc_loginaccounteventmapper.cpp: src/business/eventmappers/accounteventmapper.h \
     166                src/business/eventmappers/eventinterfaces.h \
     167                src/business/iinterface.h \
     168                src/business/icontact.h \
     169                src/business/eventmappers/contacteventmapper.h \
     170                src/business/iaccount.h \
     171                src/business/istorable.h \
     172                src/persistence/istorageofficer.h \
     173                src/persistence/istorage.h \
     174                src/business/ibinary.h \
     175                src/business/igroup.h \
     176                src/business/eventmappers/groupeventmapper.h \
     177                src/business/ivalidatable.h \
     178                src/business/ivalidator.h \
     179                src/business/ivalidationresult.h \
     180                src/business/igateway.h \
     181                src/ui/iaccountsettingswidget.h \
     182                src/business/iloginaccount.h \
     183                src/business/ilogingateway.h \
     184                src/business/eventmappers/loginaccounteventmapper.h \
     185                src/business/eventmappers/loginaccounteventmapper.h
     186        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/eventmappers/loginaccounteventmapper.h -o debug/moc_loginaccounteventmapper.cpp
     187
     188debug/moc_groupeventmapper.cpp: src/business/eventmappers/eventinterfaces.h \
     189                src/business/iinterface.h \
     190                src/business/icontact.h \
     191                src/business/eventmappers/contacteventmapper.h \
     192                src/business/igroup.h \
     193                src/business/eventmappers/groupeventmapper.h \
     194                src/business/eventmappers/groupeventmapper.h
     195        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/eventmappers/groupeventmapper.h -o debug/moc_groupeventmapper.cpp
     196
     197debug/moc_contacteventmapper.cpp: src/business/eventmappers/eventinterfaces.h \
     198                src/business/iinterface.h \
     199                src/business/icontact.h \
     200                src/business/eventmappers/contacteventmapper.h \
     201                src/business/eventmappers/contacteventmapper.h
     202        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/eventmappers/contacteventmapper.h -o debug/moc_contacteventmapper.cpp
     203
     204debug/moc_iaccountsettingswidget.cpp: src/business/iaccount.h \
     205                src/business/istorable.h \
     206                src/business/iinterface.h \
     207                src/persistence/istorageofficer.h \
     208                src/persistence/istorage.h \
     209                src/business/ibinary.h \
     210                src/business/icontact.h \
     211                src/business/eventmappers/contacteventmapper.h \
     212                src/business/eventmappers/eventinterfaces.h \
     213                src/business/igroup.h \
     214                src/business/eventmappers/groupeventmapper.h \
     215                src/business/ivalidatable.h \
     216                src/business/ivalidator.h \
     217                src/business/ivalidationresult.h \
     218                src/business/igateway.h \
     219                src/ui/iaccountsettingswidget.h \
     220                src/business/eventmappers/accounteventmapper.h \
     221                src/ui/iaccountsettingswidget.h
     222        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/iaccountsettingswidget.h -o debug/moc_iaccountsettingswidget.cpp
     223
    137224compiler_rcc_make_all:
    138225compiler_rcc_clean:
    … …  
    150237compiler_lex_make_all:
    151238compiler_lex_clean:
    152 compiler_clean:
     239compiler_clean: compiler_moc_header_clean
    153240
    154241####### Compile
    … …  
    161248                src/business/ibinary.h \
    162249                src/business/icontact.h \
    163                 src/business/inumber.h \
    164                 src/business/istreamable.h \
    165                 src/business/igroup.h \
    166                 src/business/ishortcut.h \
    167                 src/business/igateway.h \
    168                 src/ui/iaccountsettingswidget.h
     250                src/business/eventmappers/contacteventmapper.h \
     251                src/business/eventmappers/eventinterfaces.h \
     252                src/business/igroup.h \
     253                src/business/eventmappers/groupeventmapper.h \
     254                src/business/ivalidatable.h \
     255                src/business/ivalidator.h \
     256                src/business/ivalidationresult.h \
     257                src/business/igateway.h \
     258                src/ui/iaccountsettingswidget.h \
     259                src/business/eventmappers/accounteventmapper.h
    169260        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/iaccount.o src/business/iaccount.cpp
    170261
    … …  
    177268                src/business/ibinary.h \
    178269                src/business/icontact.h \
    179                 src/business/inumber.h \
    180                 src/business/istreamable.h \
    181                 src/business/igroup.h \
    182                 src/business/ishortcut.h \
    183                 src/business/igateway.h \
    184                 src/ui/iaccountsettingswidget.h \
    185                 src/business/ilogingateway.h
     270                src/business/eventmappers/contacteventmapper.h \
     271                src/business/eventmappers/eventinterfaces.h \
     272                src/business/igroup.h \
     273                src/business/eventmappers/groupeventmapper.h \
     274                src/business/ivalidatable.h \
     275                src/business/ivalidator.h \
     276                src/business/ivalidationresult.h \
     277                src/business/igateway.h \
     278                src/ui/iaccountsettingswidget.h \
     279                src/business/eventmappers/accounteventmapper.h \
     280                src/business/ilogingateway.h \
     281                src/business/eventmappers/loginaccounteventmapper.h
    186282        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/iloginaccount.o src/business/iloginaccount.cpp
    187283
    … …  
    191287        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/inumber.o src/business/inumber.cpp
    192288
    193 debug/AbstractSQLiteStorageOfficer.o: src/persistence/AbstractSQLiteStorageOfficer.cpp src/persistence/AbstractSQLiteStorageOfficer.h \
    194                 src/persistence/istorageofficer.h \
    195                 src/business/iinterface.h \
    196                 src/persistence/istorage.h \
    197                 src/business/ibinary.h \
    198                 src/business/icontact.h \
    199                 src/business/inumber.h \
    200                 src/business/istreamable.h \
    201                 src/business/igroup.h \
    202                 src/business/ishortcut.h \
    203                 src/persistence/isqlitestorage.h
    204         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/AbstractSQLiteStorageOfficer.o src/persistence/AbstractSQLiteStorageOfficer.cpp
     289debug/moc_accounteventmapper.o: debug/moc_accounteventmapper.cpp
     290        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_accounteventmapper.o debug/moc_accounteventmapper.cpp
     291
     292debug/moc_loginaccounteventmapper.o: debug/moc_loginaccounteventmapper.cpp
     293        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_loginaccounteventmapper.o debug/moc_loginaccounteventmapper.cpp
     294
     295debug/moc_groupeventmapper.o: debug/moc_groupeventmapper.cpp
     296        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_groupeventmapper.o debug/moc_groupeventmapper.cpp
     297
     298debug/moc_contacteventmapper.o: debug/moc_contacteventmapper.cpp
     299        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_contacteventmapper.o debug/moc_contacteventmapper.cpp
     300
     301debug/moc_iaccountsettingswidget.o: debug/moc_iaccountsettingswidget.cpp
     302        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_iaccountsettingswidget.o debug/moc_iaccountsettingswidget.cpp
    205303
    206304####### Install

  • lib/libinterfaces/Makefile.Release

    r37 r43  
    11#############################################################################
    22# Makefile for building: libinterfaces.a
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Sat Nov 21 17:21:11 2009
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 19 13:13:22 2010
    44# Project:  interfaces.pro
    55# Template: lib
    … …  
    1010CC            = gcc
    1111CXX           = g++
    12 DEFINES       = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
    13 CFLAGS        = -pipe -O2 -fPIC -Wall -W -D_REENTRANT $(DEFINES)
    14 CXXFLAGS      = -pipe -O2 -fPIC -Wall -W -D_REENTRANT $(DEFINES)
    15 INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4 -Iapp -Isrc/interfaces/business/ -Isrc/interfaces/ -I../../src/exceptions -I../../src/utils -Irelease
     12DEFINES       = -DQT_NO_DEBUG -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
     13CFLAGS        = -pipe -O2 -D_REENTRANT -fPIC -Wall -W $(DEFINES)
     14CXXFLAGS      = -pipe -O2 -D_REENTRANT -fPIC -Wall -W $(DEFINES)
     15INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtSql -I/usr/include/qt4 -Iapp -Irelease
    1616AR            = ar cqs
    1717RANLIB        =
    … …  
    4141SOURCES       = src/business/iaccount.cpp \
    4242                src/business/iloginaccount.cpp \
    43                 src/business/inumber.cpp \
    44                 src/persistence/AbstractSQLiteStorageOfficer.cpp
     43                src/business/inumber.cpp release/moc_accounteventmapper.cpp \
     44                release/moc_loginaccounteventmapper.cpp \
     45                release/moc_groupeventmapper.cpp \
     46                release/moc_contacteventmapper.cpp \
     47                release/moc_iaccountsettingswidget.cpp
    4548OBJECTS       = release/iaccount.o \
    4649                release/iloginaccount.o \
    4750                release/inumber.o \
    48                 release/AbstractSQLiteStorageOfficer.o
     51                release/moc_accounteventmapper.o \
     52                release/moc_loginaccounteventmapper.o \
     53                release/moc_groupeventmapper.o \
     54                release/moc_contacteventmapper.o \
     55                release/moc_iaccountsettingswidget.o
    4956DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
    5057                /usr/share/qt4/mkspecs/common/unix.conf \
    … …  
    5966                /usr/share/qt4/mkspecs/features/default_post.prf \
    6067                /usr/share/qt4/mkspecs/features/build_pass.prf \
     68                /usr/share/qt4/mkspecs/features/unix/thread.prf \
    6169                /usr/share/qt4/mkspecs/features/staticlib.prf \
    6270                /usr/share/qt4/mkspecs/features/static.prf \
    6371                /usr/share/qt4/mkspecs/features/warn_on.prf \
    6472                /usr/share/qt4/mkspecs/features/qt.prf \
    65                 /usr/share/qt4/mkspecs/features/unix/thread.prf \
    6673                /usr/share/qt4/mkspecs/features/moc.prf \
    6774                /usr/share/qt4/mkspecs/features/resources.prf \
    … …  
    114121dist:
    115122        @$(CHK_DIR_EXISTS) release/interfaces2.0.0 || $(MKDIR) release/interfaces2.0.0
    116         $(COPY_FILE) --parents $(SOURCES) $(DIST) release/interfaces2.0.0/ && $(COPY_FILE) --parents src/business/iaccount.h src/business/ibinary.h src/business/icontact.h src/business/igateway.h src/business/igroup.h src/business/iinterface.h src/business/ilibrary.h src/business/ilibraryloader.h src/business/iloginaccount.h src/business/ilogingateway.h src/business/inumber.h src/business/ishortcut.h src/business/istorable.h src/business/istreamable.h src/persistence/iaccountmanager.h src/persistence/icontactmanager.h src/persistence/igroupmanager.h src/persistence/isettings.h src/persistence/isqlitestorage.h src/persistence/istorage.h src/persistence/istorageofficer.h src/persistence/AbstractSQLiteStorageOfficer.h src/ui/iaccountsettingswidget.h release/interfaces2.0.0/ && $(COPY_FILE) --parents src/business/iaccount.cpp src/business/iloginaccount.cpp src/business/inumber.cpp src/persistence/AbstractSQLiteStorageOfficer.cpp release/interfaces2.0.0/ && (cd `dirname release/interfaces2.0.0` && $(TAR) interfaces2.0.0.tar interfaces2.0.0 && $(COMPRESS) interfaces2.0.0.tar) && $(MOVE) `dirname release/interfaces2.0.0`/interfaces2.0.0.tar.gz . && $(DEL_FILE) -r release/interfaces2.0.0
     123        $(COPY_FILE) --parents $(SOURCES) $(DIST) release/interfaces2.0.0/ && $(COPY_FILE) --parents src/business/iaccount.h src/business/ibinary.h src/business/icontact.h src/business/igateway.h src/business/igroup.h src/business/iinterface.h src/business/ilibrary.h src/business/ilibraryloader.h src/business/iloginaccount.h src/business/ilogingateway.h src/business/inumber.h src/business/istorable.h src/business/istreamable.h src/business/ivalidatable.h src/business/ivalidator.h src/business/ivalidationresult.h src/business/eventmappers/eventinterfaces.h src/business/eventmappers/accounteventmapper.h src/business/eventmappers/loginaccounteventmapper.h src/business/eventmappers/groupeventmapper.h src/business/eventmappers/contacteventmapper.h src/business/exceptions/EException.h src/business/exceptions/EHttpReadException.h src/business/exceptions/ELibraryLoadException.h src/business/exceptions/EParseException.h src/business/exceptions/HttpExceptions.h src/business/exceptions/LibraryExceptions.h src/business/exceptions/StdExceptions.h src/exceptions/HttpExceptions.h src/exceptions/LibraryExceptions.h src/exceptions/StdExceptions.h src/exceptions/StorageExceptions.h src/persistence/iaccountmanager.h src/persistence/icontactmanager.h src/persistence/igroupmanager.h src/persistence/isettings.h src/persistence/istorage.h src/persistence/istorageofficer.h src/persistence/exceptions/EStorageReadException.h src/persistence/exceptions/EStorageWriteException.h src/persistence/exceptions/StorageExceptions.h src/ui/iaccountsettingswidget.h release/interfaces2.0.0/ && $(COPY_FILE) --parents src/business/iaccount.cpp src/business/iloginaccount.cpp src/business/inumber.cpp release/interfaces2.0.0/ && (cd `dirname release/interfaces2.0.0` && $(TAR) interfaces2.0.0.tar interfaces2.0.0 && $(COMPRESS) interfaces2.0.0.tar) && $(MOVE) `dirname release/interfaces2.0.0`/interfaces2.0.0.tar.gz . && $(DEL_FILE) -r release/interfaces2.0.0
    117124
    118125
    … …  
    133140mocables: compiler_moc_header_make_all compiler_moc_source_make_all
    134141
    135 compiler_moc_header_make_all:
     142compiler_moc_header_make_all: release/moc_accounteventmapper.cpp release/moc_loginaccounteventmapper.cpp release/moc_groupeventmapper.cpp release/moc_contacteventmapper.cpp release/moc_iaccountsettingswidget.cpp
    136143compiler_moc_header_clean:
     144        -$(DEL_FILE) release/moc_accounteventmapper.cpp release/moc_loginaccounteventmapper.cpp release/moc_groupeventmapper.cpp release/moc_contacteventmapper.cpp release/moc_iaccountsettingswidget.cpp
     145release/moc_accounteventmapper.cpp: src/business/eventmappers/eventinterfaces.h \
     146                src/business/iinterface.h \
     147                src/business/icontact.h \
     148                src/business/eventmappers/contacteventmapper.h \
     149                src/business/iaccount.h \
     150                src/business/istorable.h \
     151                src/persistence/istorageofficer.h \
     152                src/persistence/istorage.h \
     153                src/business/ibinary.h \
     154                src/business/igroup.h \
     155                src/business/eventmappers/groupeventmapper.h \
     156                src/business/ivalidatable.h \
     157                src/business/ivalidator.h \
     158                src/business/ivalidationresult.h \
     159                src/business/igateway.h \
     160                src/ui/iaccountsettingswidget.h \
     161                src/business/eventmappers/accounteventmapper.h \
     162                src/business/eventmappers/accounteventmapper.h
     163        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/eventmappers/accounteventmapper.h -o release/moc_accounteventmapper.cpp
     164
     165release/moc_loginaccounteventmapper.cpp: src/business/eventmappers/accounteventmapper.h \
     166                src/business/eventmappers/eventinterfaces.h \
     167                src/business/iinterface.h \
     168                src/business/icontact.h \
     169                src/business/eventmappers/contacteventmapper.h \
     170                src/business/iaccount.h \
     171                src/business/istorable.h \
     172                src/persistence/istorageofficer.h \
     173                src/persistence/istorage.h \
     174                src/business/ibinary.h \
     175                src/business/igroup.h \
     176                src/business/eventmappers/groupeventmapper.h \
     177                src/business/ivalidatable.h \
     178                src/business/ivalidator.h \
     179                src/business/ivalidationresult.h \
     180                src/business/igateway.h \
     181                src/ui/iaccountsettingswidget.h \
     182                src/business/iloginaccount.h \
     183                src/business/ilogingateway.h \
     184                src/business/eventmappers/loginaccounteventmapper.h \
     185                src/business/eventmappers/loginaccounteventmapper.h
     186        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/eventmappers/loginaccounteventmapper.h -o release/moc_loginaccounteventmapper.cpp
     187
     188release/moc_groupeventmapper.cpp: src/business/eventmappers/eventinterfaces.h \
     189                src/business/iinterface.h \
     190                src/business/icontact.h \
     191                src/business/eventmappers/contacteventmapper.h \
     192                src/business/igroup.h \
     193                src/business/eventmappers/groupeventmapper.h \
     194                src/business/eventmappers/groupeventmapper.h
     195        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/eventmappers/groupeventmapper.h -o release/moc_groupeventmapper.cpp
     196
     197release/moc_contacteventmapper.cpp: src/business/eventmappers/eventinterfaces.h \
     198                src/business/iinterface.h \
     199                src/business/icontact.h \
     200                src/business/eventmappers/contacteventmapper.h \
     201                src/business/eventmappers/contacteventmapper.h
     202        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/eventmappers/contacteventmapper.h -o release/moc_contacteventmapper.cpp
     203
     204release/moc_iaccountsettingswidget.cpp: src/business/iaccount.h \
     205                src/business/istorable.h \
     206                src/business/iinterface.h \
     207                src/persistence/istorageofficer.h \
     208                src/persistence/istorage.h \
     209                src/business/ibinary.h \
     210                src/business/icontact.h \
     211                src/business/eventmappers/contacteventmapper.h \
     212                src/business/eventmappers/eventinterfaces.h \
     213                src/business/igroup.h \
     214                src/business/eventmappers/groupeventmapper.h \
     215                src/business/ivalidatable.h \
     216                src/business/ivalidator.h \
     217                src/business/ivalidationresult.h \
     218                src/business/igateway.h \
     219                src/ui/iaccountsettingswidget.h \
     220                src/business/eventmappers/accounteventmapper.h \
     221                src/ui/iaccountsettingswidget.h
     222        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/iaccountsettingswidget.h -o release/moc_iaccountsettingswidget.cpp
     223
    137224compiler_rcc_make_all:
    138225compiler_rcc_clean:
    … …  
    150237compiler_lex_make_all:
    151238compiler_lex_clean:
    152 compiler_clean:
     239compiler_clean: compiler_moc_header_clean
    153240
    154241####### Compile
    … …  
    161248                src/business/ibinary.h \
    162249                src/business/icontact.h \
    163                 src/business/inumber.h \
    164                 src/business/istreamable.h \
    165                 src/business/igroup.h \
    166                 src/business/ishortcut.h \
    167                 src/business/igateway.h \
    168                 src/ui/iaccountsettingswidget.h
     250                src/business/eventmappers/contacteventmapper.h \
     251                src/business/eventmappers/eventinterfaces.h \
     252                src/business/igroup.h \
     253                src/business/eventmappers/groupeventmapper.h \
     254                src/business/ivalidatable.h \
     255                src/business/ivalidator.h \
     256                src/business/ivalidationresult.h \
     257                src/business/igateway.h \
     258                src/ui/iaccountsettingswidget.h \
     259                src/business/eventmappers/accounteventmapper.h
    169260        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/iaccount.o src/business/iaccount.cpp
    170261
    … …  
    177268                src/business/ibinary.h \
    178269                src/business/icontact.h \
    179                 src/business/inumber.h \
    180                 src/business/istreamable.h \
    181                 src/business/igroup.h \
    182                 src/business/ishortcut.h \
    183                 src/business/igateway.h \
    184                 src/ui/iaccountsettingswidget.h \
    185                 src/business/ilogingateway.h
     270                src/business/eventmappers/contacteventmapper.h \
     271                src/business/eventmappers/eventinterfaces.h \
     272                src/business/igroup.h \
     273                src/business/eventmappers/groupeventmapper.h \
     274                src/business/ivalidatable.h \
     275                src/business/ivalidator.h \
     276                src/business/ivalidationresult.h \
     277                src/business/igateway.h \
     278                src/ui/iaccountsettingswidget.h \
     279                src/business/eventmappers/accounteventmapper.h \
     280                src/business/ilogingateway.h \
     281                src/business/eventmappers/loginaccounteventmapper.h
    186282        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/iloginaccount.o src/business/iloginaccount.cpp
    187283
    … …  
    191287        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/inumber.o src/business/inumber.cpp
    192288
    193 release/AbstractSQLiteStorageOfficer.o: src/persistence/AbstractSQLiteStorageOfficer.cpp src/persistence/AbstractSQLiteStorageOfficer.h \
    194                 src/persistence/istorageofficer.h \
    195                 src/business/iinterface.h \
    196                 src/persistence/istorage.h \
    197                 src/business/ibinary.h \
    198                 src/business/icontact.h \
    199                 src/business/inumber.h \
    200                 src/business/istreamable.h \
    201                 src/business/igroup.h \
    202                 src/business/ishortcut.h \
    203                 src/persistence/isqlitestorage.h
    204         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/AbstractSQLiteStorageOfficer.o src/persistence/AbstractSQLiteStorageOfficer.cpp
     289release/moc_accounteventmapper.o: release/moc_accounteventmapper.cpp
     290        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_accounteventmapper.o release/moc_accounteventmapper.cpp
     291
     292release/moc_loginaccounteventmapper.o: release/moc_loginaccounteventmapper.cpp
     293        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_loginaccounteventmapper.o release/moc_loginaccounteventmapper.cpp
     294
     295release/moc_groupeventmapper.o: release/moc_groupeventmapper.cpp
     296        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_groupeventmapper.o release/moc_groupeventmapper.cpp
     297
     298release/moc_contacteventmapper.o: release/moc_contacteventmapper.cpp
     299        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_contacteventmapper.o release/moc_contacteventmapper.cpp
     300
     301release/moc_iaccountsettingswidget.o: release/moc_iaccountsettingswidget.cpp
     302        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_iaccountsettingswidget.o release/moc_iaccountsettingswidget.cpp
    205303
    206304####### Install

  • lib/libinterfaces/interfaces.pro

    r41 r43  
    77TARGET = interfaces
    88QT += core \
    9     network
     9    network \
     10    sql
     11LIBS += -L../
    1012INCLUDEPATH += app
    1113HEADERS += src/business/iaccount.h \
    … …  
    2022    src/business/ilogingateway.h \
    2123    src/business/inumber.h \
    22     src/business/ishortcut.h \
    2324    src/business/istorable.h \
    2425    src/business/istreamable.h \
    … …  
    2627    src/business/ivalidator.h \
    2728    src/business/ivalidationresult.h \
     29    src/business/eventmappers/eventinterfaces.h \
     30    src/business/eventmappers/accounteventmapper.h \
     31    src/business/eventmappers/loginaccounteventmapper.h \
     32    src/business/eventmappers/groupeventmapper.h \
     33    src/business/eventmappers/contacteventmapper.h \
    2834    src/business/exceptions/EException.h \
    2935    src/business/exceptions/EHttpReadException.h \
    … …  
    4147    src/persistence/igroupmanager.h \
    4248    src/persistence/isettings.h \
    43     src/persistence/isqlitestorage.h \
    44     src/persistence/isqlitestorageofficer.h \
    4549    src/persistence/istorage.h \
    4650    src/persistence/istorageofficer.h \

  • lib/libinterfaces/src/business/iaccount.h

    r41 r43  
    1111#include <QObject>
    1212#include <QString>
    13 #include <QList>
     13#include <QSet>
    1414
    1515#include "istorable.h"
    1616#include "ivalidatable.h"
    17 
    18 class IContact;
    19 class IGateway;
    2017
    2118namespace Account {
    … …  
    3027    };
    3128}
     29
     30class IContact;
     31class IGateway;
     32class AccountEventMapper;
    3233
    3334class IAccount: public IStorable, public IValidatable {
    … …  
    5657    virtual void      unInitialize() =0;
    5758
    58     virtual void      sendSMS(const QString& message, const QList<IContact*>& recipients) =0;
     59    virtual void      sendSMS(const QString& message, const QSet<IContact*>& recipients) =0;
    5960    virtual bool      isSendingCanceled() =0;
    6061    virtual void      cancelSMSSending() =0;
    6162
    6263    virtual IAccount* getClonedInstance() const =0;
     64
     65    virtual AccountEventMapper* eventMapper() const =0;
    6366
    6467protected:
    … …  
    7376    virtual void      uncancelSendingSMS() =0;
    7477};
     78Q_DECLARE_INTERFACE(IAccount,
     79                     "ch.gorrion.smssender.IAccount/1.0")
    7580
    7681#include "icontact.h"
    7782#include "igateway.h"
    78 
    79 Q_DECLARE_INTERFACE(IAccount,
    80                      "ch.gorrion.smssender.IAccount/1.0")
    81 
     83#include "eventmappers/accounteventmapper.h"
    8284
    8385#endif /* IACCOUNT_H_ */

  • lib/libinterfaces/src/business/icontact.h

    r41 r43  
    1010
    1111#include <QObject>
     12#include <QImage>
    1213#include <QString>
    1314#include <QStringList>
    … …  
    1516#include "iinterface.h"
    1617
    17 class IBinary;
    18 class INumber;
     18class SNumber;
     19class ContactEventMapper;
    1920
    2021class IContact: public IInterface {
    21     Q_INTERFACES(IStorable IValidatable)
     22    Q_INTERFACES(IInterface)
    2223
    2324public:
    2425    virtual int         id() const =0;
    2526    virtual QString     name() const =0;
    26     virtual INumber*    number() const =0;
     27    virtual SNumber     number() const =0;
    2728    virtual QStringList aliases() const =0;
    28     virtual IBinary*    image() const =0;
     29    virtual QImage      image() const =0;
    2930
    30     virtual void setID(int id)=0;
     31    virtual void setId(int id)=0;
    3132    virtual void setName(const QString& name)=0;
    32     virtual void setNumber(const INumber& number)=0;
    33     virtual void setNumber(const QString& numberStr)=0;
     33    virtual void setNumber(const SNumber& number)=0;
    3434    virtual void setAliases(const QStringList& aliases)=0;
    35     virtual void setImage(const IBinary& image)=0;
     35    virtual void setImage(const QImage& image)=0;
     36
     37    virtual ContactEventMapper* eventMapper() const =0;
    3638};
     39Q_DECLARE_INTERFACE(IContact,
     40                    "ch.gorrion.smssender.IContact/1.0")
    3741
    38 #include "ibinary.h"
    39 #include "inumber.h"
    40 
    41 Q_DECLARE_INTERFACE(IContact,
    42                      "ch.gorrion.smssender.IContact/1.0")
    43 
     42#include "eventmappers/contacteventmapper.h"
    4443
    4544#endif /* ICONTACT_H_ */

  • lib/libinterfaces/src/business/igateway.h

    r41 r43  
    1313#include <QList>
    1414#include <QWidget>
     15#include <QImage>
    1516
    1617#include "iinterface.h"
    … …  
    1920class IContact;
    2021class IAccountSettingsWidget;
    21 
    22 #include "../persistence/istorage.h"
     22class IStorage;
    2323
    2424class IGateway: public IInterface {
    … …  
    2727public:
    2828    virtual QString        name() const =0;
     29    virtual QImage         icon() const =0;
     30
    2931    virtual IAccount*      createAccountInstance() const =0;
    3032    virtual IAccount*      createAccountInstance(IStorage* storage) const =0;
    … …  
    4042};
    4143
     44Q_DECLARE_INTERFACE(IGateway,
     45                     "ch.gorrion.smssender.IGateway/1.0")
     46
    4247#include "iaccount.h"
    4348#include "icontact.h"
    4449#include "../ui/iaccountsettingswidget.h"
    45 
    46 Q_DECLARE_INTERFACE(IGateway,
    47                      "ch.gorrion.smssender.IGateway/1.0")
    48 
     50#include "../persistence/istorage.h"
    4951
    5052#endif /* IGATEWAY_H_ */

  • lib/libinterfaces/src/business/igroup.h

    r41 r43  
    1010
    1111#include <QObject>
     12#include <QImage>
    1213#include <QString>
    13 #include <QList>
     14#include <QSet>
    1415
    1516#include "iinterface.h"
    1617
    17 class IBinary;
    1818class IContact;
     19class GroupEventMapper;
    1920
    2021class IGroup: public IInterface {
    21     Q_INTERFACES(IStorable IValidatable)
     22    Q_INTERFACES(IInterface)
    2223
    2324public:
    24     virtual int              id() const =0;
    25     virtual QString          name() const =0;
    26     virtual IBinary*         image() const =0;
    27     virtual QList<IContact*> contacts() const =0;
     25    virtual int             id() const =0;
     26    virtual QString         name() const =0;
     27    virtual QImage          image() const =0;
     28    virtual QSet<IContact*> contacts() const =0;
    2829
    29     virtual void setID(int id)=0;
     30    virtual void setId(int id)=0;
    3031    virtual void setName(const QString& name)=0;
    31     virtual void setImage(const IBinary& image)=0;
     32    virtual void setImage(const QImage& image)=0;
    3233//    virtual void setContacts(const QSet<int>& contactIds)=0;
    33     virtual void setContacts(const QList<IContact*>& contacts)=0;
     34    virtual void setContacts(const QSet<IContact*>& contacts)=0;
    3435
    3536//    virtual void addContact(int contactId)=0;
    … …  
    3738    virtual void removeContact(int contactId)=0;
    3839    virtual void removeContact(IContact* contact)=0;
     40
     41    virtual GroupEventMapper* eventMapper() const =0;
    3942};
    40 
    41 #include "ibinary.h"
    42 #include "icontact.h"
    43 
    4443Q_DECLARE_INTERFACE(IGroup,
    4544                     "ch.gorrion.smssender.IGroup/1.0")
    4645
     46#include "icontact.h"
     47#include "eventmappers/groupeventmapper.h"
     48
    4749#endif /* IGROUP_H_ */

  • lib/libinterfaces/src/business/iinterface.h

    r41 r43  
    1818Q_DECLARE_INTERFACE(IInterface, "ch.gorrion.smssender.IInterface/1.0")
    1919
     20
     21#if !defined(SET_IF_DIFFERENT)
     22#  define SET_IF_DIFFERENT(local, other) if (local != other) local = other;
     23#endif
     24/*#if !defined(SET_IF_DIFFERENT_AND_EMIT)
     25#  define SET_IF_DIFFERENT_AND_EMIT(local, other, emit_) (if (local != other){ local = other; emit emit_;})
     26#endif*/
     27
    2028#endif /* IINTERFACE_H_ */

  • lib/libinterfaces/src/business/iloginaccount.h

    r41 r43  
    99#define ILOGINACOUNT_H_
    1010
     11#include <QObject>
     12#include <QString>
     13
    1114#include "iaccount.h"
    1215#include "ilogingateway.h"
    1316
    14 #include <QObject>
    15 #include <QString>
     17#include "eventmappers/loginaccounteventmapper.h"
    1618
    1719namespace LoginAccount {
    … …  
    3941    virtual void      logout(bool FORCE = false) =0;
    4042
     43    virtual LoginAccountEventMapper* eventMapper() const =0;
     44
    4145protected:
    4246    virtual void      setLoggedIn(bool loggedIn) =0;
    4347};
    44 
    4548Q_DECLARE_INTERFACE(ILoginAccount,
    4649                     "ch.gorrion.smssender.ILoginAccount/1.0")

  • lib/libinterfaces/src/business/ilogingateway.h

    r41 r43  
    1919    virtual bool stayLoggedIn() const =0;
    2020};
    21 
    2221Q_DECLARE_INTERFACE(ILoginGateway,
    2322                     "ch.gorrion.smssender.ILoginGateway/1.0")

  • lib/libinterfaces/src/business/inumber.h

    r41 r43  
    99#define INUMBER_H_
    1010
    11 #include "istreamable.h"
    12 
    1311#include <QObject>
    1412#include <QString>
     13
     14#include "istreamable.h"
    1515
    1616class INumber: public IStreamable{
    … …  
    3232    virtual QString error() const =0;
    3333
     34    virtual QString toString() const =0;
    3435    virtual QString toString(const QString& format = INumber::IsoFormat) const =0;
     36    virtual void    fromString(const QString& string) =0;
    3537};
    36 
    3738Q_DECLARE_INTERFACE(INumber,
    3839                     "ch.gorrion.smssender.INumber/1.0")

  • lib/libinterfaces/src/persistence/iaccountmanager.h

    r41 r43  
    2525    virtual void removeAccount(IAccount* account)=0;
    2626};
    27 
    2827Q_DECLARE_INTERFACE(IAccountManager,
    2928                     "ch.gorrion.smssender.IAccountManager/1.0")

  • lib/libinterfaces/src/persistence/icontactmanager.h

    r41 r43  
    1010
    1111#include <QObject>
    12 #include <QMap>
     12#include <QSet>
    1313
    1414#include "../business/iinterface.h"
    … …  
    1919
    2020public:
    21     virtual IContact*            getContact(int contactId)=0;
    22     virtual QMap<int, IContact*> getContactList()=0;
     21    virtual IContact*       getContact(int contactId)=0;
     22    virtual QSet<IContact*> getContactList()=0;
    2323
    2424    virtual void saveContact(IContact* contact)=0;
    … …  
    2626    virtual void removeContact(int contactId)=0;
    2727};
    28 
    2928Q_DECLARE_INTERFACE(IContactManager,
    3029                     "ch.gorrion.smssender.IContactManager/1.0")

  • lib/libinterfaces/src/persistence/igroupmanager.h

    r41 r43  
    1010
    1111#include <QObject>
    12 #include <QMap>
     12#include <QSet>
    1313
    1414#include "../business/iinterface.h"
    … …  
    1919
    2020public:
    21     virtual IGroup*            getGroup(int groupId)=0;
    22     virtual QMap<int, IGroup*> getGroupList()=0;
     21    virtual IGroup*       getGroup(int groupId)=0;
     22    virtual QSet<IGroup*> getGroupList()=0;
    2323
    2424    virtual void saveGroup(IGroup* group)=0;
    … …  
    2626    virtual void removeGroup(int groupId)=0;
    2727};
    28 
    2928Q_DECLARE_INTERFACE(IGroupManager,
    3029                     "ch.gorrion.smssender.IGroupManager/1.0")

  • lib/libinterfaces/src/persistence/isettings.h

    r41 r43  
    1515
    1616#include "../business/iinterface.h"
    17 #include "../business/ishortcut.h"
     17
     18class SShortcut;
    1819
    1920class ISettings: public IInterface{
    … …  
    3637        virtual QString getProxyPassword()=0;
    3738
    38         virtual IShortcut* getNewMessageShortCut()=0;
    39         virtual IShortcut* getClearMessageTextShortCut()=0;
    40     virtual IShortcut* getClearRecipientsShortCut()=0;
    41         virtual IShortcut* getSendShortCut()=0;
     39        virtual SShortcut getNewMessageShortCut()=0;
     40        virtual SShortcut getClearMessageTextShortCut()=0;
     41    virtual SShortcut getClearRecipientsShortCut()=0;
     42        virtual SShortcut getSendShortCut()=0;
    4243
    4344        virtual QString getUpdateUrl()=0;
    … …  
    5960        virtual void setProxyPassword(const QString& password)=0;
    6061
    61         virtual void setNewMessageShortCut(IShortcut* shortcut)=0;
    62         virtual void setClearMessageTextShortCut(IShortcut* shortcut)=0;
    63         virtual void setClearRecipientsShortCut(IShortcut* shortcut)=0;
    64         virtual void setSendShortCut(IShortcut* shortcut)=0;
     62        virtual void setNewMessageShortCut(const SShortcut& shortcut)=0;
     63        virtual void setClearMessageTextShortCut(const SShortcut& shortcut)=0;
     64        virtual void setClearRecipientsShortCut(const SShortcut& shortcut)=0;
     65        virtual void setSendShortCut(const SShortcut& shortcut)=0;
    6566};
    66 
    6767Q_DECLARE_INTERFACE(ISettings,
    6868                     "ch.gorrion.smssender.ISettings/1.0")

  • lib/libinterfaces/src/persistence/istorage.h

    r41 r43  
    1010
    1111#include <QObject>
    12 #include <QMap>
     12#include <QImage>
     13#include <QSet>
    1314#include <QString>
     15#include <QSqlDatabase>
     16#include <QSqlQuery>
     17#include <QVariant>
    1418
    1519#include "../business/iinterface.h"
    … …  
    1721#include "../business/icontact.h"
    1822#include "../business/igroup.h"
    19 #include "../business/ishortcut.h"
    2023
     24class SShortcut;
    2125class IAccount;
    2226
    … …  
    2529
    2630public:
    27     virtual IBinary*   readBlob(const QString& _namespace, const QString& key, const char* defaultValue = 0) =0;
     31    virtual QVariant   readValue(const QString& _namespace, const QString& key, const QVariant& defaultValue = QVariant()) =0;
    2832    virtual bool       readBool(const QString& _namespace, const QString& key, bool defaultValue = false) =0;
    2933    virtual int        readInt(const QString& _namespace, const QString& key, int defaultValue = 0) =0;
    3034    virtual QString    readString(const QString& _namespace, const QString& key, const QString& defaultValue = "") =0;
    3135    virtual QString    readEncryptedString(const QString& _namespace, const QString& key, const QString& password, const QString& defaultValue = "") =0;
     36    virtual QImage     readImage(const QString& _namespace, const QString& key, const QImage& defaultValue = QImage()) =0;
    3237    virtual IContact*  readContact(int contactId) =0;
    3338    virtual IGroup*    readGroup(int groupId) =0;
    34     virtual IShortcut* readShortcut(const QString& key) =0;
     39    virtual SShortcut readShortcut(const QString& key) =0;
    3540
    36     virtual QMap<int, IContact*>    readContactList() =0;
    37     virtual QMap<int, IGroup*>       readGroupList() =0;
     41    virtual QSet<IContact*> readContactList() =0;
     42    virtual QSet<IGroup*>   readGroupList() =0;
    3843
    39     virtual void writeBlob(const QString& _namespace, const QString& key, const char* value, int size) =0;
    40     virtual void writeBlob(const QString& _namespace, const QString& key, const IBinary& binary) =0;
     44    virtual void writeValue(const QString& _namespace, const QString& key, const QVariant& value) =0;
    4145    virtual void writeBool(const QString& _namespace, const QString& key, bool value) =0;
    4246    virtual void writeInt(const QString& _namespace, const QString& key, int value) =0;
    4347    virtual void writeString(const QString& _namespace, const QString& key, const QString& value) =0;
    4448    virtual void writeEncryptedString(const QString& _namespace, const QString& key, const QString& password, const QString& value) =0;
    45 
     49    virtual void writeImage(const QString& _namespace, const QString& key, const QImage& image) =0;
    4650    virtual void writeContact(IContact* contact) =0;
    4751    virtual void writeGroup(IGroup* group) =0;
    48     virtual void writeShortcut(const QString& key, const IShortcut* shortcut) =0;
     52    virtual void writeShortcut(const QString& key, const SShortcut& shortcut) =0;
    4953
    5054    virtual void removeValue(const QString& _namespace, const QString& key) =0;
    … …  
    5357    virtual void removeContact(int contactId) =0;
    5458    virtual void removeGroup(int groupId) =0;
     59
     60    virtual QSqlDatabase connection() const =0;
     61    virtual QSqlQuery    createQuery() const =0;
    5562};
    56 
    5763Q_DECLARE_INTERFACE(IStorage,
    5864                     "ch.gorrion.smssender.IStorage/1.0")

  • lib/libinterfaces/src/persistence/istorageofficer.h

    r41 r43  
    2323
    2424    virtual IStorage* storage() const =0;
     25    virtual QString   getNamespace() const =0;
    2526};
    26 
    2727Q_DECLARE_INTERFACE(IStorageOfficer,
    2828                     "ch.gorrion.smssender.IStorageOfficer/1.0")

  • lib/resource.qrc

    r41 r43  
    11<RCC>
    22  <qresource prefix="ico">
     3    <file>edit.png</file>
    34    <file>sms_new.png</file>
    45    <file>blank.png</file>

  • locale/de.ts

    r42 r43  
    33<TS version="2.0" language="de" sourcelanguage="en">
    44<context>
     5    <name>AccountModel</name>
     6    <message>
     7        <location filename="../src/ui/models/accountmodel.cpp" line="36"/>
     8        <source>Name</source>
     9        <translation>Name</translation>
     10    </message>
     11    <message>
     12        <location filename="../src/ui/models/accountmodel.cpp" line="37"/>
     13        <source>Gateway</source>
     14        <translation>Dienst</translation>
     15    </message>
     16    <message>
     17        <location filename="../src/ui/models/accountmodel.cpp" line="38"/>
     18        <source>Enabled</source>
     19        <translation>Aktiviert</translation>
     20    </message>
     21</context>
     22<context>
     23    <name>ClearButton</name>
     24    <message>
     25        <location filename="../src/ui/components/clearbutton.cpp" line="77"/>
     26        <source>Clear</source>
     27        <translation>Löschen</translation>
     28    </message>
     29</context>
     30<context>
     31    <name>DAAccountListManager</name>
     32    <message>
     33        <location filename="../src/persistence/storage/DAAccountListManager.cpp" line="32"/>
     34        <source>No such account in the database! [accountId: %1]</source>
     35        <translation>Dieses Konto existiert nicht in der Datenbank! [Konto-Id: %1]</translation>
     36    </message>
     37</context>
     38<context>
     39    <name>DAStorage</name>
     40    <message>
     41        <location filename="../src/persistence/storage/DAStorage.cpp" line="40"/>
     42        <source>Can&apos;t open the database!</source>
     43        <translation>Konnte keine Verbindung zur Datenbank herstellen!</translation>
     44    </message>
     45    <message>
     46        <location filename="../src/persistence/storage/DAStorage.cpp" line="62"/>
     47        <source>Could not write the table definitions to the database.</source>
     48        <translation>Konnte die Tabellendefinitionen nicht in die Datenbank schreiben.</translation>
     49    </message>
     50    <message>
     51        <location filename="../src/persistence/storage/DAStorage.cpp" line="127"/>
     52        <source>No such contact in the database! [contactId: %1]</source>
     53        <translation>Dieser Kontakt existiert nicht in der Datenbank! [Kontakt-Id: %1]</translation>
     54    </message>
     55    <message>
     56        <location filename="../src/persistence/storage/DAStorage.cpp" line="150"/>
     57        <source>No such group in the database! [groupId: %1]</source>
     58        <translation>Diese Gruppe existiert nicht in der Datenbank! [Gruppen-Id: %1]</translation>
     59    </message>
     60    <message>
     61        <location filename="../src/persistence/storage/DAStorage.cpp" line="228"/>
     62        <source>Could not write setting to the database.</source>
     63        <translation>Konnte eine Einstellung nicht in die Datenbank schreiben.</translation>
     64    </message>
     65    <message>
     66        <location filename="../src/persistence/storage/DAStorage.cpp" line="249"/>
     67        <source>Could not write an encrypted string to the database. [%1, %2]</source>
     68        <translation>Konnte ein verschlüsselter Wert nicht in die Datenbank schreiben. [%1, %2]</translation>
     69    </message>
     70    <message>
     71        <location filename="../src/persistence/storage/DAStorage.cpp" line="288"/>
     72        <location filename="../src/persistence/storage/DAStorage.cpp" line="296"/>
     73        <location filename="../src/persistence/storage/DAStorage.cpp" line="310"/>
     74        <source>The contact could not have been written to the database.</source>
     75        <translation>Der Kontakt konnte nicht in die Datenbank geschrieben werden.</translation>
     76    </message>
     77    <message>
     78        <location filename="../src/persistence/storage/DAStorage.cpp" line="340"/>
     79        <location filename="../src/persistence/storage/DAStorage.cpp" line="348"/>
     80        <location filename="../src/persistence/storage/DAStorage.cpp" line="360"/>
     81        <source>The group could not have been written to the database.</source>
     82        <translation>Die Gruppe konnte nicht in die Datenbank geschrieben werden.</translation>
     83    </message>
     84    <message>
     85        <location filename="../src/persistence/storage/DAStorage.cpp" line="385"/>
     86        <source>Could not remove the setting from the database.</source>
     87        <translation>Konnte eine Einstellung nicht aus der Datenbank entfernen.</translation>
     88    </message>
     89    <message>
     90        <location filename="../src/persistence/storage/DAStorage.cpp" line="394"/>
     91        <source>Could not remove the settings from the database.</source>
     92        <translation>Konnte die Einstellungen nicht aus der Datenbank entfernen.</translation>
     93    </message>
     94    <message>
     95        <location filename="../src/persistence/storage/DAStorage.cpp" line="412"/>
     96        <source>Could not remove the contact from the database.</source>
     97        <translation>Der Kontakt konnte nicht aus der Datenbank entfernt werden.</translation>
     98    </message>
     99    <message>
     100        <location filename="../src/persistence/storage/DAStorage.cpp" line="429"/>
     101        <source>Could not remove the group from the database.</source>
     102        <translation>Die Gruppe konnte nicht aus der Datenbank entfernt werden.</translation>
     103    </message>
     104</context>
     105<context>
     106    <name>SearchLineEdit</name>
     107    <message>
     108        <location filename="../src/ui/components/searchlineedit.cpp" line="56"/>
     109        <source>Search</source>
     110        <translation>Suchen</translation>
     111    </message>
     112</context>
     113<context>
    5114    <name>VCAccountList</name>
    6115    <message>
    7         <location filename="../src/ui/VCAccountList/vcaccountlist.cpp" line="27"/>
    8         <source>Filter...</source>
    9         <translation>Filter...</translation>
    10     </message>
    11     <message>
    12         <location filename="../src/ui/VCAccountList/vcaccountlist.cpp" line="140"/>
     116        <location filename="../src/ui/VCAccountList/vcaccountlist.cpp" line="87"/>
    13117        <source>SMSSender</source>
    14118        <translation>SMSSender</translation>
    15119    </message>
    16120    <message>
    17         <location filename="../src/ui/VCAccountList/vcaccountlist.cpp" line="141"/>
     121        <location filename="../src/ui/VCAccountList/vcaccountlist.cpp" line="88"/>
    18122        <source>Do you really want to remove this account?</source>
    19123        <translation>Soll dieses Konto wirklich entfernt werden?</translation>
    … …  
    28132    </message>
    29133    <message>
    30         <location filename="../src/ui/VCAccountList/vcaccountlist.ui" line="91"/>
    31         <source>color: rgb(128, 128, 128);</source>
    32         <translation>color: rgb(128, 128, 128);</translation>
    33     </message>
    34     <message>
    35         <location filename="../src/ui/VCAccountList/vcaccountlist.ui" line="94"/>
     134        <location filename="../src/ui/VCAccountList/vcaccountlist.ui" line="32"/>
     135        <source>Add new account</source>
     136        <translation>Neues Konto hinzufügen</translation>
     137    </message>
     138    <message>
     139        <location filename="../src/ui/VCAccountList/vcaccountlist.ui" line="58"/>
     140        <source>Remove account</source>
     141        <translation>Konto entfernen</translation>
     142    </message>
     143    <message>
     144        <location filename="../src/ui/VCAccountList/vcaccountlist.ui" line="84"/>
     145        <source>Edit account</source>
     146        <translation>Konto bearbeiten</translation>
     147    </message>
     148    <message>
     149        <location filename="../src/ui/VCAccountList/vcaccountlist.ui" line="123"/>
    36150        <source>Filter...</source>
    37151        <translation>Filter...</translation>
    38152    </message>
    39153    <message>
    40         <location filename="../src/ui/VCAccountList/vcaccountlist.ui" line="144"/>
    41         <source>Name</source>
    42         <translation>Name</translation>
    43     </message>
    44     <message>
    45         <location filename="../src/ui/VCAccountList/vcaccountlist.ui" line="152"/>
    46         <source>Gateway</source>
    47         <translation>Dienst</translation>
    48     </message>
    49     <message>
    50         <location filename="../src/ui/VCAccountList/vcaccountlist.ui" line="198"/>
     154        <location filename="../src/ui/VCAccountList/vcaccountlist.ui" line="196"/>
    51155        <source>Close</source>
    52156        <translation>Schliessen</translation>
    … …  
    61165    </message>
    62166    <message>
    63         <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="285"/>
    64         <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="302"/>
     167        <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="284"/>
     168        <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="301"/>
    65169        <source>SMSSender</source>
    66170        <translation>SMSSender</translation>
    67171    </message>
    68172    <message>
    69         <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="286"/>
     173        <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="285"/>
    70174        <source>Do you really want to remove this contact?</source>
    71175        <translation>Soll dieser Kontakt wirklich gelöscht werden?</translation>
    72176    </message>
    73177    <message>
    74         <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="303"/>
     178        <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="302"/>
    75179        <source>Do you really want to remove this group?</source>
    76180        <translation>Soll diese Gruppe wirklich gelöscht werden?</translation>
    … …  
    131235    <name>VCEditAccount</name>
    132236    <message>
    133         <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="93"/>
     237        <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="94"/>
    134238        <source>This account name is already in use.</source>
    135239        <translation>Dieser Kontonamen existiert bereits.       </translation>
    136240    </message>
    137241    <message>
    138         <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="103"/>
    139         <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="108"/>
     242        <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="102"/>
     243        <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="107"/>
    140244        <source>SMSSender</source>
    141245        <translation>SMSSender</translation>
    … …  
    261365    <name>VCEditGroup</name>
    262366    <message>
    263         <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="62"/>
     367        <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="61"/>
    264368        <source>Change icon</source>
    265369        <translation>Bild ändern</translation>
    266370    </message>
    267371    <message>
    268         <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="68"/>
     372        <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="67"/>
    269373        <source>Remove icon</source>
    270374        <translation>Bild entfernen</translation>
    271375    </message>
    272376    <message>
    273         <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="107"/>
     377        <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="106"/>
    274378        <source>Images</source>
    275379        <translation>Bilder</translation>
    276380    </message>
    277381    <message>
    278         <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="114"/>
     382        <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="113"/>
    279383        <source>Open File</source>
    280384        <translation>Datei öffnen</translation>
    … …  
    319423    <name>VCMain</name>
    320424    <message>
    321         <location filename="../src/ui/VCMain/vcmain.cpp" line="281"/>
     425        <location filename="../src/ui/VCMain/vcmain.cpp" line="297"/>
    322426        <source>SMS sent</source>
    323427        <translation>SMS versandt</translation>
    324428    </message>
    325429    <message>
    326         <location filename="../src/ui/VCMain/vcmain.cpp" line="281"/>
     430        <location filename="../src/ui/VCMain/vcmain.cpp" line="297"/>
    327431        <source>Your sms has successfully been sent.</source>
    328432        <translation>Die SMS wurde gesendet.</translation>
    329433    </message>
    330434    <message>
    331         <location filename="../src/ui/VCMain/vcmain.cpp" line="360"/>
     435        <location filename="../src/ui/VCMain/vcmain.cpp" line="383"/>
    332436        <source>Error occured</source>
    333437        <translation>Fehler aufgetreten</translation>
    334438    </message>
    335439    <message>
    336         <location filename="../src/ui/VCMain/vcmain.cpp" line="360"/>
     440        <location filename="../src/ui/VCMain/vcmain.cpp" line="383"/>
    337441        <source>An unknown error has occured!</source>
    338442        <translation>Ein unbekannter Fehler ist aufgetreten!</translation>
    … …  
    362466    </message>
    363467    <message>
    364         <location filename="../src/ui/VCMain/vcmain.ui" line="98"/>
     468        <location filename="../src/ui/VCMain/vcmain.ui" line="95"/>
    365469        <source>Add</source>
    366470        <translation>Hinzufügen</translation>
    367471    </message>
    368472    <message>
    369         <location filename="../src/ui/VCMain/vcmain.ui" line="118"/>
     473        <location filename="../src/ui/VCMain/vcmain.ui" line="115"/>
    370474        <source>Remove</source>
    371475        <translation>Entfernen</translation>
    372476    </message>
    373477    <message>
    374         <location filename="../src/ui/VCMain/vcmain.ui" line="204"/>
     478        <location filename="../src/ui/VCMain/vcmain.ui" line="201"/>
    375479        <source>Send</source>
    376480        <translation>Senden</translation>
    377481    </message>
    378482    <message>
    379         <location filename="../src/ui/VCMain/vcmain.ui" line="238"/>
     483        <location filename="../src/ui/VCMain/vcmain.ui" line="235"/>
    380484        <source>&amp;File</source>
    381485        <translation>&amp;Datei</translation>
    382486    </message>
    383487    <message>
    384         <location filename="../src/ui/VCMain/vcmain.ui" line="245"/>
     488        <location filename="../src/ui/VCMain/vcmain.ui" line="242"/>
    385489        <source>&amp;Help</source>
    386490        <translation>&amp;Hilfe</translation>
    387491    </message>
    388492    <message>
    389         <location filename="../src/ui/VCMain/vcmain.ui" line="251"/>
     493        <location filename="../src/ui/VCMain/vcmain.ui" line="248"/>
    390494        <source>&amp;Edit</source>
    391495        <translation>&amp;Bearbeiten</translation>
    392496    </message>
    393497    <message>
    394         <location filename="../src/ui/VCMain/vcmain.ui" line="269"/>
     498        <location filename="../src/ui/VCMain/vcmain.ui" line="266"/>
    395499        <source>&amp;Exit</source>
    396500        <translation>&amp;Beenden</translation>
    … …  
    402506    </message>
    403507    <message>
    404         <location filename="../src/ui/VCMain/vcmain.ui" line="287"/>
     508        <location filename="../src/ui/VCMain/vcmain.ui" line="293"/>
    405509        <source>Prefere&amp;nces</source>
    406510        <translation>&amp;Einstellungen</translation>
    407511    </message>
    408512    <message>
    409         <location filename="../src/ui/VCMain/vcmain.ui" line="296"/>
     513        <location filename="../src/ui/VCMain/vcmain.ui" line="305"/>
    410514        <source>&amp;Accounts</source>
    411515        <translation>&amp;Konten</translation>
    412516    </message>
    413517    <message>
    414         <location filename="../src/ui/VCMain/vcmain.ui" line="305"/>
     518        <location filename="../src/ui/VCMain/vcmain.ui" line="314"/>
    415519        <source>Address &amp;Book</source>
    416520        <translation>&amp;Adressbuch</translation>
    417521    </message>
    418522    <message>
    419         <location filename="../src/ui/VCMain/vcmain.ui" line="314"/>
     523        <location filename="../src/ui/VCMain/vcmain.ui" line="323"/>
    420524        <source>&amp;New message</source>
    421525        <translation>&amp;Neue Mitteilung</translation>

  • smssender.pro

    r42 r43  
    55TARGET = smssender-bin
    66QT += core \
    7     gui
     7    gui \
     8    sql
    89LIBS += -Llib/
    910LIBS += -ltntdb \
    1011    -lcrypto++ \
    1112    -ldatatypes \
    12     -linterfaces \
    13     -lutils
     13    -lutils \
     14    -linterfaces
    1415INCLUDEPATH += app \
     16    src/ui/components \
    1517    lib/libinterfaces/src/business \
    1618    lib/libinterfaces/src/exceptions \
    1719    lib/libinterfaces/src \
    1820    lib/libdatatypes/src/business \
     21    lib/libdatatypes/src \
    1922    lib/libutils/src
    20 HEADERS += src/ui/completers/aliascompleter.h \
    21     src/ui/completers/AliasModel.h \
    22     src/ui/completers/FilteredPopupCompleter.h \
    23 #    src/ui/completers/alias.h \
    24 #    src/ui/completers/aliasmanager.h \   
     23HEADERS += src/persistence/storage/DAAccountListManager.h \
     24    src/persistence/storage/DAStorage.h \
     25    src/ui/models/contactgroupmodel.h \
     26    src/ui/models/aliascompletionmodel.h \
     27    src/ui/completers/bettercompleter.h \
     28    src/ui/models/accountmodel.h \
     29    src/ui/delegates/aligndelegate.h \
     30    src/ui/components/clearbutton.h \
     31    src/ui/components/lineedit.h \
     32    src/ui/components/lineedit_p.h \
     33    src/ui/components/searchbutton.h \
     34    src/ui/components/searchlineedit.h \
    2535    src/ui/VCEditAccount/vceditaccount.h \
    2636    src/ui/VCAccountList/vcaccountlist.h \
    2737    src/business/BCAccountLoadThread.h \
    2838    src/business/BCGatewayManager.h \
    29     src/persistence/storage/DASQLiteAccountListManager.h \
    3039    src/persistence/DAAccountManager.h \
    3140    src/business/BCAccountManager.h \
    … …  
    4150    src/business/BCContactManager.h \
    4251    src/business/BusinessFactory.h \
    43     src/persistence/storage/DASQLiteStorage.h \
    4452    src/persistence/DAContactManager.h \
    4553    src/business/BCSettings.h \
    … …  
    4755    src/ui/VCMain/vcmain.h \
    4856    src/ui/VCSettings/vcsettings.h
    49 SOURCES += src/ui/completers/aliascompleter.cpp \
    50     src/ui/completers/AliasModel.cpp \
    51     src/ui/completers/FilteredPopupCompleter.cpp \
    52 #    src/ui/completers/alias.cpp \
    53 #    src/ui/completers/aliasmanager.cpp \
     57SOURCES += src/persistence/storage/DAAccountListManager.cpp \
     58    src/persistence/storage/DAStorage.cpp \
     59    src/ui/models/contactgroupmodel.cpp \
     60    src/ui/models/aliascompletionmodel.cpp \
     61    src/ui/completers/bettercompleter.cpp \
     62    src/ui/models/accountmodel.cpp \
     63    src/ui/delegates/aligndelegate.cpp \
     64    src/ui/components/clearbutton.cpp \
     65    src/ui/components/lineedit.cpp \
     66    src/ui/components/searchbutton.cpp \
     67    src/ui/components/searchlineedit.cpp \
    5468    src/ui/VCEditAccount/vceditaccount.cpp \
    5569    src/ui/VCAccountList/vcaccountlist.cpp \
    5670    src/business/BCAccountLoadThread.cpp \
    5771    src/business/BCGatewayManager.cpp \
    58     src/persistence/storage/DASQLiteAccountListManager.cpp \
    5972    src/persistence/DAAccountManager.cpp \
    6073    src/business/BCAccountManager.cpp \
    … …  
    7083    src/business/BCContactManager.cpp \
    7184    src/business/BusinessFactory.cpp \
    72     src/persistence/storage/DASQLiteStorage.cpp \
    7385    src/business/BCSettings.cpp \
    7486    src/persistence/PersistenceFactory.cpp \

  • src/business/BCAccountManager.cpp

    r40 r43  
    1515}
    1616
     17void BCAccountManager::addAccountToList(IAccount* account) {
     18    if ((account == NULL) || accountList_.contains(account->id()))
     19        return;
     20
     21    accountList_.insert(account->id(), account);
     22
     23    connect(account->eventMapper(), SIGNAL(idChanged(int, int)),
     24            this, SLOT(accountIdChanged(int, int)));
     25    connect(account->eventMapper(), SIGNAL(dataChanged()),
     26            this, SLOT(accountDataChanged()));
     27
     28    emit accountAdded(account);
     29}
     30
     31void BCAccountManager::removeAccountFromList(IAccount* account) {
     32    if ((account == NULL) || !accountList_.contains(account->id()))
     33        return;
     34
     35    disconnect(account->eventMapper(), SIGNAL(idChanged(int, int)),
     36               this, SLOT(accountIdChanged(int, int)));
     37    disconnect(account->eventMapper(), SIGNAL(dataChanged()),
     38               this, SLOT(accountDataChanged()));
     39
     40    accountList_.remove(account->id());
     41    emit accountRemoved(account);
     42}
     43
    1744void BCAccountManager::readAccountsFromStorage() {
    1845    QSet<IAccount*> accountList = PersistenceFactory::instance()->getAccountManager()->getAccountList();
    1946
    20     accountList_.clear();
     47    foreach(IAccount* account, accountList_.values().toSet().subtract(accountList)) {
     48        removeAccountFromList(account);
     49    }
    2150
    22     QSetIterator<IAccount*> i(accountList);
    23     while (i.hasNext()) {
    24         IAccount* account = i.next();
    25         accountList_.insert(account->id(), account);
     51    foreach(IAccount* account, accountList.subtract(accountList_.values().toSet())) {
     52        addAccountToList(account);
    2653    }
    2754}
    … …  
    5380
    5481void BCAccountManager::saveAccount(IAccount* account){
    55     accountList_.remove(account->id());
    5682    PersistenceFactory::instance()->getAccountManager()->saveAccount(account);
    57     accountList_.insert(account->id(), account); // Insert the account to the list
     83    addAccountToList(account);
    5884}
    5985
    6086void BCAccountManager::removeAccount(int accountId){
    61     accountList_.remove(accountId);
     87    IAccount* account = getAccount(accountId);
     88    if (account == NULL)
     89        return;
    6290
    63     PersistenceFactory::instance()->getAccountManager()->removeAccount(getAccount(accountId));
     91    PersistenceFactory::instance()->getAccountManager()->removeAccount(account);
     92    removeAccountFromList(account);
    6493}
     94
     95
     96void BCAccountManager::accountIdChanged(int oldId, int newId) {
     97    IAccount* account = accountList_.take(oldId);
     98    if (account != NULL)
     99        accountList_.insert(newId, account);
     100}
     101void BCAccountManager::accountDataChanged() {
     102    IAccount* account = static_cast<AccountEventMapper*>(sender())->account();
     103    Q_ASSERT(account);
     104    emit accountUpdated(account);
     105
     106}

  • src/business/BCAccountManager.h

    r40 r43  
    99#define BCACCOUNTMANAGER_H_
    1010
     11#include <QObject>
    1112#include <QMap>
    1213#include <QSet>
    … …  
    1617#include "BCAccountLoadManager.h"
    1718
    18 class BCAccountManager {
     19class BCAccountManager: public QObject {
     20    Q_OBJECT
     21
    1922public:
    2023    static BCAccountManager*      instance();
    … …  
    3033    virtual void                  removeAccount(int accountId);
    3134
     35signals:
     36    void                          accountAdded(IAccount* account);
     37    void                          accountUpdated(IAccount* account);
     38    void                          accountRemoved(IAccount* account);
     39
    3240protected:
    3341    BCAccountManager() {};
    34     virtual ~BCAccountManager(){};
     42    virtual ~BCAccountManager() {};
     43
     44protected slots:
     45    void                          accountIdChanged(int oldId, int newId);
     46    void                          accountDataChanged();
    3547
    3648private:
    … …  
    3850
    3951    QMap<int, IAccount*> accountList_;
     52
     53    void                          addAccountToList(IAccount* account);
     54    void                          removeAccountFromList(IAccount* account);
    4055};
    4156

  • src/business/BCContactManager.cpp

    r40 r43  
    1616
    1717BCContactManager::BCContactManager(){
    18     contactList_ = PersistenceFactory::instance()->getContactManager()->getContactList();
     18    readContactsFromStorage();
     19}
     20
     21
     22void BCContactManager::addContactToList(IContact* contact) {
     23    if ((contact == NULL) || contactList_.contains(contact->id()))
     24        return;
     25
     26    contactList_.insert(contact->id(), contact);
     27
     28    connect(contact->eventMapper(), SIGNAL(idChanged(int, int)),
     29            this, SLOT(contactIdChanged(int, int)));
     30    connect(contact->eventMapper(), SIGNAL(dataChanged()),
     31            this, SLOT(contactDataChanged()));
     32
     33    emit contactAdded(contact);
     34}
     35
     36void BCContactManager::removeContactFromList(IContact* contact) {
     37    if ((contact == NULL) || !contactList_.contains(contact->id()))
     38        return;
     39
     40    disconnect(contact->eventMapper(), SIGNAL(idChanged(int, int)),
     41               this, SLOT(contactIdChanged(int, int)));
     42    disconnect(contact->eventMapper(), SIGNAL(dataChanged()),
     43               this, SLOT(contactDataChanged()));
     44
     45    contactList_.remove(contact->id());
     46    emit contactRemoved(contact);
     47}
     48
     49void BCContactManager::readContactsFromStorage() {
     50    QSet<IContact*> contactList = PersistenceFactory::instance()->getContactManager()->getContactList();
     51
     52    foreach(IContact* contact, contactList_.values().toSet().subtract(contactList)) {
     53        removeContactFromList(contact);
     54    }
     55
     56    foreach(IContact* contact, contactList.subtract(contactList_.values().toSet())) {
     57        addContactToList(contact);
     58    }
    1959}
    2060
    … …  
    2363}
    2464
    25 QList<IContact*> BCContactManager::getContactList(){
    26     return contactList_.values();
     65QSet<IContact*> BCContactManager::getContactList(){
     66    return contactList_.values().toSet();
    2767}
    2868
    2969void BCContactManager::saveContact(IContact* contact){
    3070    PersistenceFactory::instance()->getContactManager()->saveContact(contact);
    31     contactList_[contact->id()] = contact; // Insert the contact to the list
     71    addContactToList(contact);
    3272}
    3373
    3474void BCContactManager::removeContact(int contactId){
     75    IContact* contact = getContact(contactId);
     76    if (contact == NULL)
     77        return;
     78
     79    PersistenceFactory::instance()->getContactManager()->removeContact(contact);
     80    removeContactFromList(contact);
     81
    3582    // TODO: Remove contact from contact groups -> (remove empty contact groups?)
     83}
    3684
    37     contactList_.erase(contactList_.find(contactId));
    38     PersistenceFactory::instance()->getContactManager()->removeContact(contactId);
     85void BCContactManager::contactIdChanged(int oldId, int newId) {
     86    IContact* contact = contactList_.take(oldId);
     87    if (contact != NULL)
     88        contactList_.insert(newId, contact);
    3989}
     90void BCContactManager::contactDataChanged() {
     91    IContact* contact= static_cast<ContactEventMapper*>(sender())->contact();
     92    Q_ASSERT(contact);
     93    emit contactUpdated(contact);
     94}

  • src/business/BCContactManager.h

    r40 r43  
    99#define CONTACTMANAGER_H_
    1010
     11#include <QObject>
    1112#include <QMap>
    12 #include <QList>
     13#include <QSet>
    1314
    1415#include <icontact.h>
    1516
    16 class BCContactManager {
     17class BCContactManager: public QObject {
     18    Q_OBJECT
     19
    1720public:
    1821    static BCContactManager* instance();
    1922
    2023    virtual IContact*        getContact(int contactId);
    21     virtual QList<IContact*> getContactList();
     24    virtual QSet<IContact*> getContactList();
    2225    virtual void             saveContact(IContact* contact);
    2326    virtual void             removeContact(int contactId);
     27
     28signals:
     29    void                     contactAdded(IContact* contact);
     30    void                     contactUpdated(IContact* contact);
     31    void                     contactRemoved(IContact* contact);
    2432
    2533protected:
    … …  
    2735    virtual ~BCContactManager(){};
    2836
     37    virtual void             readContactsFromStorage();
     38
     39protected slots:
     40    void                     contactIdChanged(int oldId, int newId);
     41    void                     contactDataChanged();
     42
    2943private:
    3044    static BCContactManager* instance_;
    3145
    32     QMap<int, IContact*> contactList_;
     46    QMap<int, IContact*>     contactList_;
     47
     48    void                     addContactToList(IContact* contact);
     49    void                     removeContactFromList(IContact* contact);
    3350};
    3451

  • src/business/BCGroupManager.cpp

    r40 r43  
    1616
    1717BCGroupManager::BCGroupManager(){
    18     groupList_ = PersistenceFactory::instance()->getGroupManager()->getGroupList();
     18    readGroupsFromStorage();
    1919}
     20
     21void BCGroupManager::addGroupToList(IGroup* group) {
     22    if ((group == NULL) || groupList_.contains(group->id()))
     23        return;
     24
     25    groupList_.insert(group->id(), group);
     26
     27    connect(group->eventMapper(), SIGNAL(idChanged(int, int)),
     28            this, SLOT(groupIdChanged(int, int)));
     29    connect(group->eventMapper(), SIGNAL(dataChanged()),
     30            this, SLOT(groupDataChanged()));
     31
     32    emit groupAdded(group);
     33}
     34
     35void BCGroupManager::removeGroupFromList(IGroup* group) {
     36    if ((group == NULL) || !groupList_.contains(group->id()))
     37        return;
     38
     39    disconnect(group->eventMapper(), SIGNAL(idChanged(int, int)),
     40               this, SLOT(groupIdChanged(int, int)));
     41    disconnect(group->eventMapper(), SIGNAL(dataChanged()),
     42               this, SLOT(groupDataChanged()));
     43
     44    groupList_.remove(group->id());
     45    emit groupRemoved(group);
     46}
     47
     48void BCGroupManager::readGroupsFromStorage() {
     49    QSet<IGroup*> groupList = PersistenceFactory::instance()->getGroupManager()->getGroupList();
     50
     51    foreach(IGroup* group, groupList_.values().toSet().subtract(groupList)) {
     52        removeGroupFromList(group);
     53    }
     54
     55    foreach(IGroup* group, groupList.subtract(groupList_.values().toSet())) {
     56        addGroupToList(group);
     57    }
     58}
     59
    2060
    2161IGroup* BCGroupManager::getGroup(int groupId){
    … …  
    2363}
    2464
    25 QList<IGroup*> BCGroupManager::getGroupList(){
    26     return groupList_.values();
     65QSet<IGroup*> BCGroupManager::getGroupList(){
     66    return groupList_.values().toSet();
    2767}
    2868
    2969void BCGroupManager::saveGroup(IGroup* group){
    3070    PersistenceFactory::instance()->getGroupManager()->saveGroup(group);
    31     groupList_[group->id()] = group; // Insert the group to the list
     71    addGroupToList(group);
    3272}
    3373
    3474void BCGroupManager::removeGroup(int groupId){
    35     groupList_.erase(groupList_.find(groupId));
    36     PersistenceFactory::instance()->getGroupManager()->removeGroup(groupId);
     75    IGroup* group = getGroup(groupId);
     76    if (group == NULL)
     77        return;
     78
     79    PersistenceFactory::instance()->getGroupManager()->removeGroup(group);
     80    removeGroupFromList(group);
    3781}
     82
     83
     84void BCGroupManager::groupIdChanged(int oldId, int newId) {
     85    IGroup* group = groupList_.take(oldId);
     86    if (group != NULL)
     87        groupList_.insert(newId, group);
     88}
     89void BCGroupManager::groupDataChanged() {
     90    IGroup* group= static_cast<GroupEventMapper*>(sender())->group();
     91    Q_ASSERT(group);
     92    emit groupUpdated(group);
     93}

  • src/business/BCGroupManager.h

    r40 r43  
    99#define BCGROUPMANAGER_H_
    1010
     11#include <QObject>
    1112#include <QList>
    1213#include <QMap>
    … …  
    1415#include <igroup.h>
    1516
    16 class BCGroupManager {
     17class BCGroupManager: public QObject {
     18    Q_OBJECT
     19
    1720public:
    1821    static BCGroupManager* instance();
    1922
    20     virtual IGroup*        getGroup(int groupId);
    21     virtual QList<IGroup*> getGroupList();
    22     virtual void           saveGroup(IGroup* group);
    23     virtual void           removeGroup(int groupId);
     23    virtual IGroup*       getGroup(int groupId);
     24    virtual QSet<IGroup*> getGroupList();
     25    virtual void          saveGroup(IGroup* group);
     26    virtual void          removeGroup(int groupId);
     27
     28signals:
     29    void                  groupAdded(IGroup* group);
     30    void                  groupUpdated(IGroup* group);
     31    void                  groupRemoved(IGroup* group);
     32
     33protected slots:
     34    void                  groupIdChanged(int oldId, int newId);
     35    void                  groupDataChanged();
    2436
    2537protected:
    … …  
    2739    virtual ~BCGroupManager(){};
    2840
     41    virtual void          readGroupsFromStorage();
     42
    2943private:
    3044    static BCGroupManager* instance_;
    3145
    32     QMap<int, IGroup*> groupList_;
     46    QMap<int, IGroup*>    groupList_;
     47
     48    void                  addGroupToList(IGroup* group);
     49    void                  removeGroupFromList(IGroup* group);
    3350};
    3451

  • src/business/BCSettings.cpp

    r40 r43  
    9595
    9696
    97 IShortcut* BCSettings::getNewMessageShortCut(){
     97SShortcut BCSettings::getNewMessageShortCut(){
    9898    return getSettings()->getNewMessageShortCut();
    9999}
    100100
    101 IShortcut* BCSettings::getClearMessageTextShortCut(){
     101SShortcut BCSettings::getClearMessageTextShortCut(){
    102102    return getSettings()->getClearMessageTextShortCut();
    103103}
    104104
    105 IShortcut* BCSettings::getClearRecipientsShortCut(){
     105SShortcut BCSettings::getClearRecipientsShortCut(){
    106106    return getSettings()->getClearRecipientsShortCut();
    107107}
    108108
    109 IShortcut* BCSettings::getSendShortCut(){
     109SShortcut BCSettings::getSendShortCut(){
    110110    return getSettings()->getSendShortCut();
    111111}
    … …  
    172172
    173173
    174 void BCSettings::setNewMessageShortCut(IShortcut* shortcut){
     174void BCSettings::setNewMessageShortCut(const SShortcut& shortcut){
    175175    return getSettings()->setNewMessageShortCut(shortcut);
    176176}
    177177
    178 void BCSettings::setClearMessageTextShortCut(IShortcut* shortcut){
     178void BCSettings::setClearMessageTextShortCut(const SShortcut& shortcut){
    179179    return getSettings()->setClearMessageTextShortCut(shortcut);
    180180}
    181181
    182 void BCSettings::setClearRecipientsShortCut(IShortcut* shortcut){
     182void BCSettings::setClearRecipientsShortCut(const SShortcut& shortcut){
    183183    return getSettings()->setClearRecipientsShortCut(shortcut);
    184184}
    185185
    186 void BCSettings::setSendShortCut(IShortcut* shortcut){
     186void BCSettings::setSendShortCut(const SShortcut& shortcut){
    187187    return getSettings()->setSendShortCut(shortcut);
    188188}

  • src/business/BCSettings.h

    r40 r43  
    1111#include <persistence/isettings.h>
    1212#include <iaccount.h>
    13 #include <ishortcut.h>
     13#include <sshortcut.h>
    1414
    1515class BCSettings {
    … …  
    1717    static BCSettings * instance();
    1818
    19     virtual const QString  getLocalePath();
    20     virtual QLocale        getLocale();
    21     virtual QList<QLocale> getLocales();
     19    const QString  getLocalePath();
     20    QLocale        getLocale();
     21    QList<QLocale> getLocales();
    2222
    23     virtual bool    getCheckForUpdates();
    24     virtual bool    getAddSuffix();
    25     virtual QString getSMSSuffix();
    26     virtual QString getActiveAccountId();
    27     virtual bool    getShowSentConfirmation();
     23    bool    getCheckForUpdates();
     24    bool    getAddSuffix();
     25    QString getSMSSuffix();
     26    QString getActiveAccountId();
     27    bool    getShowSentConfirmation();
    2828
    29     virtual bool    isProxyEnabled();
    30     virtual QString getProxyHost();
    31     virtual int     getProxyPort();
    32     virtual bool    isProxyAuthEnabled();
    33     virtual QString getProxyUsername();
    34     virtual QString getProxyPassword();
     29    bool    isProxyEnabled();
     30    QString getProxyHost();
     31    int     getProxyPort();
     32    bool    isProxyAuthEnabled();
     33    QString getProxyUsername();
     34    QString getProxyPassword();
    3535
    36     virtual IShortcut* getNewMessageShortCut();
    37     virtual IShortcut* getClearMessageTextShortCut();
    38     virtual IShortcut* getClearRecipientsShortCut();
    39     virtual IShortcut* getSendShortCut();
     36    SShortcut getNewMessageShortCut();
     37    SShortcut getClearMessageTextShortCut();
     38    SShortcut getClearRecipientsShortCut();
     39    SShortcut getSendShortCut();
    4040
    41     virtual QString getUpdateUrl();
     41    QString getUpdateUrl();
    4242
    43     virtual QString getSettingsPath();
     43    QString getSettingsPath();
    4444
    4545
    46     virtual void setLocale(const QLocale& locale);
     46    void setLocale(const QLocale& locale);
    4747
    48     virtual void setCheckForUpdates(bool checkForUpdates);
    49     virtual void setAddSuffix(bool addSuffix);
    50     virtual void setSMSSuffix(const QString& smsSuffix);
    51     virtual void setActiveAccountId(const QString& accountId);
    52     virtual void setShowSentConfirmation(bool showSentConfirmation);
     48    void setCheckForUpdates(bool checkForUpdates);
     49    void setAddSuffix(bool addSuffix);
     50    void setSMSSuffix(const QString& smsSuffix);
     51    void setActiveAccountId(const QString& accountId);
     52    void setShowSentConfirmation(bool showSentConfirmation);
    5353
    54     virtual void setProxyEnabled(bool enabled);
    55     virtual void setProxyHost(const QString& host);
    56     virtual void setProxyPort(int port);
    57     virtual void setProxyAuthEnabled(bool enabled);
    58     virtual void setProxyUsername(const QString& username);
    59     virtual void setProxyPassword(const QString& password);
     54    void setProxyEnabled(bool enabled);
     55    void setProxyHost(const QString& host);
     56    void setProxyPort(int port);
     57    void setProxyAuthEnabled(bool enabled);
     58    void setProxyUsername(const QString& username);
     59    void setProxyPassword(const QString& password);
    6060
    61     virtual void setNewMessageShortCut(IShortcut* shortcut);
    62     virtual void setClearMessageTextShortCut(IShortcut* shortcut);
    63     virtual void setClearRecipientsShortCut(IShortcut* shortcut);
    64     virtual void setSendShortCut(IShortcut* shortcut);
     61    void setNewMessageShortCut(const SShortcut& shortcut);
     62    void setClearMessageTextShortCut(const SShortcut& shortcut);
     63    void setClearRecipientsShortCut(const SShortcut& shortcut);
     64    void setSendShortCut(const SShortcut& shortcut);
    6565
    6666protected:

  • src/business/BusinessFactory.cpp

    r24 r43  
    1010#include "BCContact.h"
    1111#include "BCGroup.h"
    12 #include "BCShortcut.h"
    1312
    1413BusinessFactory* BusinessFactory::instance_=0;
    … …  
    2423    return new BCGroup;
    2524}
    26 
    27 IShortcut* BusinessFactory::getShortcutInstance(){
    28     return new BCShortcut;
    29 }

  • src/business/BusinessFactory.h

    r29 r43  
    1111#include <icontact.h>
    1212#include <igroup.h>
    13 #include <ishortcut.h>
    1413
    1514class BusinessFactory {
    … …  
    2019    IContact*  getContactInstance();
    2120    IGroup*    getGroupInstance();
    22     IShortcut* getShortcutInstance();
    2321
    2422protected:

  • src/persistence/DAAccountManager.cpp

    r42 r43  
    88#include "DAAccountManager.h"
    99
    10 #include "storage/DASQLiteAccountListManager.h"
     10#include "storage/DAAccountListManager.h"
    1111
    1212DAAccountManager* DAAccountManager::instance_=0;
    … …  
    1717
    1818IAccount* DAAccountManager::getAccount(int accountId){
    19     return DASQLiteAccountListManager::instance()->getAccount(accountId);
     19    return DAAccountListManager::instance()->getAccount(accountId);
    2020}
    2121
    2222QSet<IAccount*> DAAccountManager::getAccountList(){
    23     return  DASQLiteAccountListManager::instance()->getAccountList();
     23    return  DAAccountListManager::instance()->getAccountList();
    2424}
    2525

  • src/persistence/DAContactManager.cpp

    r42 r43  
    2020}
    2121
    22 QMap<int, IContact*> DAContactManager::getContactList(){
     22QSet<IContact*> DAContactManager::getContactList(){
    2323    return getStorage()->readContactList();
    2424}
    … …  
    3131void DAContactManager::removeContact(IContact* contact){
    3232    getStorage()->removeContact(contact->id());
    33     contact->setID(-1); // Invalidate the contact
     33    contact->setId(-1); // Invalidate the contact
    3434}
    3535

  • src/persistence/DAContactManager.h

    r42 r43  
    2121    static DAContactManager* instance();
    2222
    23     virtual IContact*            getContact(int contactId);
    24     virtual QMap<int, IContact*> getContactList();
     23    virtual IContact*       getContact(int contactId);
     24    virtual QSet<IContact*> getContactList();
    2525
    2626    virtual void saveContact(IContact* contact);

  • src/persistence/DAGroupManager.cpp

    r42 r43  
    2020}
    2121
    22 QMap<int, IGroup*> DAGroupManager::getGroupList(){
     22QSet<IGroup*> DAGroupManager::getGroupList(){
    2323    return getStorage()->readGroupList();
    2424}
    … …  
    3131void DAGroupManager::removeGroup(IGroup* group){
    3232    getStorage()->removeGroup(group->id());
    33     group->setID(-1); // Invalidate the group
     33    group->setId(-1); // Invalidate the group
    3434}
    3535

  • src/persistence/DAGroupManager.h

    r42 r43  
    2121    static DAGroupManager* instance();
    2222
    23     virtual IGroup*            getGroup(int groupId);
    24     virtual QMap<int, IGroup*> getGroupList();
     23    virtual IGroup*       getGroup(int groupId);
     24    virtual QSet<IGroup*> getGroupList();
    2525
    2626    virtual void saveGroup(IGroup* group);

  • src/persistence/DASettings.cpp

    r42 r43  
    6666}
    6767
    68 IShortcut* DASettings::getNewMessageShortCut(){
     68SShortcut DASettings::getNewMessageShortCut(){
    6969    return getStorage()->readShortcut("newMessage");
    7070}
    7171
    72 IShortcut* DASettings::getClearMessageTextShortCut(){
     72SShortcut DASettings::getClearMessageTextShortCut(){
    7373    return getStorage()->readShortcut("clearMessageText");
    7474}
    7575
    76 IShortcut* DASettings::getClearRecipientsShortCut(){
     76SShortcut DASettings::getClearRecipientsShortCut(){
    7777    return getStorage()->readShortcut("clearRecipients");
    7878}
    7979
    80 IShortcut* DASettings::getSendShortCut(){
     80SShortcut DASettings::getSendShortCut(){
    8181    return getStorage()->readShortcut("sendMessage");
    8282}