Changeset 43:10dd65d71f7f in SMSSender
- Timestamp:
- Jan 27, 2010 5:57:30 PM (12 years ago)
- Branch:
- 3.0
- Convert:
- svn:3639001d-8e34-449c-bb86-3782b86c4877/branches/3.0@42
- Files:
-
- 33 added
- 9 deleted
- 94 edited
- 6 moved
Legend:
- Unmodified
- Added
- Removed
-
Makefile
r42 r43 1 1 ############################################################################# 2 2 # Makefile for building: smssender-bin 3 # Generated by qmake (2.01a) (Qt 4.5.2) on: T hu Jan 14 13:21:3320103 # Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 26 20:33:24 2010 4 4 # Project: smssender.pro 5 5 # Template: app … … 84 84 /usr/share/qt4/mkspecs/features/lex.prf \ 85 85 /usr/share/qt4/mkspecs/features/include_source_dir.prf \ 86 /usr/lib/libQtSql.prl \ 86 87 /usr/lib/libQtGui.prl \ 87 88 /usr/lib/libQtCore.prl … … 107 108 /usr/share/qt4/mkspecs/features/lex.prf: 108 109 /usr/share/qt4/mkspecs/features/include_source_dir.prf: 110 /usr/lib/libQtSql.prl: 109 111 /usr/lib/libQtGui.prl: 110 112 /usr/lib/libQtCore.prl: -
Makefile.Debug
r42 r43 1 1 ############################################################################# 2 2 # Makefile for building: smssender-bin 3 # Generated by qmake (2.01a) (Qt 4.5.2) on: T hu Jan 14 13:21:3320103 # Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 26 20:33:24 2010 4 4 # Project: smssender.pro 5 5 # Template: app … … 10 10 CC = gcc 11 11 CXX = g++ 12 DEFINES = -DQT_ GUI_LIB -DQT_CORE_LIB -DQT_SHARED12 DEFINES = -DQT_SQL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED 13 13 CFLAGS = -pipe -g -D_REENTRANT -Wall -W $(DEFINES) 14 14 CXXFLAGS = -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.15 INCPATH = -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. 16 16 LINK = g++ 17 17 LFLAGS = 18 LIBS = $(SUBLIBS) -L/usr/lib -Llib/ -ltntdb -lcrypto++ -ldatatypes -l interfaces -lutils -lpthread-lQtGui -lQtCore18 LIBS = $(SUBLIBS) -L/usr/lib -Llib/ -ltntdb -lcrypto++ -ldatatypes -lutils -linterfaces -lpthread -lQtSql -lQtGui -lQtCore 19 19 AR = ar cqs 20 20 RANLIB = … … 42 42 ####### Files 43 43 44 SOURCES = src/ui/completers/aliascompleter.cpp \ 45 src/ui/completers/AliasModel.cpp \ 46 src/ui/completers/FilteredPopupCompleter.cpp \ 44 SOURCES = 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 \ 47 55 src/ui/VCEditAccount/vceditaccount.cpp \ 48 56 src/ui/VCAccountList/vcaccountlist.cpp \ 49 57 src/business/BCAccountLoadThread.cpp \ 50 58 src/business/BCGatewayManager.cpp \ 51 src/persistence/storage/DASQLiteAccountListManager.cpp \52 59 src/persistence/DAAccountManager.cpp \ 53 60 src/business/BCAccountManager.cpp \ … … 63 70 src/business/BCContactManager.cpp \ 64 71 src/business/BusinessFactory.cpp \ 65 src/persistence/storage/DASQLiteStorage.cpp \66 72 src/business/BCSettings.cpp \ 67 73 src/persistence/PersistenceFactory.cpp \ … … 69 75 src/main.cpp \ 70 76 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 \ 72 89 debug/moc_vceditaccount.cpp \ 73 90 debug/moc_vcaccountlist.cpp \ 74 91 debug/moc_BCAccountLoadThread.cpp \ 75 debug/moc_DASQLiteAccountListManager.cpp \76 92 debug/moc_DAAccountManager.cpp \ 93 debug/moc_BCAccountManager.cpp \ 77 94 debug/moc_BCAccountLoadManager.cpp \ 78 95 debug/moc_BCLibraryLoader.cpp \ 79 96 debug/moc_vceditgroup.cpp \ 80 97 debug/moc_DAGroupManager.cpp \ 98 debug/moc_BCGroupManager.cpp \ 81 99 debug/moc_vceditcontact.cpp \ 82 100 debug/moc_DASettings.cpp \ 83 101 debug/moc_vcaddressbook.cpp \ 84 debug/moc_ DASQLiteStorage.cpp \102 debug/moc_BCContactManager.cpp \ 85 103 debug/moc_DAContactManager.cpp \ 86 104 debug/moc_PersistenceFactory.cpp \ … … 88 106 debug/moc_vcsettings.cpp \ 89 107 debug/qrc_resource.cpp 90 OBJECTS = debug/aliascompleter.o \ 91 debug/AliasModel.o \ 92 debug/FilteredPopupCompleter.o \ 108 OBJECTS = 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 \ 93 119 debug/vceditaccount.o \ 94 120 debug/vcaccountlist.o \ 95 121 debug/BCAccountLoadThread.o \ 96 122 debug/BCGatewayManager.o \ 97 debug/DASQLiteAccountListManager.o \98 123 debug/DAAccountManager.o \ 99 124 debug/BCAccountManager.o \ … … 109 134 debug/BCContactManager.o \ 110 135 debug/BusinessFactory.o \ 111 debug/DASQLiteStorage.o \112 136 debug/BCSettings.o \ 113 137 debug/PersistenceFactory.o \ … … 116 140 debug/vcmain.o \ 117 141 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 \ 119 154 debug/moc_vceditaccount.o \ 120 155 debug/moc_vcaccountlist.o \ 121 156 debug/moc_BCAccountLoadThread.o \ 122 debug/moc_DASQLiteAccountListManager.o \123 157 debug/moc_DAAccountManager.o \ 158 debug/moc_BCAccountManager.o \ 124 159 debug/moc_BCAccountLoadManager.o \ 125 160 debug/moc_BCLibraryLoader.o \ 126 161 debug/moc_vceditgroup.o \ 127 162 debug/moc_DAGroupManager.o \ 163 debug/moc_BCGroupManager.o \ 128 164 debug/moc_vceditcontact.o \ 129 165 debug/moc_DASettings.o \ 130 166 debug/moc_vcaddressbook.o \ 131 debug/moc_ DASQLiteStorage.o \167 debug/moc_BCContactManager.o \ 132 168 debug/moc_DAContactManager.o \ 133 169 debug/moc_PersistenceFactory.o \ … … 193 229 dist: 194 230 @$(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.0231 $(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 196 232 197 233 … … 212 248 mocables: compiler_moc_header_make_all compiler_moc_source_make_all 213 249 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.cpp250 compiler_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 215 251 compiler_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 253 debug/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 256 debug/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 259 debug/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 264 debug/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 268 debug/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 271 debug/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 277 debug/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 280 debug/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 283 debug/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 286 debug/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 289 debug/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 292 debug/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 219 295 220 296 debug/moc_vceditaccount.cpp: ui_vceditaccount.h \ … … 223 299 224 300 debug/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 \ 225 305 src/ui/VCAccountList/vcaccountlist.h 226 306 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCAccountList/vcaccountlist.h -o debug/moc_vcaccountlist.cpp … … 229 309 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCAccountLoadThread.h -o debug/moc_BCAccountLoadThread.cpp 230 310 231 debug/moc_DASQLiteAccountListManager.cpp: src/persistence/storage/DASQLiteAccountListManager.h232 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/storage/DASQLiteAccountListManager.h -o debug/moc_DASQLiteAccountListManager.cpp233 234 311 debug/moc_DAAccountManager.cpp: src/persistence/DAAccountManager.h 235 312 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DAAccountManager.h -o debug/moc_DAAccountManager.cpp 313 314 debug/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 236 318 237 319 debug/moc_BCAccountLoadManager.cpp: src/business/BCAccountLoadThread.h \ … … 249 331 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DAGroupManager.h -o debug/moc_DAGroupManager.cpp 250 332 333 debug/moc_BCGroupManager.cpp: src/business/BCGroupManager.h 334 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCGroupManager.h -o debug/moc_BCGroupManager.cpp 335 251 336 debug/moc_vceditcontact.cpp: ui_vceditcontact.h \ 252 337 src/ui/VCEditContact/vceditcontact.h … … 260 345 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCAddressBook/vcaddressbook.h -o debug/moc_vcaddressbook.cpp 261 346 262 debug/moc_ DASQLiteStorage.cpp: src/persistence/storage/DASQLiteStorage.h263 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ persistence/storage/DASQLiteStorage.h -o debug/moc_DASQLiteStorage.cpp347 debug/moc_BCContactManager.cpp: src/business/BCContactManager.h 348 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCContactManager.h -o debug/moc_BCContactManager.cpp 264 349 265 350 debug/moc_DAContactManager.cpp: src/persistence/DAContactManager.h … … 271 356 debug/moc_vcmain.cpp: src/business/BCAccountLoadManager.h \ 272 357 src/business/BCAccountLoadThread.h \ 273 src/ui/completers/AliasModel.h \274 358 ui_vcmain.h \ 359 src/ui/models/contactgroupmodel.h \ 360 src/business/BCContactManager.h \ 361 src/business/BCGroupManager.h \ 275 362 src/ui/VCMain/vcmain.h 276 363 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCMain/vcmain.h -o debug/moc_vcmain.cpp … … 292 379 lib/refresh.png \ 293 380 lib/users.png \ 381 lib/edit.png \ 294 382 lib/address_book.png \ 295 383 lib/preferences.png \ … … 346 434 ####### Compile 347 435 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 436 debug/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 441 debug/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 446 debug/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 451 debug/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 455 debug/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 458 debug/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 464 debug/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 467 debug/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 470 debug/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 474 debug/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 477 debug/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 356 482 357 483 debug/vceditaccount.o: src/ui/VCEditAccount/vceditaccount.cpp src/ui/VCEditAccount/vceditaccount.h \ … … 365 491 debug/vcaccountlist.o: src/ui/VCAccountList/vcaccountlist.cpp src/ui/VCAccountList/vcaccountlist.h \ 366 492 ui_vcaccountlist.h \ 493 src/ui/models/accountmodel.h \ 494 src/business/BCAccountManager.h \ 495 src/business/BCAccountLoadManager.h \ 496 src/business/BCAccountLoadThread.h \ 367 497 src/ui/VCEditAccount/vceditaccount.h \ 368 498 ui_vceditaccount.h \ 369 499 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 374 502 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/vcaccountlist.o src/ui/VCAccountList/vcaccountlist.cpp 375 503 … … 381 509 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BCGatewayManager.o src/business/BCGatewayManager.cpp 382 510 383 debug/DASQLiteAccountListManager.o: src/persistence/storage/DASQLiteAccountListManager.cpp src/persistence/storage/DASQLiteAccountListManager.h \384 src/business/BCGatewayManager.h \385 src/persistence/storage/DASQLiteStorage.h386 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/DASQLiteAccountListManager.o src/persistence/storage/DASQLiteAccountListManager.cpp387 388 511 debug/DAAccountManager.o: src/persistence/DAAccountManager.cpp src/persistence/DAAccountManager.h \ 389 src/persistence/storage/DA SQLiteAccountListManager.h512 src/persistence/storage/DAAccountListManager.h 390 513 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/DAAccountManager.o src/persistence/DAAccountManager.cpp 391 514 … … 450 573 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BusinessFactory.o src/business/BusinessFactory.cpp 451 574 452 debug/DASQLiteStorage.o: src/persistence/storage/DASQLiteStorage.cpp src/persistence/storage/DASQLiteStorage.h \453 src/business/BCSettings.h \454 src/business/BCContactManager.h455 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/DASQLiteStorage.o src/persistence/storage/DASQLiteStorage.cpp456 457 575 debug/BCSettings.o: src/business/BCSettings.cpp src/business/BCSettings.h \ 458 576 src/persistence/PersistenceFactory.h … … 464 582 src/persistence/DAGroupManager.h \ 465 583 src/persistence/DASettings.h \ 466 src/persistence/storage/DAS QLiteStorage.h584 src/persistence/storage/DAStorage.h 467 585 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/PersistenceFactory.o src/persistence/PersistenceFactory.cpp 468 586 … … 474 592 src/business/BCAccountLoadManager.h \ 475 593 src/business/BCAccountLoadThread.h \ 476 src/ui/completers/AliasModel.h \477 594 ui_vcmain.h \ 595 src/ui/models/contactgroupmodel.h \ 596 src/business/BCContactManager.h \ 597 src/business/BCGroupManager.h \ 478 598 src/business/BCSettings.h \ 479 599 src/business/BCAccountManager.h \ … … 485 605 src/business/BCAccountLoadManager.h \ 486 606 src/business/BCAccountLoadThread.h \ 487 src/ui/completers/AliasModel.h \488 607 ui_vcmain.h \ 489 src/ business/BCAccountManager.h \608 src/ui/models/contactgroupmodel.h \ 490 609 src/business/BCContactManager.h \ 491 610 src/business/BCGroupManager.h \ 611 src/business/BCAccountManager.h \ 492 612 src/ui/UIHelper.h \ 493 613 src/ui/VCAccountList/vcaccountlist.h \ 494 614 ui_vcaccountlist.h \ 615 src/ui/models/accountmodel.h \ 495 616 src/ui/VCAddressBook/vcaddressbook.h \ 496 617 ui_vcaddressbook.h \ 497 618 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 499 623 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/vcmain.o src/ui/VCMain/vcmain.cpp 500 624 … … 505 629 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/vcsettings.o src/ui/VCSettings/vcsettings.cpp 506 630 507 debug/moc_aliascompleter.o: debug/moc_aliascompleter.cpp 508 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_aliascompleter.o debug/moc_aliascompleter.cpp 631 debug/moc_DAAccountListManager.o: debug/moc_DAAccountListManager.cpp 632 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DAAccountListManager.o debug/moc_DAAccountListManager.cpp 633 634 debug/moc_DAStorage.o: debug/moc_DAStorage.cpp 635 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DAStorage.o debug/moc_DAStorage.cpp 636 637 debug/moc_contactgroupmodel.o: debug/moc_contactgroupmodel.cpp 638 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_contactgroupmodel.o debug/moc_contactgroupmodel.cpp 639 640 debug/moc_aliascompletionmodel.o: debug/moc_aliascompletionmodel.cpp 641 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_aliascompletionmodel.o debug/moc_aliascompletionmodel.cpp 642 643 debug/moc_bettercompleter.o: debug/moc_bettercompleter.cpp 644 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_bettercompleter.o debug/moc_bettercompleter.cpp 645 646 debug/moc_accountmodel.o: debug/moc_accountmodel.cpp 647 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_accountmodel.o debug/moc_accountmodel.cpp 648 649 debug/moc_aligndelegate.o: debug/moc_aligndelegate.cpp 650 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_aligndelegate.o debug/moc_aligndelegate.cpp 651 652 debug/moc_clearbutton.o: debug/moc_clearbutton.cpp 653 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_clearbutton.o debug/moc_clearbutton.cpp 654 655 debug/moc_lineedit.o: debug/moc_lineedit.cpp 656 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_lineedit.o debug/moc_lineedit.cpp 657 658 debug/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 661 debug/moc_searchbutton.o: debug/moc_searchbutton.cpp 662 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_searchbutton.o debug/moc_searchbutton.cpp 663 664 debug/moc_searchlineedit.o: debug/moc_searchlineedit.cpp 665 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_searchlineedit.o debug/moc_searchlineedit.cpp 509 666 510 667 debug/moc_vceditaccount.o: debug/moc_vceditaccount.cpp … … 517 674 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCAccountLoadThread.o debug/moc_BCAccountLoadThread.cpp 518 675 519 debug/moc_DASQLiteAccountListManager.o: debug/moc_DASQLiteAccountListManager.cpp520 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DASQLiteAccountListManager.o debug/moc_DASQLiteAccountListManager.cpp521 522 676 debug/moc_DAAccountManager.o: debug/moc_DAAccountManager.cpp 523 677 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DAAccountManager.o debug/moc_DAAccountManager.cpp 524 678 679 debug/moc_BCAccountManager.o: debug/moc_BCAccountManager.cpp 680 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCAccountManager.o debug/moc_BCAccountManager.cpp 681 525 682 debug/moc_BCAccountLoadManager.o: debug/moc_BCAccountLoadManager.cpp 526 683 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCAccountLoadManager.o debug/moc_BCAccountLoadManager.cpp … … 535 692 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DAGroupManager.o debug/moc_DAGroupManager.cpp 536 693 694 debug/moc_BCGroupManager.o: debug/moc_BCGroupManager.cpp 695 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCGroupManager.o debug/moc_BCGroupManager.cpp 696 537 697 debug/moc_vceditcontact.o: debug/moc_vceditcontact.cpp 538 698 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_vceditcontact.o debug/moc_vceditcontact.cpp … … 544 704 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_vcaddressbook.o debug/moc_vcaddressbook.cpp 545 705 546 debug/moc_ DASQLiteStorage.o: debug/moc_DASQLiteStorage.cpp547 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_ DASQLiteStorage.o debug/moc_DASQLiteStorage.cpp706 debug/moc_BCContactManager.o: debug/moc_BCContactManager.cpp 707 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCContactManager.o debug/moc_BCContactManager.cpp 548 708 549 709 debug/moc_DAContactManager.o: debug/moc_DAContactManager.cpp -
Makefile.Release
r42 r43 1 1 ############################################################################# 2 2 # Makefile for building: smssender-bin 3 # Generated by qmake (2.01a) (Qt 4.5.2) on: T hu Jan 14 13:21:3320103 # Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 26 20:33:24 2010 4 4 # Project: smssender.pro 5 5 # Template: app … … 10 10 CC = gcc 11 11 CXX = g++ 12 DEFINES = -DQT_NO_DEBUG -DQT_ GUI_LIB -DQT_CORE_LIB -DQT_SHARED12 DEFINES = -DQT_NO_DEBUG -DQT_SQL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED 13 13 CFLAGS = -pipe -O2 -D_REENTRANT -Wall -W $(DEFINES) 14 14 CXXFLAGS = -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.15 INCPATH = -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. 16 16 LINK = g++ 17 17 LFLAGS = -Wl,-O1 18 LIBS = $(SUBLIBS) -L/usr/lib -Llib/ -ltntdb -lcrypto++ -ldatatypes -l interfaces -lutils -lpthread-lQtGui -lQtCore18 LIBS = $(SUBLIBS) -L/usr/lib -Llib/ -ltntdb -lcrypto++ -ldatatypes -lutils -linterfaces -lpthread -lQtSql -lQtGui -lQtCore 19 19 AR = ar cqs 20 20 RANLIB = … … 42 42 ####### Files 43 43 44 SOURCES = src/ui/completers/aliascompleter.cpp \ 45 src/ui/completers/AliasModel.cpp \ 46 src/ui/completers/FilteredPopupCompleter.cpp \ 44 SOURCES = 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 \ 47 55 src/ui/VCEditAccount/vceditaccount.cpp \ 48 56 src/ui/VCAccountList/vcaccountlist.cpp \ 49 57 src/business/BCAccountLoadThread.cpp \ 50 58 src/business/BCGatewayManager.cpp \ 51 src/persistence/storage/DASQLiteAccountListManager.cpp \52 59 src/persistence/DAAccountManager.cpp \ 53 60 src/business/BCAccountManager.cpp \ … … 63 70 src/business/BCContactManager.cpp \ 64 71 src/business/BusinessFactory.cpp \ 65 src/persistence/storage/DASQLiteStorage.cpp \66 72 src/business/BCSettings.cpp \ 67 73 src/persistence/PersistenceFactory.cpp \ … … 69 75 src/main.cpp \ 70 76 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 \ 72 89 release/moc_vceditaccount.cpp \ 73 90 release/moc_vcaccountlist.cpp \ 74 91 release/moc_BCAccountLoadThread.cpp \ 75 release/moc_DASQLiteAccountListManager.cpp \76 92 release/moc_DAAccountManager.cpp \ 93 release/moc_BCAccountManager.cpp \ 77 94 release/moc_BCAccountLoadManager.cpp \ 78 95 release/moc_BCLibraryLoader.cpp \ 79 96 release/moc_vceditgroup.cpp \ 80 97 release/moc_DAGroupManager.cpp \ 98 release/moc_BCGroupManager.cpp \ 81 99 release/moc_vceditcontact.cpp \ 82 100 release/moc_DASettings.cpp \ 83 101 release/moc_vcaddressbook.cpp \ 84 release/moc_ DASQLiteStorage.cpp \102 release/moc_BCContactManager.cpp \ 85 103 release/moc_DAContactManager.cpp \ 86 104 release/moc_PersistenceFactory.cpp \ … … 88 106 release/moc_vcsettings.cpp \ 89 107 release/qrc_resource.cpp 90 OBJECTS = release/aliascompleter.o \ 91 release/AliasModel.o \ 92 release/FilteredPopupCompleter.o \ 108 OBJECTS = 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 \ 93 119 release/vceditaccount.o \ 94 120 release/vcaccountlist.o \ 95 121 release/BCAccountLoadThread.o \ 96 122 release/BCGatewayManager.o \ 97 release/DASQLiteAccountListManager.o \98 123 release/DAAccountManager.o \ 99 124 release/BCAccountManager.o \ … … 109 134 release/BCContactManager.o \ 110 135 release/BusinessFactory.o \ 111 release/DASQLiteStorage.o \112 136 release/BCSettings.o \ 113 137 release/PersistenceFactory.o \ … … 116 140 release/vcmain.o \ 117 141 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 \ 119 154 release/moc_vceditaccount.o \ 120 155 release/moc_vcaccountlist.o \ 121 156 release/moc_BCAccountLoadThread.o \ 122 release/moc_DASQLiteAccountListManager.o \123 157 release/moc_DAAccountManager.o \ 158 release/moc_BCAccountManager.o \ 124 159 release/moc_BCAccountLoadManager.o \ 125 160 release/moc_BCLibraryLoader.o \ 126 161 release/moc_vceditgroup.o \ 127 162 release/moc_DAGroupManager.o \ 163 release/moc_BCGroupManager.o \ 128 164 release/moc_vceditcontact.o \ 129 165 release/moc_DASettings.o \ 130 166 release/moc_vcaddressbook.o \ 131 release/moc_ DASQLiteStorage.o \167 release/moc_BCContactManager.o \ 132 168 release/moc_DAContactManager.o \ 133 169 release/moc_PersistenceFactory.o \ … … 193 229 dist: 194 230 @$(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.0231 $(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 196 232 197 233 … … 212 248 mocables: compiler_moc_header_make_all compiler_moc_source_make_all 213 249 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.cpp250 compiler_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 215 251 compiler_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 253 release/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 256 release/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 259 release/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 264 release/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 268 release/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 271 release/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 277 release/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 280 release/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 283 release/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 286 release/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 289 release/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 292 release/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 219 295 220 296 release/moc_vceditaccount.cpp: ui_vceditaccount.h \ … … 223 299 224 300 release/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 \ 225 305 src/ui/VCAccountList/vcaccountlist.h 226 306 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCAccountList/vcaccountlist.h -o release/moc_vcaccountlist.cpp … … 229 309 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCAccountLoadThread.h -o release/moc_BCAccountLoadThread.cpp 230 310 231 release/moc_DASQLiteAccountListManager.cpp: src/persistence/storage/DASQLiteAccountListManager.h232 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/storage/DASQLiteAccountListManager.h -o release/moc_DASQLiteAccountListManager.cpp233 234 311 release/moc_DAAccountManager.cpp: src/persistence/DAAccountManager.h 235 312 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DAAccountManager.h -o release/moc_DAAccountManager.cpp 313 314 release/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 236 318 237 319 release/moc_BCAccountLoadManager.cpp: src/business/BCAccountLoadThread.h \ … … 249 331 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DAGroupManager.h -o release/moc_DAGroupManager.cpp 250 332 333 release/moc_BCGroupManager.cpp: src/business/BCGroupManager.h 334 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCGroupManager.h -o release/moc_BCGroupManager.cpp 335 251 336 release/moc_vceditcontact.cpp: ui_vceditcontact.h \ 252 337 src/ui/VCEditContact/vceditcontact.h … … 260 345 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCAddressBook/vcaddressbook.h -o release/moc_vcaddressbook.cpp 261 346 262 release/moc_ DASQLiteStorage.cpp: src/persistence/storage/DASQLiteStorage.h263 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ persistence/storage/DASQLiteStorage.h -o release/moc_DASQLiteStorage.cpp347 release/moc_BCContactManager.cpp: src/business/BCContactManager.h 348 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCContactManager.h -o release/moc_BCContactManager.cpp 264 349 265 350 release/moc_DAContactManager.cpp: src/persistence/DAContactManager.h … … 271 356 release/moc_vcmain.cpp: src/business/BCAccountLoadManager.h \ 272 357 src/business/BCAccountLoadThread.h \ 273 src/ui/completers/AliasModel.h \274 358 ui_vcmain.h \ 359 src/ui/models/contactgroupmodel.h \ 360 src/business/BCContactManager.h \ 361 src/business/BCGroupManager.h \ 275 362 src/ui/VCMain/vcmain.h 276 363 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCMain/vcmain.h -o release/moc_vcmain.cpp … … 292 379 lib/refresh.png \ 293 380 lib/users.png \ 381 lib/edit.png \ 294 382 lib/address_book.png \ 295 383 lib/preferences.png \ … … 346 434 ####### Compile 347 435 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 436 release/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 441 release/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 446 release/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 451 release/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 455 release/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 458 release/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 464 release/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 467 release/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 470 release/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 474 release/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 477 release/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 356 482 357 483 release/vceditaccount.o: src/ui/VCEditAccount/vceditaccount.cpp src/ui/VCEditAccount/vceditaccount.h \ … … 365 491 release/vcaccountlist.o: src/ui/VCAccountList/vcaccountlist.cpp src/ui/VCAccountList/vcaccountlist.h \ 366 492 ui_vcaccountlist.h \ 493 src/ui/models/accountmodel.h \ 494 src/business/BCAccountManager.h \ 495 src/business/BCAccountLoadManager.h \ 496 src/business/BCAccountLoadThread.h \ 367 497 src/ui/VCEditAccount/vceditaccount.h \ 368 498 ui_vceditaccount.h \ 369 499 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 374 502 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/vcaccountlist.o src/ui/VCAccountList/vcaccountlist.cpp 375 503 … … 381 509 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BCGatewayManager.o src/business/BCGatewayManager.cpp 382 510 383 release/DASQLiteAccountListManager.o: src/persistence/storage/DASQLiteAccountListManager.cpp src/persistence/storage/DASQLiteAccountListManager.h \384 src/business/BCGatewayManager.h \385 src/persistence/storage/DASQLiteStorage.h386 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/DASQLiteAccountListManager.o src/persistence/storage/DASQLiteAccountListManager.cpp387 388 511 release/DAAccountManager.o: src/persistence/DAAccountManager.cpp src/persistence/DAAccountManager.h \ 389 src/persistence/storage/DA SQLiteAccountListManager.h512 src/persistence/storage/DAAccountListManager.h 390 513 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/DAAccountManager.o src/persistence/DAAccountManager.cpp 391 514 … … 450 573 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BusinessFactory.o src/business/BusinessFactory.cpp 451 574 452 release/DASQLiteStorage.o: src/persistence/storage/DASQLiteStorage.cpp src/persistence/storage/DASQLiteStorage.h \453 src/business/BCSettings.h \454 src/business/BCContactManager.h455 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/DASQLiteStorage.o src/persistence/storage/DASQLiteStorage.cpp456 457 575 release/BCSettings.o: src/business/BCSettings.cpp src/business/BCSettings.h \ 458 576 src/persistence/PersistenceFactory.h … … 464 582 src/persistence/DAGroupManager.h \ 465 583 src/persistence/DASettings.h \ 466 src/persistence/storage/DAS QLiteStorage.h584 src/persistence/storage/DAStorage.h 467 585 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/PersistenceFactory.o src/persistence/PersistenceFactory.cpp 468 586 … … 474 592 src/business/BCAccountLoadManager.h \ 475 593 src/business/BCAccountLoadThread.h \ 476 src/ui/completers/AliasModel.h \477 594 ui_vcmain.h \ 595 src/ui/models/contactgroupmodel.h \ 596 src/business/BCContactManager.h \ 597 src/business/BCGroupManager.h \ 478 598 src/business/BCSettings.h \ 479 599 src/business/BCAccountManager.h \ … … 485 605 src/business/BCAccountLoadManager.h \ 486 606 src/business/BCAccountLoadThread.h \ 487 src/ui/completers/AliasModel.h \488 607 ui_vcmain.h \ 489 src/ business/BCAccountManager.h \608 src/ui/models/contactgroupmodel.h \ 490 609 src/business/BCContactManager.h \ 491 610 src/business/BCGroupManager.h \ 611 src/business/BCAccountManager.h \ 492 612 src/ui/UIHelper.h \ 493 613 src/ui/VCAccountList/vcaccountlist.h \ 494 614 ui_vcaccountlist.h \ 615 src/ui/models/accountmodel.h \ 495 616 src/ui/VCAddressBook/vcaddressbook.h \ 496 617 ui_vcaddressbook.h \ 497 618 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 499 623 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/vcmain.o src/ui/VCMain/vcmain.cpp 500 624 … … 505 629 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/vcsettings.o src/ui/VCSettings/vcsettings.cpp 506 630 507 release/moc_aliascompleter.o: release/moc_aliascompleter.cpp 508 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_aliascompleter.o release/moc_aliascompleter.cpp 631 release/moc_DAAccountListManager.o: release/moc_DAAccountListManager.cpp 632 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DAAccountListManager.o release/moc_DAAccountListManager.cpp 633 634 release/moc_DAStorage.o: release/moc_DAStorage.cpp 635 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DAStorage.o release/moc_DAStorage.cpp 636 637 release/moc_contactgroupmodel.o: release/moc_contactgroupmodel.cpp 638 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_contactgroupmodel.o release/moc_contactgroupmodel.cpp 639 640 release/moc_aliascompletionmodel.o: release/moc_aliascompletionmodel.cpp 641 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_aliascompletionmodel.o release/moc_aliascompletionmodel.cpp 642 643 release/moc_bettercompleter.o: release/moc_bettercompleter.cpp 644 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_bettercompleter.o release/moc_bettercompleter.cpp 645 646 release/moc_accountmodel.o: release/moc_accountmodel.cpp 647 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_accountmodel.o release/moc_accountmodel.cpp 648 649 release/moc_aligndelegate.o: release/moc_aligndelegate.cpp 650 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_aligndelegate.o release/moc_aligndelegate.cpp 651 652 release/moc_clearbutton.o: release/moc_clearbutton.cpp 653 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_clearbutton.o release/moc_clearbutton.cpp 654 655 release/moc_lineedit.o: release/moc_lineedit.cpp 656 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_lineedit.o release/moc_lineedit.cpp 657 658 release/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 661 release/moc_searchbutton.o: release/moc_searchbutton.cpp 662 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_searchbutton.o release/moc_searchbutton.cpp 663 664 release/moc_searchlineedit.o: release/moc_searchlineedit.cpp 665 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_searchlineedit.o release/moc_searchlineedit.cpp 509 666 510 667 release/moc_vceditaccount.o: release/moc_vceditaccount.cpp … … 517 674 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCAccountLoadThread.o release/moc_BCAccountLoadThread.cpp 518 675 519 release/moc_DASQLiteAccountListManager.o: release/moc_DASQLiteAccountListManager.cpp520 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DASQLiteAccountListManager.o release/moc_DASQLiteAccountListManager.cpp521 522 676 release/moc_DAAccountManager.o: release/moc_DAAccountManager.cpp 523 677 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DAAccountManager.o release/moc_DAAccountManager.cpp 524 678 679 release/moc_BCAccountManager.o: release/moc_BCAccountManager.cpp 680 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCAccountManager.o release/moc_BCAccountManager.cpp 681 525 682 release/moc_BCAccountLoadManager.o: release/moc_BCAccountLoadManager.cpp 526 683 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCAccountLoadManager.o release/moc_BCAccountLoadManager.cpp … … 535 692 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DAGroupManager.o release/moc_DAGroupManager.cpp 536 693 694 release/moc_BCGroupManager.o: release/moc_BCGroupManager.cpp 695 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCGroupManager.o release/moc_BCGroupManager.cpp 696 537 697 release/moc_vceditcontact.o: release/moc_vceditcontact.cpp 538 698 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_vceditcontact.o release/moc_vceditcontact.cpp … … 544 704 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_vcaddressbook.o release/moc_vcaddressbook.cpp 545 705 546 release/moc_ DASQLiteStorage.o: release/moc_DASQLiteStorage.cpp547 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_ DASQLiteStorage.o release/moc_DASQLiteStorage.cpp706 release/moc_BCContactManager.o: release/moc_BCContactManager.cpp 707 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCContactManager.o release/moc_BCContactManager.cpp 548 708 549 709 release/moc_DAContactManager.o: release/moc_DAContactManager.cpp -
gateways/SwisscomXtraZone/Makefile
r42 r43 1 1 ############################################################################# 2 2 # Makefile for building: libSwisscomXtraZone.so 3 # Generated by qmake (2.01a) (Qt 4.5.2) on: T hu Jan 14 08:55:0820103 # Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 19 11:57:19 2010 4 4 # Project: SwisscomXtraZone.pro 5 5 # Template: lib … … 84 84 /usr/share/qt4/mkspecs/features/lex.prf \ 85 85 /usr/share/qt4/mkspecs/features/include_source_dir.prf \ 86 /usr/lib/libQtSql.prl \ 86 87 /usr/lib/libQtGui.prl \ 87 88 /usr/lib/libQtNetwork.prl \ … … 108 109 /usr/share/qt4/mkspecs/features/lex.prf: 109 110 /usr/share/qt4/mkspecs/features/include_source_dir.prf: 111 /usr/lib/libQtSql.prl: 110 112 /usr/lib/libQtGui.prl: 111 113 /usr/lib/libQtNetwork.prl: -
gateways/SwisscomXtraZone/Makefile.Debug
r42 r43 1 1 ############################################################################# 2 2 # Makefile for building: libSwisscomXtraZone.so 3 # Generated by qmake (2.01a) (Qt 4.5.2) on: T hu Jan 14 08:55:0820103 # Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 19 11:57:19 2010 4 4 # Project: SwisscomXtraZone.pro 5 5 # Template: lib … … 10 10 CC = gcc 11 11 CXX = g++ 12 DEFINES = -DQT_PLUGIN -DQT_ GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED12 DEFINES = -DQT_PLUGIN -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED 13 13 CFLAGS = -pipe -g -D_REENTRANT -Wall -W -fPIC $(DEFINES) 14 14 CXXFLAGS = -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.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/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. 16 16 LINK = g++ 17 17 LFLAGS = -shared 18 LIBS = $(SUBLIBS) -L/usr/lib -L../../lib/ -ltntdb -l interfaces -lgateway -ldatatypes -lutils -lpthread-lQtGui -lQtNetwork -lQtCore18 LIBS = $(SUBLIBS) -L/usr/lib -L../../lib/ -ltntdb -lgateway -linterfaces -ldatatypes -lutils -lpthread -lQtSql -lQtGui -lQtNetwork -lQtCore 19 19 AR = ar cqs 20 20 RANLIB = … … 177 177 debug/qrc_SwisscomXtraZone.cpp: lib/SwisscomXtraZone.qrc \ 178 178 lib/de.qm \ 179 lib/Swisscom_Root_CA_1_pem.crt 179 lib/Swisscom_Root_CA_1_pem.crt \ 180 lib/SwisscomXtraZone.ico 180 181 /usr/bin/rcc -name SwisscomXtraZone lib/SwisscomXtraZone.qrc -o debug/qrc_SwisscomXtraZone.cpp 181 182 -
gateways/SwisscomXtraZone/Makefile.Release
r42 r43 1 1 ############################################################################# 2 2 # Makefile for building: libSwisscomXtraZone.so 3 # Generated by qmake (2.01a) (Qt 4.5.2) on: T hu Jan 14 08:55:0820103 # Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 19 11:57:19 2010 4 4 # Project: SwisscomXtraZone.pro 5 5 # Template: lib … … 10 10 CC = gcc 11 11 CXX = g++ 12 DEFINES = -DQT_NO_DEBUG -DQT_PLUGIN -DQT_ GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED12 DEFINES = -DQT_NO_DEBUG -DQT_PLUGIN -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED 13 13 CFLAGS = -pipe -O2 -D_REENTRANT -Wall -W -fPIC $(DEFINES) 14 14 CXXFLAGS = -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.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/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. 16 16 LINK = g++ 17 17 LFLAGS = -Wl,-O1 -shared 18 LIBS = $(SUBLIBS) -L/usr/lib -L../../lib/ -ltntdb -l interfaces -lgateway -ldatatypes -lutils -lpthread-lQtGui -lQtNetwork -lQtCore18 LIBS = $(SUBLIBS) -L/usr/lib -L../../lib/ -ltntdb -lgateway -linterfaces -ldatatypes -lutils -lpthread -lQtSql -lQtGui -lQtNetwork -lQtCore 19 19 AR = ar cqs 20 20 RANLIB = … … 177 177 release/qrc_SwisscomXtraZone.cpp: lib/SwisscomXtraZone.qrc \ 178 178 lib/de.qm \ 179 lib/Swisscom_Root_CA_1_pem.crt 179 lib/Swisscom_Root_CA_1_pem.crt \ 180 lib/SwisscomXtraZone.ico 180 181 /usr/bin/rcc -name SwisscomXtraZone lib/SwisscomXtraZone.qrc -o release/qrc_SwisscomXtraZone.cpp 181 182 -
gateways/SwisscomXtraZone/SwisscomXtraZone.pro
r42 r43 8 8 QT = core \ 9 9 network \ 10 gui 10 gui \ 11 sql 11 12 LIBS += -L../../lib/ 13 # Attend the order! 12 14 LIBS += -ltntdb \ 13 15 -linterfaces \ 14 16 -lgateway \ 17 -linterfaces \ 15 18 -ldatatypes \ 16 19 -lutils … … 24 27 ../../lib/libgateway/src/persistence/ \ 25 28 ../../lib/libdatatypes/src/business \ 29 ../../lib/libdatatypes/src \ 26 30 ../../lib/libutils/src/ 27 31 HEADERS += src/business/validation/BCAccountValidator.h \ -
gateways/SwisscomXtraZone/lib/SwisscomXtraZone.qrc
r42 r43 6 6 <file>de.qm</file> 7 7 </qresource> 8 <qresource prefix="/images"> 9 <file>SwisscomXtraZone.ico</file> 10 </qresource> 8 11 </RCC> -
gateways/SwisscomXtraZone/locale/de.ts
r42 r43 3 3 <TS version="2.0" language="de" sourcelanguage="en"> 4 4 <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>24 5 <name>SwisscomXtraZone::BCAccount</name> 25 6 <message> 26 <location filename="../src/business/BCAccount.cpp" line="13 2"/>7 <location filename="../src/business/BCAccount.cpp" line="133"/> 27 8 <source>Could not get the addon text!</source> 28 9 <translation>Der Zusatztext konnte nicht gefunden werden!</translation> 29 10 </message> 30 11 <message> 31 <location filename="../src/business/BCAccount.cpp" line="13 8"/>12 <location filename="../src/business/BCAccount.cpp" line="139"/> 32 13 <source>Could not get the longSMSLength!</source> 33 14 <translation>Die SMS-Länge konnte nicht eruiert werden!</translation> 34 15 </message> 35 16 <message> 36 <location filename="../src/business/BCAccount.cpp" line="14 4"/>17 <location filename="../src/business/BCAccount.cpp" line="145"/> 37 18 <source>Could not get the free sms count!</source> 38 19 <translation>Die Anzahl der Gratis-SMS konnte nicht gefunden werden!</translation> 39 20 </message> 40 21 <message> 41 <location filename="../src/business/BCAccount.cpp" line="21 7"/>22 <location filename="../src/business/BCAccount.cpp" line="218"/> 42 23 <source>You have only %1 SMS for free. (You need at least %2 SMS left to send this message!)</source> 43 24 <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 16 16 #include <LoginAccountExceptions.h> 17 17 18 #include <snumber.h> 18 19 #include <typeconvert.h> 19 20 … … 24 25 namespace SwisscomXtraZone { 25 26 26 BCAccount::BCAccount(IS QLiteStorage* storage)27 BCAccount::BCAccount(IStorage* storage) 27 28 : AbstractLoginAccount(new DAAccountStorageOfficer(this, storage), new BCAccountValidator(this)) 28 29 … … 52 53 53 54 IAccount* BCAccount::getClonedInstance() const { 54 return new BCAccount( dynamic_cast<ISQLiteStorage*>(getStorageOfficer()->storage()));55 return new BCAccount(getStorageOfficer()->storage()); 55 56 } 56 57 … … 159 160 QMap<QString, QString> posts; 160 161 posts.insert("CobYouthSMSSenden:btnAddReceiver", ""); 161 posts.insert("CobYouthSMSSenden:txtNewReceiver", recipient->number() ->toString("aau"));162 posts.insert("CobYouthSMSSenden:txtNewReceiver", recipient->number().toString("aaau")); 162 163 163 164 _doPost(posts); … … 178 179 179 180 180 void BCAccount::sendSMS(const QString& message, const Q List<IContact*>& recipients) {181 void BCAccount::sendSMS(const QString& message, const QSet<IContact*>& recipients) { 181 182 if ((message == "") || recipients.empty()){ 182 183 return; … … 228 229 int y = 0; 229 230 230 Q ListIterator<IContact*> j(recipients);231 QSetIterator<IContact*> j(recipients); 231 232 do { 232 233 setStatus(LoginAccount::Status::RemovingRecipients); -
gateways/SwisscomXtraZone/src/business/BCAccount.h
r42 r43 10 10 11 11 #include <AbstractLoginAccount.h> 12 #include <persistence/is qlitestorage.h>12 #include <persistence/istorage.h> 13 13 14 14 #include <HttpHelper.h> … … 20 20 21 21 public: 22 explicit BCAccount(IS QLiteStorage* storage);22 explicit BCAccount(IStorage* storage); 23 23 virtual ~BCAccount(); 24 24 … … 27 27 28 28 /* IAccount */ 29 virtual void sendSMS(const QString& message, const Q List<IContact*>& recipients);29 virtual void sendSMS(const QString& message, const QSet<IContact*>& recipients); 30 30 virtual void cancelSMSSending(); 31 31 -
gateways/SwisscomXtraZone/src/business/BCGateway.cpp
r42 r43 23 23 } 24 24 25 QImage BCGateway::icon() const { 26 return QImage(":/images/SwisscomXtraZone.ico"); 27 } 28 25 29 IAccount* BCGateway::createAccountInstance(IStorage* storage) const { 26 return new BCAccount(st atic_cast<ISQLiteStorage*>(storage));30 return new BCAccount(storage); 27 31 } 28 32 -
gateways/SwisscomXtraZone/src/business/BCGateway.h
r42 r43 10 10 11 11 #include <AbstractLoginGateway.h> 12 #include <persistence/is qlitestorage.h>12 #include <persistence/istorage.h> 13 13 14 14 … … 27 27 /* IGateway */ 28 28 virtual QString name() const; 29 virtual QImage icon() const; 30 29 31 virtual IAccount* createAccountInstance(IStorage* storage) const; 30 32 -
gateways/SwisscomXtraZone/src/persistence/DAAccountStorageOfficer.h
r42 r43 17 17 18 18 public: 19 DAAccountStorageOfficer(ILoginAccount* account, IS QLiteStorage* storage)19 DAAccountStorageOfficer(ILoginAccount* account, IStorage* storage) 20 20 : AbstractLoginAccountStorageOfficer(account, storage, "sdo2o0034_k!Qdoc0DiwnfDaLdY<ymWWpovDmwpovDö__dmkosadDLDd.:easdfDSs") 21 21 {}; -
gateways/SwisscomXtraZone/src/ui/vcsettingswidget.cpp
r42 r43 32 32 BCAccount* account_; 33 33 try { 34 // TODO: this gives no error... 34 35 account_ = dynamic_cast<BCAccount*>(account); 35 36 } catch (...) { -
gateways/SwisscomXtraZone/ui_vcsettingswidget.h
r42 r43 2 2 ** Form generated from reading ui file 'vcsettingswidget.ui' 3 3 ** 4 ** Created: T hu Jan 14 08:55:4120104 ** Created: Tue Jan 26 20:40:48 2010 5 5 ** by: Qt User Interface Compiler version 4.5.2 6 6 ** -
lib/libdatatypes/datatypes.pro
r41 r43 18 18 src/business/BCContact.h \ 19 19 src/business/BCGroup.h \ 20 src/ business/BCNumber.h \21 src/ business/BCShortcut.h20 src/snumber.h \ 21 src/sshortcut.h 22 22 SOURCES += src/business/BCBinary.cpp \ 23 23 src/business/BCContact.cpp \ 24 24 src/business/BCGroup.cpp \ 25 src/ business/BCNumber.cpp \26 src/ business/BCShortcut.cpp25 src/snumber.cpp \ 26 src/sshortcut.cpp 27 27 FORMS += 28 28 RESOURCES += -
lib/libdatatypes/src/business/BCContact.cpp
r41 r43 8 8 #include "BCContact.h" 9 9 10 #include "BCBinary.h" 11 #include "BCNumber.h" 10 BCContact::BCContact() 11 : id_(-1) 12 , name_("") 13 , number_(SNumber()) 14 , image_(QImage()) 15 { 16 eventMapper_ = new ContactEventMapper(this); 17 } 12 18 19 ContactEventMapper* BCContact::eventMapper() const { 20 return eventMapper_; 21 } 22 IContactEvents* BCContact::contactEvents() const { 23 return static_cast<IContactEvents*>(eventMapper()); 24 } 13 25 14 BCContact::BCContact() {15 id_ = -1;16 name_ = "";17 number_ = new BCNumber();18 image_ = new BCBinary();19 }20 26 21 27 int BCContact::id() const{ 22 28 return id_; 23 29 } 24 25 30 QString BCContact::name() const{ 26 31 return name_; 27 32 } 28 29 INumber* BCContact::number() const{ 33 SNumber BCContact::number() const{ 30 34 return number_; 31 35 } 32 33 36 QStringList BCContact::aliases() const{ 34 37 return aliases_; 35 38 } 36 37 IBinary* BCContact::image() const{ 39 QImage BCContact::image() const{ 38 40 return image_; 39 41 } 40 42 41 43 42 void BCContact::setID(int id){ 44 void BCContact::setId(int id){ 45 if (id_ == id) return; 46 47 int oldId = id_; 43 48 id_ = id; 49 50 emit contactEvents()->idChanged(oldId, id); 51 emit contactEvents()->dataChanged(); 44 52 } 45 46 53 void BCContact::setName(const QString& name){ 47 name_ = name.trimmed(); 54 SET_IF_DIFFERENT(name_, name.trimmed()); 55 emit contactEvents()->dataChanged(); 48 56 } 49 50 void BCContact::setNumber(const INumber& number){ 51 number_ = const_cast<INumber*>(&number);57 void BCContact::setNumber(const SNumber& number){ 58 SET_IF_DIFFERENT(number_, number); 59 emit contactEvents()->dataChanged(); 52 60 } 53 54 void BCContact::setNumber(const QString& numberStr){ 55 number_ = new BCNumber(numberStr);61 void BCContact::setAliases(const QStringList& aliases){ 62 SET_IF_DIFFERENT(aliases_, aliases); 63 emit contactEvents()->dataChanged(); 56 64 } 57 58 void BCContact::setAliases(const QStringList& aliases){ 59 aliases_ = aliases;65 void BCContact::setImage(const QImage& image){ 66 SET_IF_DIFFERENT(image_, image); 67 emit contactEvents()->dataChanged(); 60 68 } 61 62 void BCContact::setImage(const IBinary& image){63 image_ = const_cast<IBinary*>(&image);64 } -
lib/libdatatypes/src/business/BCContact.h
r41 r43 9 9 #define BCCONTACT_H_ 10 10 11 #include <QObject> 12 11 13 #include <icontact.h> 12 14 13 class BCContact: public IContact { 15 #include "../snumber.h" 16 17 class BCContact: public QObject, public IContact { 18 Q_OBJECT 19 Q_INTERFACES(IContact) 20 14 21 public: 15 22 BCContact(); … … 17 24 virtual int id() const; 18 25 virtual QString name() const; 19 virtual INumber*number() const;26 virtual SNumber number() const; 20 27 virtual QStringList aliases() const; 21 virtual IBinary*image() const;28 virtual QImage image() const; 22 29 23 virtual void setI D(int id);30 virtual void setId(int id); 24 31 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); 27 33 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 38 protected: 39 virtual IContactEvents* contactEvents() const; 29 40 30 41 private: 42 ContactEventMapper* eventMapper_; 43 31 44 int id_; 32 45 QString name_; 33 INumber*number_;46 SNumber number_; 34 47 QStringList aliases_; 35 IBinary*image_;48 QImage image_; 36 49 }; 37 50 -
lib/libdatatypes/src/business/BCGroup.cpp
r41 r43 9 9 10 10 #include "BCBinary.h" 11 #include "BCNumber.h"12 11 13 BCGroup::BCGroup() { 14 id_ = -1; 15 name_ = ""; 16 image_ = new BCBinary(); 12 BCGroup::BCGroup() 13 : id_(-1) 14 , name_("") 15 , image_(QImage()) 16 { 17 eventMapper_ = new GroupEventMapper(this); 17 18 } 19 20 GroupEventMapper* BCGroup::eventMapper() const { 21 return eventMapper_; 22 } 23 IGroupEvents* BCGroup::groupEvents() const { 24 return static_cast<IGroupEvents*>(eventMapper()); 25 } 26 18 27 19 28 int BCGroup::id() const{ 20 29 return id_; 21 30 } 22 23 31 QString BCGroup::name() const{ 24 32 return name_; 25 33 } 26 27 IBinary* BCGroup::image() const{ 34 QImage BCGroup::image() const{ 28 35 return image_; 29 36 } 30 31 QList<IContact*> BCGroup::contacts() const{ 32 return contacts_.values(); 37 QSet<IContact*> BCGroup::contacts() const{ 38 return contactList_.values().toSet(); 33 39 } 34 40 35 41 36 void BCGroup::setID(int id){ 37 //TODO: implement observer-pattern to inform groups about this change. Or just change it there... 42 void BCGroup::setId(int id){ 43 if (id_ == id) return; 44 45 int oldId = id_; 38 46 id_ = id; 47 48 emit groupEvents()->idChanged(oldId, id); 49 emit groupEvents()->dataChanged(); 39 50 } 40 41 51 void BCGroup::setName(const QString& name){ 42 name_ = name.trimmed(); 52 SET_IF_DIFFERENT(name_, name.trimmed()); 53 emit groupEvents()->dataChanged(); 43 54 } 44 45 void BCGroup::setImage(const IBinary& image){ 46 image_ = const_cast<IBinary*>(&image);55 void BCGroup::setImage(const QImage& image){ 56 SET_IF_DIFFERENT(image_, image); 57 emit groupEvents()->dataChanged(); 47 58 } 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 59 void BCGroup::setContacts(const QSet<IContact*>& contacts){ 60 foreach (IContact* contact, contactList_) { 61 if (!contacts.contains(contact)) 62 removeContactFromList(contact); 63 } 55 64 foreach (IContact* contact, contacts) { 56 addContact (contact);65 addContactToList(contact); 57 66 } 67 } 68 void BCGroup::addContact(IContact* contact){ 69 addContactToList(contact); 70 } 71 void BCGroup::removeContact(int contactId){ 72 removeContact(contactList_[contactId]); 73 } 74 void BCGroup::removeContact(IContact* contact){ 75 removeContactFromList(contact); 58 76 } 59 77 60 78 61 /*void BCGroup::addContact(int contactId){ 62 contactIds_.insert(contactId); 63 }*/ 64 void BCGroup::addContact(IContact* contact){ 65 contacts_.insert(contact->id(), contact); 79 void 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 } 89 void 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); 66 98 } 67 99 68 void BCGroup::removeContact(int contactId){ 69 contacts_.remove(contactId); 100 101 void BCGroup::contactIdChanged(int oldId, int newId) { 102 IContact* contact = contactList_.take(oldId); 103 if (contact != NULL) 104 contactList_.insert(newId, contact); 70 105 } 71 void BCGroup::removeContact(IContact* contact){72 removeContact(contacts_.key(contact));73 //removeContact(contact->id());74 } -
lib/libdatatypes/src/business/BCGroup.h
r41 r43 9 9 #define BCGROUP_H_ 10 10 11 #include <QObject> 11 12 #include <QMap> 12 13 13 14 #include <igroup.h> 14 15 15 class BCGroup: public IGroup { 16 class BCGroup: public QObject, public IGroup { 17 Q_OBJECT 18 Q_INTERFACES(IGroup) 19 16 20 public: 17 21 BCGroup(); 18 22 19 virtual int 20 virtual QString 21 virtual IBinary*image() const;22 virtual Q List<IContact*> contacts() const;23 virtual int id() const; 24 virtual QString name() const; 25 virtual QImage image() const; 26 virtual QSet<IContact*> contacts() const; 23 27 24 virtual void setI D(int id);28 virtual void setId(int id); 25 29 virtual void setName(const QString& name); 26 virtual void setImage(const IBinary& image);30 virtual void setImage(const QImage& image); 27 31 // virtual void setContacts(const QSet<int>& contactIds); 28 virtual void setContacts(const Q List<IContact*>& contacts);32 virtual void setContacts(const QSet<IContact*>& contacts); 29 33 30 34 virtual void addContact(IContact* contact); … … 32 36 virtual void removeContact(IContact* contact); 33 37 38 virtual GroupEventMapper* eventMapper() const; 39 40 protected: 41 virtual IGroupEvents* groupEvents() const; 42 43 protected slots: 44 void contactIdChanged(int oldId, int newId); 34 45 35 46 private: 47 GroupEventMapper* eventMapper_; 48 36 49 int id_; 37 50 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); 40 56 }; 41 57 -
lib/libgateway/Makefile
r41 r43 1 1 ############################################################################# 2 2 # Makefile for building: libgateway.a 3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 12 16:59:0620103 # Generated by qmake (2.01a) (Qt 4.5.2) on: Sun Jan 17 14:52:09 2010 4 4 # Project: gateway.pro 5 5 # Template: lib … … 86 86 /usr/share/qt4/mkspecs/features/lex.prf \ 87 87 /usr/share/qt4/mkspecs/features/include_source_dir.prf \ 88 /usr/lib/libQtSql.prl \ 88 89 /usr/lib/libQtGui.prl \ 89 90 /usr/lib/libQtNetwork.prl \ … … 112 113 /usr/share/qt4/mkspecs/features/lex.prf: 113 114 /usr/share/qt4/mkspecs/features/include_source_dir.prf: 115 /usr/lib/libQtSql.prl: 114 116 /usr/lib/libQtGui.prl: 115 117 /usr/lib/libQtNetwork.prl: -
lib/libgateway/Makefile.Debug
r41 r43 1 1 ############################################################################# 2 2 # Makefile for building: libgateway.a 3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 12 16:59:0620103 # Generated by qmake (2.01a) (Qt 4.5.2) on: Sun Jan 17 14:52:09 2010 4 4 # Project: gateway.pro 5 5 # Template: lib … … 10 10 CC = gcc 11 11 CXX = g++ 12 DEFINES = -DQT_ GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED12 DEFINES = -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED 13 13 CFLAGS = -pipe -g -D_REENTRANT -fPIC -Wall -W $(DEFINES) 14 14 CXXFLAGS = -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 -Idebug15 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/QtSql -I/usr/include/qt4 -Iapp -I../libinterfaces/src/exceptions -I../libinterfaces/src/business -I../libinterfaces/src -I../libutils/src -Idebug 16 16 AR = ar cqs 17 17 RANLIB = … … 39 39 ####### Files 40 40 41 SOURCES = src/business/validation/BCLoginAccountValidator.cpp \ 41 SOURCES = src/persistence/AbstractStorageOfficer.cpp \ 42 src/business/validation/BCLoginAccountValidator.cpp \ 42 43 src/business/AbstractAccount.cpp \ 43 44 src/business/AbstractLoginAccount.cpp \ … … 49 50 src/business/validation/BCStdAccountValidator.cpp \ 50 51 src/business/validation/BCLoginAccountValidator.cpp \ 52 src/persistence/AbstractStorageOfficer.cpp \ 51 53 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 \ 54 55 debug/moc_AbstractAccount.cpp \ 55 56 debug/moc_AbstractLoginAccount.cpp \ … … 60 61 debug/moc_BCStdAccountValidator.cpp \ 61 62 debug/moc_BCValidationResult.cpp \ 63 debug/moc_AbstractStorageOfficer.cpp \ 62 64 debug/moc_AbstractAccountStorageOfficer.cpp \ 63 debug/moc_AbstractLoginAccountStorageOfficer.cpp \64 debug/moc_AbstractSQLiteStorageOfficer.cpp 65 OBJECTS =debug/BCLoginAccountValidator.o \65 debug/moc_AbstractLoginAccountStorageOfficer.cpp 66 OBJECTS = debug/AbstractStorageOfficer.o \ 67 debug/BCLoginAccountValidator.o \ 66 68 debug/AbstractAccount.o \ 67 69 debug/AbstractLoginAccount.o \ … … 73 75 debug/BCStdAccountValidator.o \ 74 76 debug/BCLoginAccountValidator.o \ 77 debug/AbstractStorageOfficer.o \ 75 78 debug/AbstractAccountStorageOfficer.o \ 76 79 debug/AbstractLoginAccountStorageOfficer.o \ 77 debug/AbstractSQLiteStorageOfficer.o \78 80 debug/moc_BCLoginAccountValidator.o \ 79 81 debug/moc_AbstractAccount.o \ … … 85 87 debug/moc_BCStdAccountValidator.o \ 86 88 debug/moc_BCValidationResult.o \ 89 debug/moc_AbstractStorageOfficer.o \ 87 90 debug/moc_AbstractAccountStorageOfficer.o \ 88 debug/moc_AbstractLoginAccountStorageOfficer.o \ 89 debug/moc_AbstractSQLiteStorageOfficer.o 91 debug/moc_AbstractLoginAccountStorageOfficer.o 90 92 DIST = /usr/share/qt4/mkspecs/common/g++.conf \ 91 93 /usr/share/qt4/mkspecs/common/unix.conf \ … … 155 157 dist: 156 158 @$(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/Abstract AccountStorageOfficer.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.0159 $(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 158 160 159 161 … … 174 176 mocables: compiler_moc_header_make_all compiler_moc_source_make_all 175 177 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_Abstract AccountStorageOfficer.cpp debug/moc_AbstractLoginAccountStorageOfficer.cpp debug/moc_AbstractSQLiteStorageOfficer.cpp178 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_AbstractStorageOfficer.cpp debug/moc_AbstractAccountStorageOfficer.cpp debug/moc_AbstractLoginAccountStorageOfficer.cpp 177 179 compiler_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_Abstract AccountStorageOfficer.cpp debug/moc_AbstractLoginAccountStorageOfficer.cpp debug/moc_AbstractSQLiteStorageOfficer.cpp180 -$(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 179 181 debug/moc_BCLoginAccountValidator.cpp: src/business/validation/BCStdAccountValidator.h \ 180 182 src/business/validation/BCLoginAccountValidator.h … … 212 214 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/validation/BCValidationResult.h -o debug/moc_BCValidationResult.cpp 213 215 214 debug/moc_AbstractAccountStorageOfficer.cpp: src/persistence/AbstractSQLiteStorageOfficer.h \ 216 debug/moc_AbstractStorageOfficer.cpp: src/persistence/AbstractStorageOfficer.h 217 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/AbstractStorageOfficer.h -o debug/moc_AbstractStorageOfficer.cpp 218 219 debug/moc_AbstractAccountStorageOfficer.cpp: src/persistence/AbstractStorageOfficer.h \ 215 220 src/persistence/AbstractAccountStorageOfficer.h 216 221 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/AbstractAccountStorageOfficer.h -o debug/moc_AbstractAccountStorageOfficer.cpp 217 222 218 223 debug/moc_AbstractLoginAccountStorageOfficer.cpp: src/persistence/AbstractAccountStorageOfficer.h \ 219 src/persistence/AbstractS QLiteStorageOfficer.h \224 src/persistence/AbstractStorageOfficer.h \ 220 225 src/persistence/AbstractLoginAccountStorageOfficer.h 221 226 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/AbstractLoginAccountStorageOfficer.h -o debug/moc_AbstractLoginAccountStorageOfficer.cpp 222 223 debug/moc_AbstractSQLiteStorageOfficer.cpp: src/persistence/AbstractSQLiteStorageOfficer.h224 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/AbstractSQLiteStorageOfficer.h -o debug/moc_AbstractSQLiteStorageOfficer.cpp225 227 226 228 compiler_rcc_make_all: … … 243 245 ####### Compile 244 246 247 debug/AbstractStorageOfficer.o: src/persistence/AbstractStorageOfficer.cpp src/persistence/AbstractStorageOfficer.h 248 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/AbstractStorageOfficer.o src/persistence/AbstractStorageOfficer.cpp 249 245 250 debug/BCLoginAccountValidator.o: src/business/validation/BCLoginAccountValidator.cpp src/business/validation/BCLoginAccountValidator.h \ 246 251 src/business/validation/BCStdAccountValidator.h \ … … 283 288 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BCLoginAccountValidator.o src/business/validation/BCLoginAccountValidator.cpp 284 289 290 debug/AbstractStorageOfficer.o: src/persistence/AbstractStorageOfficer.cpp src/persistence/AbstractStorageOfficer.h 291 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/AbstractStorageOfficer.o src/persistence/AbstractStorageOfficer.cpp 292 285 293 debug/AbstractAccountStorageOfficer.o: src/persistence/AbstractAccountStorageOfficer.cpp src/persistence/AbstractAccountStorageOfficer.h \ 286 src/persistence/AbstractS QLiteStorageOfficer.h294 src/persistence/AbstractStorageOfficer.h 287 295 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/AbstractAccountStorageOfficer.o src/persistence/AbstractAccountStorageOfficer.cpp 288 296 289 297 debug/AbstractLoginAccountStorageOfficer.o: src/persistence/AbstractLoginAccountStorageOfficer.cpp src/persistence/AbstractLoginAccountStorageOfficer.h \ 290 298 src/persistence/AbstractAccountStorageOfficer.h \ 291 src/persistence/AbstractS QLiteStorageOfficer.h299 src/persistence/AbstractStorageOfficer.h 292 300 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/AbstractLoginAccountStorageOfficer.o src/persistence/AbstractLoginAccountStorageOfficer.cpp 293 294 debug/AbstractSQLiteStorageOfficer.o: src/persistence/AbstractSQLiteStorageOfficer.cpp src/persistence/AbstractSQLiteStorageOfficer.h295 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/AbstractSQLiteStorageOfficer.o src/persistence/AbstractSQLiteStorageOfficer.cpp296 301 297 302 debug/moc_BCLoginAccountValidator.o: debug/moc_BCLoginAccountValidator.cpp … … 322 327 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCValidationResult.o debug/moc_BCValidationResult.cpp 323 328 329 debug/moc_AbstractStorageOfficer.o: debug/moc_AbstractStorageOfficer.cpp 330 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_AbstractStorageOfficer.o debug/moc_AbstractStorageOfficer.cpp 331 324 332 debug/moc_AbstractAccountStorageOfficer.o: debug/moc_AbstractAccountStorageOfficer.cpp 325 333 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_AbstractAccountStorageOfficer.o debug/moc_AbstractAccountStorageOfficer.cpp … … 328 336 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_AbstractLoginAccountStorageOfficer.o debug/moc_AbstractLoginAccountStorageOfficer.cpp 329 337 330 debug/moc_AbstractSQLiteStorageOfficer.o: debug/moc_AbstractSQLiteStorageOfficer.cpp331 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_AbstractSQLiteStorageOfficer.o debug/moc_AbstractSQLiteStorageOfficer.cpp332 333 338 ####### Install 334 339 -
lib/libgateway/Makefile.Release
r41 r43 1 1 ############################################################################# 2 2 # Makefile for building: libgateway.a 3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 12 16:59:0620103 # Generated by qmake (2.01a) (Qt 4.5.2) on: Sun Jan 17 14:52:09 2010 4 4 # Project: gateway.pro 5 5 # Template: lib … … 10 10 CC = gcc 11 11 CXX = g++ 12 DEFINES = -DQT_NO_DEBUG -DQT_ GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED12 DEFINES = -DQT_NO_DEBUG -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED 13 13 CFLAGS = -pipe -O2 -D_REENTRANT -fPIC -Wall -W $(DEFINES) 14 14 CXXFLAGS = -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 -Irelease15 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/QtSql -I/usr/include/qt4 -Iapp -I../libinterfaces/src/exceptions -I../libinterfaces/src/business -I../libinterfaces/src -I../libutils/src -Irelease 16 16 AR = ar cqs 17 17 RANLIB = … … 39 39 ####### Files 40 40 41 SOURCES = src/business/validation/BCLoginAccountValidator.cpp \ 41 SOURCES = src/persistence/AbstractStorageOfficer.cpp \ 42 src/business/validation/BCLoginAccountValidator.cpp \ 42 43 src/business/AbstractAccount.cpp \ 43 44 src/business/AbstractLoginAccount.cpp \ … … 49 50 src/business/validation/BCStdAccountValidator.cpp \ 50 51 src/business/validation/BCLoginAccountValidator.cpp \ 52 src/persistence/AbstractStorageOfficer.cpp \ 51 53 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 \ 54 55 release/moc_AbstractAccount.cpp \ 55 56 release/moc_AbstractLoginAccount.cpp \ … … 60 61 release/moc_BCStdAccountValidator.cpp \ 61 62 release/moc_BCValidationResult.cpp \ 63 release/moc_AbstractStorageOfficer.cpp \ 62 64 release/moc_AbstractAccountStorageOfficer.cpp \ 63 release/moc_AbstractLoginAccountStorageOfficer.cpp \64 release/moc_AbstractSQLiteStorageOfficer.cpp 65 OBJECTS =release/BCLoginAccountValidator.o \65 release/moc_AbstractLoginAccountStorageOfficer.cpp 66 OBJECTS = release/AbstractStorageOfficer.o \ 67 release/BCLoginAccountValidator.o \ 66 68 release/AbstractAccount.o \ 67 69 release/AbstractLoginAccount.o \ … … 73 75 release/BCStdAccountValidator.o \ 74 76 release/BCLoginAccountValidator.o \ 77 release/AbstractStorageOfficer.o \ 75 78 release/AbstractAccountStorageOfficer.o \ 76 79 release/AbstractLoginAccountStorageOfficer.o \ 77 release/AbstractSQLiteStorageOfficer.o \78 80 release/moc_BCLoginAccountValidator.o \ 79 81 release/moc_AbstractAccount.o \ … … 85 87 release/moc_BCStdAccountValidator.o \ 86 88 release/moc_BCValidationResult.o \ 89 release/moc_AbstractStorageOfficer.o \ 87 90 release/moc_AbstractAccountStorageOfficer.o \ 88 release/moc_AbstractLoginAccountStorageOfficer.o \ 89 release/moc_AbstractSQLiteStorageOfficer.o 91 release/moc_AbstractLoginAccountStorageOfficer.o 90 92 DIST = /usr/share/qt4/mkspecs/common/g++.conf \ 91 93 /usr/share/qt4/mkspecs/common/unix.conf \ … … 155 157 dist: 156 158 @$(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/Abstract AccountStorageOfficer.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.0159 $(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 158 160 159 161 … … 174 176 mocables: compiler_moc_header_make_all compiler_moc_source_make_all 175 177 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_Abstract AccountStorageOfficer.cpp release/moc_AbstractLoginAccountStorageOfficer.cpp release/moc_AbstractSQLiteStorageOfficer.cpp178 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_AbstractStorageOfficer.cpp release/moc_AbstractAccountStorageOfficer.cpp release/moc_AbstractLoginAccountStorageOfficer.cpp 177 179 compiler_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_Abstract AccountStorageOfficer.cpp release/moc_AbstractLoginAccountStorageOfficer.cpp release/moc_AbstractSQLiteStorageOfficer.cpp180 -$(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 179 181 release/moc_BCLoginAccountValidator.cpp: src/business/validation/BCStdAccountValidator.h \ 180 182 src/business/validation/BCLoginAccountValidator.h … … 212 214 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/validation/BCValidationResult.h -o release/moc_BCValidationResult.cpp 213 215 214 release/moc_AbstractAccountStorageOfficer.cpp: src/persistence/AbstractSQLiteStorageOfficer.h \ 216 release/moc_AbstractStorageOfficer.cpp: src/persistence/AbstractStorageOfficer.h 217 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/AbstractStorageOfficer.h -o release/moc_AbstractStorageOfficer.cpp 218 219 release/moc_AbstractAccountStorageOfficer.cpp: src/persistence/AbstractStorageOfficer.h \ 215 220 src/persistence/AbstractAccountStorageOfficer.h 216 221 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/AbstractAccountStorageOfficer.h -o release/moc_AbstractAccountStorageOfficer.cpp 217 222 218 223 release/moc_AbstractLoginAccountStorageOfficer.cpp: src/persistence/AbstractAccountStorageOfficer.h \ 219 src/persistence/AbstractS QLiteStorageOfficer.h \224 src/persistence/AbstractStorageOfficer.h \ 220 225 src/persistence/AbstractLoginAccountStorageOfficer.h 221 226 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/AbstractLoginAccountStorageOfficer.h -o release/moc_AbstractLoginAccountStorageOfficer.cpp 222 223 release/moc_AbstractSQLiteStorageOfficer.cpp: src/persistence/AbstractSQLiteStorageOfficer.h224 /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/AbstractSQLiteStorageOfficer.h -o release/moc_AbstractSQLiteStorageOfficer.cpp225 227 226 228 compiler_rcc_make_all: … … 243 245 ####### Compile 244 246 247 release/AbstractStorageOfficer.o: src/persistence/AbstractStorageOfficer.cpp src/persistence/AbstractStorageOfficer.h 248 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/AbstractStorageOfficer.o src/persistence/AbstractStorageOfficer.cpp 249 245 250 release/BCLoginAccountValidator.o: src/business/validation/BCLoginAccountValidator.cpp src/business/validation/BCLoginAccountValidator.h \ 246 251 src/business/validation/BCStdAccountValidator.h \ … … 283 288 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BCLoginAccountValidator.o src/business/validation/BCLoginAccountValidator.cpp 284 289 290 release/AbstractStorageOfficer.o: src/persistence/AbstractStorageOfficer.cpp src/persistence/AbstractStorageOfficer.h 291 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/AbstractStorageOfficer.o src/persistence/AbstractStorageOfficer.cpp 292 285 293 release/AbstractAccountStorageOfficer.o: src/persistence/AbstractAccountStorageOfficer.cpp src/persistence/AbstractAccountStorageOfficer.h \ 286 src/persistence/AbstractS QLiteStorageOfficer.h294 src/persistence/AbstractStorageOfficer.h 287 295 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/AbstractAccountStorageOfficer.o src/persistence/AbstractAccountStorageOfficer.cpp 288 296 289 297 release/AbstractLoginAccountStorageOfficer.o: src/persistence/AbstractLoginAccountStorageOfficer.cpp src/persistence/AbstractLoginAccountStorageOfficer.h \ 290 298 src/persistence/AbstractAccountStorageOfficer.h \ 291 src/persistence/AbstractS QLiteStorageOfficer.h299 src/persistence/AbstractStorageOfficer.h 292 300 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/AbstractLoginAccountStorageOfficer.o src/persistence/AbstractLoginAccountStorageOfficer.cpp 293 294 release/AbstractSQLiteStorageOfficer.o: src/persistence/AbstractSQLiteStorageOfficer.cpp src/persistence/AbstractSQLiteStorageOfficer.h295 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/AbstractSQLiteStorageOfficer.o src/persistence/AbstractSQLiteStorageOfficer.cpp296 301 297 302 release/moc_BCLoginAccountValidator.o: release/moc_BCLoginAccountValidator.cpp … … 322 327 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCValidationResult.o release/moc_BCValidationResult.cpp 323 328 329 release/moc_AbstractStorageOfficer.o: release/moc_AbstractStorageOfficer.cpp 330 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_AbstractStorageOfficer.o release/moc_AbstractStorageOfficer.cpp 331 324 332 release/moc_AbstractAccountStorageOfficer.o: release/moc_AbstractAccountStorageOfficer.cpp 325 333 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_AbstractAccountStorageOfficer.o release/moc_AbstractAccountStorageOfficer.cpp … … 328 336 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_AbstractLoginAccountStorageOfficer.o release/moc_AbstractLoginAccountStorageOfficer.cpp 329 337 330 release/moc_AbstractSQLiteStorageOfficer.o: release/moc_AbstractSQLiteStorageOfficer.cpp331 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_AbstractSQLiteStorageOfficer.o release/moc_AbstractSQLiteStorageOfficer.cpp332 333 338 ####### Install 334 339 -
lib/libgateway/gateway.pro
r41 r43 8 8 QT += core \ 9 9 gui \ 10 network 10 network \ 11 sql 11 12 LIBS += -L../ 12 13 LIBS += -linterfaces \ … … 30 31 src/business/validation/BCValidationResult.h \ 31 32 src/exceptions/LoginAccountExceptions.h \ 33 src/persistence/AbstractStorageOfficer.h \ 32 34 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 36 SOURCES += src/persistence/AbstractStorageOfficer.cpp \ 37 src/business/validation/BCLoginAccountValidator.cpp \ 36 38 src/business/AbstractAccount.cpp \ 37 39 src/business/AbstractLoginAccount.cpp \ … … 43 45 src/business/validation/BCStdAccountValidator.cpp \ 44 46 src/business/validation/BCLoginAccountValidator.cpp \ 47 src/persistence/AbstractStorageOfficer.cpp \ 45 48 src/persistence/AbstractAccountStorageOfficer.cpp \ 46 src/persistence/AbstractLoginAccountStorageOfficer.cpp \ 47 src/persistence/AbstractSQLiteStorageOfficer.cpp 49 src/persistence/AbstractLoginAccountStorageOfficer.cpp 48 50 FORMS += 49 51 RESOURCES += -
lib/libgateway/src/business/AbstractAccount.cpp
r41 r43 1 1 2 2 #include "AbstractAccount.h" 3 4 AbstractAccount::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 22 AccountEventMapper* AbstractAccount::eventMapper() const { 23 return eventMapper_; 24 } 25 IAccountEvents* AbstractAccount::accountEvents() const { 26 return static_cast<IAccountEvents*>(eventMapper()); 27 } 3 28 4 29 int AbstractAccount::id() const { … … 6 31 } 7 32 void AbstractAccount::setId(int id) { 33 if (id_ == id) return; 34 35 int oldId = id_; 8 36 id_ = id; 37 38 emit accountEvents()->idChanged(oldId, id); 39 emit accountEvents()->dataChanged(); 9 40 } 10 41 … … 13 44 } 14 45 void AbstractAccount::setName(const QString& name) { 15 name_ = name.trimmed(); 46 SET_IF_DIFFERENT(name_, name.trimmed()); 47 emit accountEvents()->dataChanged(); 16 48 } 17 49 18 50 19 51 void 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 20 58 if (progress > -1) { 21 59 setProgress(progress, progressMethod); 22 60 } 23 24 // TODO (inform observer about status change & progress...)25 61 } 26 62 void AbstractAccount::setProgress(int progress, const ProgressMethod& progressMethod /* = SetProgress */) { … … 31 67 32 68 case SetProgress: 33 progress_ = progress;69 SET_IF_DIFFERENT(progress_, progress); 34 70 break; 35 71 } 36 72 37 // TODO inform the observers about the progress change73 emit accountEvents()->progressChanged(progress_); 38 74 } 39 75 … … 42 78 } 43 79 void AbstractAccount::setEnabled(bool enabled) { 44 enabled_ = enabled; 80 SET_IF_DIFFERENT(enabled_, enabled); 81 emit accountEvents()->dataChanged(); 82 45 83 if (!enabled) { 46 84 unInitialize(); … … 53 91 } 54 92 void AbstractAccount::setFreeSMSCount(int freeSMSCount) { 55 freeSMSCount_ = freeSMSCount; 93 SET_IF_DIFFERENT(freeSMSCount_, freeSMSCount); 94 emit accountEvents()->dataChanged(); 56 95 } 57 96 … … 59 98 return validator_; 60 99 } 61 IS QLiteStorageOfficer* AbstractAccount::getStorageOfficer() const {100 IStorageOfficer* AbstractAccount::getStorageOfficer() const { 62 101 return storageOfficer_; 63 102 } … … 69 108 return; 70 109 } 110 111 /* TODO: Do this in a queue... */ 71 112 72 113 while (stoppingInitialization_){ -
lib/libgateway/src/business/AbstractAccount.h
r41 r43 10 10 11 11 #include <iaccount.h> 12 #include <persistence/is qlitestorageofficer.h>12 #include <persistence/istorageofficer.h> 13 13 14 14 class AbstractAccount: public QObject, virtual public IAccount { … … 17 17 18 18 public: 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); 32 20 33 21 /* IAccount */ … … 52 40 virtual void cancelSMSSending(); 53 41 42 AccountEventMapper* eventMapper() const; 43 54 44 /* IValidatable */ 55 virtual IValidator* 45 virtual IValidator* getValidator() const; 56 46 57 47 /* IStorable */ 58 virtual IS QLiteStorageOfficer* getStorageOfficer() const;48 virtual IStorageOfficer* getStorageOfficer() const; 59 49 60 50 protected: … … 68 58 virtual void uncancelSendingSMS(); 69 59 60 virtual IAccountEvents* accountEvents() const; 61 70 62 private: 63 AccountEventMapper* eventMapper_; 64 71 65 int id_; 72 66 QString name_; … … 74 68 bool enabled_; 75 69 70 QString status_; 76 71 int progress_; 77 72 int freeSMSCount_; … … 83 78 bool cancelSMSSending_; 84 79 85 IS QLiteStorageOfficer* storageOfficer_;80 IStorageOfficer* storageOfficer_; 86 81 IValidator* validator_; 87 82 }; -
lib/libgateway/src/business/AbstractLoginAccount.cpp
r41 r43 1 1 #include "AbstractLoginAccount.h" 2 3 AbstractLoginAccount::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 14 LoginAccountEventMapper* AbstractLoginAccount::eventMapper() const { 15 return eventMapper_; 16 } 17 ILoginAccountEvents* AbstractLoginAccount::accountEvents() const { 18 return static_cast<ILoginAccountEvents*>(eventMapper()); 19 } 20 2 21 3 22 … … 7 26 8 27 void AbstractLoginAccount::setUsername(const QString& username){ 9 username_ = username.trimmed(); 28 SET_IF_DIFFERENT(username_, username.trimmed()); 29 emit accountEvents()->dataChanged(); 10 30 } 11 31 … … 15 35 16 36 void AbstractLoginAccount::setPassword(const QString& password) { 17 password_ = password; 37 SET_IF_DIFFERENT(password_, password); 38 emit accountEvents()->dataChanged(); 18 39 } 19 40 20 41 21 42 22 void AbstractLoginAccount::setLoggedIn(bool loggedIn) { 23 loggedIn_ = loggedIn; 43 void AbstractLoginAccount::setLoggedIn(bool newLoggedIn) { 44 SET_IF_DIFFERENT(loggedIn_, newLoggedIn); 45 (loggedIn_) ? emit accountEvents()->loggedIn() : emit accountEvents()->loggedOut(); 24 46 } 25 47 … … 52 74 } catch (...) { 53 75 setLoggedIn(false); 76 throw; 54 77 } 55 78 } -
lib/libgateway/src/business/AbstractLoginAccount.h
r41 r43 17 17 18 18 public: 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); 28 20 29 21 virtual QString username() const; … … 38 30 virtual void logout(bool FORCE = false); 39 31 32 LoginAccountEventMapper* eventMapper() const; 33 40 34 protected: 41 35 /* ILoginAccount */ 42 virtual void setLoggedIn(bool loggedIn);36 virtual void setLoggedIn(bool newLoggedIn); 43 37 44 38 virtual void doLogin() =0; … … 46 40 virtual bool stillLoggedIn() =0; 47 41 42 virtual ILoginAccountEvents* accountEvents() const; 43 48 44 private: 45 LoginAccountEventMapper* eventMapper_; 46 49 47 QString username_; 50 48 QString password_; -
lib/libgateway/src/business/validation/BCLoginAccountValidator.cpp
r41 r43 17 17 18 18 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.")); 20 20 } 21 21 22 22 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.")); 24 24 } 25 25 -
lib/libgateway/src/persistence/AbstractAccountStorageOfficer.cpp
r41 r43 1 1 #include "AbstractAccountStorageOfficer.h" 2 2 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> 6 7 7 8 #include <typeconvert.h> … … 9 10 10 11 11 AbstractAccountStorageOfficer::AbstractAccountStorageOfficer(IAccount* account, IS QLiteStorage* storage)12 : AbstractS QLiteStorageOfficer(storage)12 AbstractAccountStorageOfficer::AbstractAccountStorageOfficer(IAccount* account, IStorage* storage) 13 : AbstractStorageOfficer(storage) 13 14 , account_(account) 14 15 { 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 } 20 25 } 21 26 22 27 23 28 void 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())); 33 35 } 36 37 account()->setName(query.value(0).toString()); 38 account()->setEnabled(storage()->readBool(getNamespace(), "enabled", true)); 34 39 } 35 40 36 41 void 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()){ 41 48 // Insert 42 49 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 } 48 60 49 61 // 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()); 53 69 }else{ 54 70 // 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 } 59 83 } 60 84 storage()->writeBool(getNamespace(), "enabled", account()->isEnabled()); … … 64 88 storage()->removeValues(getNamespace()); 65 89 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 } 68 96 69 97 account()->setId(-1); // Invalidate … … 73 101 74 102 QString AbstractAccountStorageOfficer::getNamespace() const { 75 return "account_" + to_string(account()->id());103 return "account_" + QString::number(account()->id()); 76 104 } 77 105 -
lib/libgateway/src/persistence/AbstractAccountStorageOfficer.h
r41 r43 12 12 13 13 #include <iaccount.h> 14 #include <persistence/istorage.h> 14 15 15 #include "AbstractS QLiteStorageOfficer.h"16 #include "AbstractStorageOfficer.h" 16 17 17 class AbstractAccountStorageOfficer: public AbstractS QLiteStorageOfficer {18 class AbstractAccountStorageOfficer: public AbstractStorageOfficer { 18 19 Q_OBJECT 19 20 20 21 public: 21 AbstractAccountStorageOfficer(IAccount* account, IS QLiteStorage* storage);22 AbstractAccountStorageOfficer(IAccount* account, IStorage* storage); 22 23 23 24 virtual void readFromStorage(); -
lib/libgateway/src/persistence/AbstractLoginAccountStorageOfficer.h
r41 r43 10 10 11 11 #include <iloginaccount.h> 12 #include <persistence/is qlitestorage.h>12 #include <persistence/istorage.h> 13 13 14 14 #include "AbstractAccountStorageOfficer.h" … … 18 18 19 19 public: 20 AbstractLoginAccountStorageOfficer(ILoginAccount* account, IS QLiteStorage* storage, const QString& encryptionPassword)20 AbstractLoginAccountStorageOfficer(ILoginAccount* account, IStorage* storage, const QString& encryptionPassword) 21 21 : AbstractAccountStorageOfficer(reinterpret_cast<IAccount*>(account), storage) 22 22 , ENCRYPTION_PWD(encryptionPassword) -
lib/libinterfaces/Makefile
r37 r43 1 1 ############################################################################# 2 2 # Makefile for building: libinterfaces.a 3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Sat Nov 21 17:21:11 20093 # Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 19 13:13:22 2010 4 4 # Project: interfaces.pro 5 5 # Template: lib … … 75 75 /usr/share/qt4/mkspecs/features/debug_and_release.prf \ 76 76 /usr/share/qt4/mkspecs/features/default_post.prf \ 77 /usr/share/qt4/mkspecs/features/unix/thread.prf \ 77 78 /usr/share/qt4/mkspecs/features/staticlib.prf \ 78 79 /usr/share/qt4/mkspecs/features/static.prf \ 79 80 /usr/share/qt4/mkspecs/features/warn_on.prf \ 80 81 /usr/share/qt4/mkspecs/features/qt.prf \ 81 /usr/share/qt4/mkspecs/features/unix/thread.prf \82 82 /usr/share/qt4/mkspecs/features/moc.prf \ 83 83 /usr/share/qt4/mkspecs/features/resources.prf \ … … 86 86 /usr/share/qt4/mkspecs/features/lex.prf \ 87 87 /usr/share/qt4/mkspecs/features/include_source_dir.prf \ 88 /usr/lib/libQtSql.prl \ 88 89 /usr/lib/libQtGui.prl \ 89 90 /usr/lib/libQtNetwork.prl \ … … 101 102 /usr/share/qt4/mkspecs/features/debug_and_release.prf: 102 103 /usr/share/qt4/mkspecs/features/default_post.prf: 104 /usr/share/qt4/mkspecs/features/unix/thread.prf: 103 105 /usr/share/qt4/mkspecs/features/staticlib.prf: 104 106 /usr/share/qt4/mkspecs/features/static.prf: 105 107 /usr/share/qt4/mkspecs/features/warn_on.prf: 106 108 /usr/share/qt4/mkspecs/features/qt.prf: 107 /usr/share/qt4/mkspecs/features/unix/thread.prf:108 109 /usr/share/qt4/mkspecs/features/moc.prf: 109 110 /usr/share/qt4/mkspecs/features/resources.prf: … … 112 113 /usr/share/qt4/mkspecs/features/lex.prf: 113 114 /usr/share/qt4/mkspecs/features/include_source_dir.prf: 115 /usr/lib/libQtSql.prl: 114 116 /usr/lib/libQtGui.prl: 115 117 /usr/lib/libQtNetwork.prl: -
lib/libinterfaces/Makefile.Debug
r37 r43 1 1 ############################################################################# 2 2 # Makefile for building: libinterfaces.a 3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Sat Nov 21 17:21:11 20093 # Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 19 13:13:22 2010 4 4 # Project: interfaces.pro 5 5 # Template: lib … … 10 10 CC = gcc 11 11 CXX = g++ 12 DEFINES = -DQT_ GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED13 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-Idebug12 DEFINES = -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED 13 CFLAGS = -pipe -g -D_REENTRANT -fPIC -Wall -W $(DEFINES) 14 CXXFLAGS = -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/QtSql -I/usr/include/qt4 -Iapp -Idebug 16 16 AR = ar cqs 17 17 RANLIB = … … 41 41 SOURCES = src/business/iaccount.cpp \ 42 42 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 45 48 OBJECTS = debug/iaccount.o \ 46 49 debug/iloginaccount.o \ 47 50 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 49 56 DIST = /usr/share/qt4/mkspecs/common/g++.conf \ 50 57 /usr/share/qt4/mkspecs/common/unix.conf \ … … 59 66 /usr/share/qt4/mkspecs/features/default_post.prf \ 60 67 /usr/share/qt4/mkspecs/features/build_pass.prf \ 68 /usr/share/qt4/mkspecs/features/unix/thread.prf \ 61 69 /usr/share/qt4/mkspecs/features/staticlib.prf \ 62 70 /usr/share/qt4/mkspecs/features/static.prf \ 63 71 /usr/share/qt4/mkspecs/features/warn_on.prf \ 64 72 /usr/share/qt4/mkspecs/features/qt.prf \ 65 /usr/share/qt4/mkspecs/features/unix/thread.prf \66 73 /usr/share/qt4/mkspecs/features/moc.prf \ 67 74 /usr/share/qt4/mkspecs/features/resources.prf \ … … 114 121 dist: 115 122 @$(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/is hortcut.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.0123 $(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 117 124 118 125 … … 133 140 mocables: compiler_moc_header_make_all compiler_moc_source_make_all 134 141 135 compiler_moc_header_make_all: 142 compiler_moc_header_make_all: debug/moc_accounteventmapper.cpp debug/moc_loginaccounteventmapper.cpp debug/moc_groupeventmapper.cpp debug/moc_contacteventmapper.cpp debug/moc_iaccountsettingswidget.cpp 136 143 compiler_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 145 debug/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 165 debug/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 188 debug/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 197 debug/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 204 debug/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 137 224 compiler_rcc_make_all: 138 225 compiler_rcc_clean: … … 150 237 compiler_lex_make_all: 151 238 compiler_lex_clean: 152 compiler_clean: 239 compiler_clean: compiler_moc_header_clean 153 240 154 241 ####### Compile … … 161 248 src/business/ibinary.h \ 162 249 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 169 260 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/iaccount.o src/business/iaccount.cpp 170 261 … … 177 268 src/business/ibinary.h \ 178 269 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 186 282 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/iloginaccount.o src/business/iloginaccount.cpp 187 283 … … 191 287 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/inumber.o src/business/inumber.cpp 192 288 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 289 debug/moc_accounteventmapper.o: debug/moc_accounteventmapper.cpp 290 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_accounteventmapper.o debug/moc_accounteventmapper.cpp 291 292 debug/moc_loginaccounteventmapper.o: debug/moc_loginaccounteventmapper.cpp 293 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_loginaccounteventmapper.o debug/moc_loginaccounteventmapper.cpp 294 295 debug/moc_groupeventmapper.o: debug/moc_groupeventmapper.cpp 296 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_groupeventmapper.o debug/moc_groupeventmapper.cpp 297 298 debug/moc_contacteventmapper.o: debug/moc_contacteventmapper.cpp 299 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_contacteventmapper.o debug/moc_contacteventmapper.cpp 300 301 debug/moc_iaccountsettingswidget.o: debug/moc_iaccountsettingswidget.cpp 302 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_iaccountsettingswidget.o debug/moc_iaccountsettingswidget.cpp 205 303 206 304 ####### Install -
lib/libinterfaces/Makefile.Release
r37 r43 1 1 ############################################################################# 2 2 # Makefile for building: libinterfaces.a 3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Sat Nov 21 17:21:11 20093 # Generated by qmake (2.01a) (Qt 4.5.2) on: Tue Jan 19 13:13:22 2010 4 4 # Project: interfaces.pro 5 5 # Template: lib … … 10 10 CC = gcc 11 11 CXX = g++ 12 DEFINES = -DQT_NO_DEBUG -DQT_ GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED13 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-Irelease12 DEFINES = -DQT_NO_DEBUG -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED 13 CFLAGS = -pipe -O2 -D_REENTRANT -fPIC -Wall -W $(DEFINES) 14 CXXFLAGS = -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/QtSql -I/usr/include/qt4 -Iapp -Irelease 16 16 AR = ar cqs 17 17 RANLIB = … … 41 41 SOURCES = src/business/iaccount.cpp \ 42 42 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 45 48 OBJECTS = release/iaccount.o \ 46 49 release/iloginaccount.o \ 47 50 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 49 56 DIST = /usr/share/qt4/mkspecs/common/g++.conf \ 50 57 /usr/share/qt4/mkspecs/common/unix.conf \ … … 59 66 /usr/share/qt4/mkspecs/features/default_post.prf \ 60 67 /usr/share/qt4/mkspecs/features/build_pass.prf \ 68 /usr/share/qt4/mkspecs/features/unix/thread.prf \ 61 69 /usr/share/qt4/mkspecs/features/staticlib.prf \ 62 70 /usr/share/qt4/mkspecs/features/static.prf \ 63 71 /usr/share/qt4/mkspecs/features/warn_on.prf \ 64 72 /usr/share/qt4/mkspecs/features/qt.prf \ 65 /usr/share/qt4/mkspecs/features/unix/thread.prf \66 73 /usr/share/qt4/mkspecs/features/moc.prf \ 67 74 /usr/share/qt4/mkspecs/features/resources.prf \ … … 114 121 dist: 115 122 @$(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/is hortcut.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.0123 $(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 117 124 118 125 … … 133 140 mocables: compiler_moc_header_make_all compiler_moc_source_make_all 134 141 135 compiler_moc_header_make_all: 142 compiler_moc_header_make_all: release/moc_accounteventmapper.cpp release/moc_loginaccounteventmapper.cpp release/moc_groupeventmapper.cpp release/moc_contacteventmapper.cpp release/moc_iaccountsettingswidget.cpp 136 143 compiler_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 145 release/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 165 release/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 188 release/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 197 release/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 204 release/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 137 224 compiler_rcc_make_all: 138 225 compiler_rcc_clean: … … 150 237 compiler_lex_make_all: 151 238 compiler_lex_clean: 152 compiler_clean: 239 compiler_clean: compiler_moc_header_clean 153 240 154 241 ####### Compile … … 161 248 src/business/ibinary.h \ 162 249 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 169 260 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/iaccount.o src/business/iaccount.cpp 170 261 … … 177 268 src/business/ibinary.h \ 178 269 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 186 282 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/iloginaccount.o src/business/iloginaccount.cpp 187 283 … … 191 287 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/inumber.o src/business/inumber.cpp 192 288 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 289 release/moc_accounteventmapper.o: release/moc_accounteventmapper.cpp 290 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_accounteventmapper.o release/moc_accounteventmapper.cpp 291 292 release/moc_loginaccounteventmapper.o: release/moc_loginaccounteventmapper.cpp 293 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_loginaccounteventmapper.o release/moc_loginaccounteventmapper.cpp 294 295 release/moc_groupeventmapper.o: release/moc_groupeventmapper.cpp 296 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_groupeventmapper.o release/moc_groupeventmapper.cpp 297 298 release/moc_contacteventmapper.o: release/moc_contacteventmapper.cpp 299 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_contacteventmapper.o release/moc_contacteventmapper.cpp 300 301 release/moc_iaccountsettingswidget.o: release/moc_iaccountsettingswidget.cpp 302 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_iaccountsettingswidget.o release/moc_iaccountsettingswidget.cpp 205 303 206 304 ####### Install -
lib/libinterfaces/interfaces.pro
r41 r43 7 7 TARGET = interfaces 8 8 QT += core \ 9 network 9 network \ 10 sql 11 LIBS += -L../ 10 12 INCLUDEPATH += app 11 13 HEADERS += src/business/iaccount.h \ … … 20 22 src/business/ilogingateway.h \ 21 23 src/business/inumber.h \ 22 src/business/ishortcut.h \23 24 src/business/istorable.h \ 24 25 src/business/istreamable.h \ … … 26 27 src/business/ivalidator.h \ 27 28 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 \ 28 34 src/business/exceptions/EException.h \ 29 35 src/business/exceptions/EHttpReadException.h \ … … 41 47 src/persistence/igroupmanager.h \ 42 48 src/persistence/isettings.h \ 43 src/persistence/isqlitestorage.h \44 src/persistence/isqlitestorageofficer.h \45 49 src/persistence/istorage.h \ 46 50 src/persistence/istorageofficer.h \ -
lib/libinterfaces/src/business/iaccount.h
r41 r43 11 11 #include <QObject> 12 12 #include <QString> 13 #include <Q List>13 #include <QSet> 14 14 15 15 #include "istorable.h" 16 16 #include "ivalidatable.h" 17 18 class IContact;19 class IGateway;20 17 21 18 namespace Account { … … 30 27 }; 31 28 } 29 30 class IContact; 31 class IGateway; 32 class AccountEventMapper; 32 33 33 34 class IAccount: public IStorable, public IValidatable { … … 56 57 virtual void unInitialize() =0; 57 58 58 virtual void sendSMS(const QString& message, const Q List<IContact*>& recipients) =0;59 virtual void sendSMS(const QString& message, const QSet<IContact*>& recipients) =0; 59 60 virtual bool isSendingCanceled() =0; 60 61 virtual void cancelSMSSending() =0; 61 62 62 63 virtual IAccount* getClonedInstance() const =0; 64 65 virtual AccountEventMapper* eventMapper() const =0; 63 66 64 67 protected: … … 73 76 virtual void uncancelSendingSMS() =0; 74 77 }; 78 Q_DECLARE_INTERFACE(IAccount, 79 "ch.gorrion.smssender.IAccount/1.0") 75 80 76 81 #include "icontact.h" 77 82 #include "igateway.h" 78 79 Q_DECLARE_INTERFACE(IAccount, 80 "ch.gorrion.smssender.IAccount/1.0") 81 83 #include "eventmappers/accounteventmapper.h" 82 84 83 85 #endif /* IACCOUNT_H_ */ -
lib/libinterfaces/src/business/icontact.h
r41 r43 10 10 11 11 #include <QObject> 12 #include <QImage> 12 13 #include <QString> 13 14 #include <QStringList> … … 15 16 #include "iinterface.h" 16 17 17 class IBinary;18 class INumber;18 class SNumber; 19 class ContactEventMapper; 19 20 20 21 class IContact: public IInterface { 21 Q_INTERFACES(I Storable IValidatable)22 Q_INTERFACES(IInterface) 22 23 23 24 public: 24 25 virtual int id() const =0; 25 26 virtual QString name() const =0; 26 virtual INumber*number() const =0;27 virtual SNumber number() const =0; 27 28 virtual QStringList aliases() const =0; 28 virtual IBinary*image() const =0;29 virtual QImage image() const =0; 29 30 30 virtual void setI D(int id)=0;31 virtual void setId(int id)=0; 31 32 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; 34 34 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; 36 38 }; 39 Q_DECLARE_INTERFACE(IContact, 40 "ch.gorrion.smssender.IContact/1.0") 37 41 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" 44 43 45 44 #endif /* ICONTACT_H_ */ -
lib/libinterfaces/src/business/igateway.h
r41 r43 13 13 #include <QList> 14 14 #include <QWidget> 15 #include <QImage> 15 16 16 17 #include "iinterface.h" … … 19 20 class IContact; 20 21 class IAccountSettingsWidget; 21 22 #include "../persistence/istorage.h" 22 class IStorage; 23 23 24 24 class IGateway: public IInterface { … … 27 27 public: 28 28 virtual QString name() const =0; 29 virtual QImage icon() const =0; 30 29 31 virtual IAccount* createAccountInstance() const =0; 30 32 virtual IAccount* createAccountInstance(IStorage* storage) const =0; … … 40 42 }; 41 43 44 Q_DECLARE_INTERFACE(IGateway, 45 "ch.gorrion.smssender.IGateway/1.0") 46 42 47 #include "iaccount.h" 43 48 #include "icontact.h" 44 49 #include "../ui/iaccountsettingswidget.h" 45 46 Q_DECLARE_INTERFACE(IGateway, 47 "ch.gorrion.smssender.IGateway/1.0") 48 50 #include "../persistence/istorage.h" 49 51 50 52 #endif /* IGATEWAY_H_ */ -
lib/libinterfaces/src/business/igroup.h
r41 r43 10 10 11 11 #include <QObject> 12 #include <QImage> 12 13 #include <QString> 13 #include <Q List>14 #include <QSet> 14 15 15 16 #include "iinterface.h" 16 17 17 class IBinary;18 18 class IContact; 19 class GroupEventMapper; 19 20 20 21 class IGroup: public IInterface { 21 Q_INTERFACES(I Storable IValidatable)22 Q_INTERFACES(IInterface) 22 23 23 24 public: 24 virtual int 25 virtual QString 26 virtual IBinary*image() const =0;27 virtual Q List<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; 28 29 29 virtual void setI D(int id)=0;30 virtual void setId(int id)=0; 30 31 virtual void setName(const QString& name)=0; 31 virtual void setImage(const IBinary& image)=0;32 virtual void setImage(const QImage& image)=0; 32 33 // virtual void setContacts(const QSet<int>& contactIds)=0; 33 virtual void setContacts(const Q List<IContact*>& contacts)=0;34 virtual void setContacts(const QSet<IContact*>& contacts)=0; 34 35 35 36 // virtual void addContact(int contactId)=0; … … 37 38 virtual void removeContact(int contactId)=0; 38 39 virtual void removeContact(IContact* contact)=0; 40 41 virtual GroupEventMapper* eventMapper() const =0; 39 42 }; 40 41 #include "ibinary.h"42 #include "icontact.h"43 44 43 Q_DECLARE_INTERFACE(IGroup, 45 44 "ch.gorrion.smssender.IGroup/1.0") 46 45 46 #include "icontact.h" 47 #include "eventmappers/groupeventmapper.h" 48 47 49 #endif /* IGROUP_H_ */ -
lib/libinterfaces/src/business/iinterface.h
r41 r43 18 18 Q_DECLARE_INTERFACE(IInterface, "ch.gorrion.smssender.IInterface/1.0") 19 19 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 20 28 #endif /* IINTERFACE_H_ */ -
lib/libinterfaces/src/business/iloginaccount.h
r41 r43 9 9 #define ILOGINACOUNT_H_ 10 10 11 #include <QObject> 12 #include <QString> 13 11 14 #include "iaccount.h" 12 15 #include "ilogingateway.h" 13 16 14 #include <QObject> 15 #include <QString> 17 #include "eventmappers/loginaccounteventmapper.h" 16 18 17 19 namespace LoginAccount { … … 39 41 virtual void logout(bool FORCE = false) =0; 40 42 43 virtual LoginAccountEventMapper* eventMapper() const =0; 44 41 45 protected: 42 46 virtual void setLoggedIn(bool loggedIn) =0; 43 47 }; 44 45 48 Q_DECLARE_INTERFACE(ILoginAccount, 46 49 "ch.gorrion.smssender.ILoginAccount/1.0") -
lib/libinterfaces/src/business/ilogingateway.h
r41 r43 19 19 virtual bool stayLoggedIn() const =0; 20 20 }; 21 22 21 Q_DECLARE_INTERFACE(ILoginGateway, 23 22 "ch.gorrion.smssender.ILoginGateway/1.0") -
lib/libinterfaces/src/business/inumber.h
r41 r43 9 9 #define INUMBER_H_ 10 10 11 #include "istreamable.h"12 13 11 #include <QObject> 14 12 #include <QString> 13 14 #include "istreamable.h" 15 15 16 16 class INumber: public IStreamable{ … … 32 32 virtual QString error() const =0; 33 33 34 virtual QString toString() const =0; 34 35 virtual QString toString(const QString& format = INumber::IsoFormat) const =0; 36 virtual void fromString(const QString& string) =0; 35 37 }; 36 37 38 Q_DECLARE_INTERFACE(INumber, 38 39 "ch.gorrion.smssender.INumber/1.0") -
lib/libinterfaces/src/persistence/iaccountmanager.h
r41 r43 25 25 virtual void removeAccount(IAccount* account)=0; 26 26 }; 27 28 27 Q_DECLARE_INTERFACE(IAccountManager, 29 28 "ch.gorrion.smssender.IAccountManager/1.0") -
lib/libinterfaces/src/persistence/icontactmanager.h
r41 r43 10 10 11 11 #include <QObject> 12 #include <Q Map>12 #include <QSet> 13 13 14 14 #include "../business/iinterface.h" … … 19 19 20 20 public: 21 virtual IContact* 22 virtual Q Map<int,IContact*> getContactList()=0;21 virtual IContact* getContact(int contactId)=0; 22 virtual QSet<IContact*> getContactList()=0; 23 23 24 24 virtual void saveContact(IContact* contact)=0; … … 26 26 virtual void removeContact(int contactId)=0; 27 27 }; 28 29 28 Q_DECLARE_INTERFACE(IContactManager, 30 29 "ch.gorrion.smssender.IContactManager/1.0") -
lib/libinterfaces/src/persistence/igroupmanager.h
r41 r43 10 10 11 11 #include <QObject> 12 #include <Q Map>12 #include <QSet> 13 13 14 14 #include "../business/iinterface.h" … … 19 19 20 20 public: 21 virtual IGroup* 22 virtual Q Map<int,IGroup*> getGroupList()=0;21 virtual IGroup* getGroup(int groupId)=0; 22 virtual QSet<IGroup*> getGroupList()=0; 23 23 24 24 virtual void saveGroup(IGroup* group)=0; … … 26 26 virtual void removeGroup(int groupId)=0; 27 27 }; 28 29 28 Q_DECLARE_INTERFACE(IGroupManager, 30 29 "ch.gorrion.smssender.IGroupManager/1.0") -
lib/libinterfaces/src/persistence/isettings.h
r41 r43 15 15 16 16 #include "../business/iinterface.h" 17 #include "../business/ishortcut.h" 17 18 class SShortcut; 18 19 19 20 class ISettings: public IInterface{ … … 36 37 virtual QString getProxyPassword()=0; 37 38 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; 42 43 43 44 virtual QString getUpdateUrl()=0; … … 59 60 virtual void setProxyPassword(const QString& password)=0; 60 61 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; 65 66 }; 66 67 67 Q_DECLARE_INTERFACE(ISettings, 68 68 "ch.gorrion.smssender.ISettings/1.0") -
lib/libinterfaces/src/persistence/istorage.h
r41 r43 10 10 11 11 #include <QObject> 12 #include <QMap> 12 #include <QImage> 13 #include <QSet> 13 14 #include <QString> 15 #include <QSqlDatabase> 16 #include <QSqlQuery> 17 #include <QVariant> 14 18 15 19 #include "../business/iinterface.h" … … 17 21 #include "../business/icontact.h" 18 22 #include "../business/igroup.h" 19 #include "../business/ishortcut.h"20 23 24 class SShortcut; 21 25 class IAccount; 22 26 … … 25 29 26 30 public: 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; 28 32 virtual bool readBool(const QString& _namespace, const QString& key, bool defaultValue = false) =0; 29 33 virtual int readInt(const QString& _namespace, const QString& key, int defaultValue = 0) =0; 30 34 virtual QString readString(const QString& _namespace, const QString& key, const QString& defaultValue = "") =0; 31 35 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; 32 37 virtual IContact* readContact(int contactId) =0; 33 38 virtual IGroup* readGroup(int groupId) =0; 34 virtual IShortcut*readShortcut(const QString& key) =0;39 virtual SShortcut readShortcut(const QString& key) =0; 35 40 36 virtual Q Map<int, IContact*>readContactList() =0;37 virtual Q Map<int, IGroup*>readGroupList() =0;41 virtual QSet<IContact*> readContactList() =0; 42 virtual QSet<IGroup*> readGroupList() =0; 38 43 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; 41 45 virtual void writeBool(const QString& _namespace, const QString& key, bool value) =0; 42 46 virtual void writeInt(const QString& _namespace, const QString& key, int value) =0; 43 47 virtual void writeString(const QString& _namespace, const QString& key, const QString& value) =0; 44 48 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; 46 50 virtual void writeContact(IContact* contact) =0; 47 51 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; 49 53 50 54 virtual void removeValue(const QString& _namespace, const QString& key) =0; … … 53 57 virtual void removeContact(int contactId) =0; 54 58 virtual void removeGroup(int groupId) =0; 59 60 virtual QSqlDatabase connection() const =0; 61 virtual QSqlQuery createQuery() const =0; 55 62 }; 56 57 63 Q_DECLARE_INTERFACE(IStorage, 58 64 "ch.gorrion.smssender.IStorage/1.0") -
lib/libinterfaces/src/persistence/istorageofficer.h
r41 r43 23 23 24 24 virtual IStorage* storage() const =0; 25 virtual QString getNamespace() const =0; 25 26 }; 26 27 27 Q_DECLARE_INTERFACE(IStorageOfficer, 28 28 "ch.gorrion.smssender.IStorageOfficer/1.0") -
lib/resource.qrc
r41 r43 1 1 <RCC> 2 2 <qresource prefix="ico"> 3 <file>edit.png</file> 3 4 <file>sms_new.png</file> 4 5 <file>blank.png</file> -
locale/de.ts
r42 r43 3 3 <TS version="2.0" language="de" sourcelanguage="en"> 4 4 <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'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> 5 114 <name>VCAccountList</name> 6 115 <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"/> 13 117 <source>SMSSender</source> 14 118 <translation>SMSSender</translation> 15 119 </message> 16 120 <message> 17 <location filename="../src/ui/VCAccountList/vcaccountlist.cpp" line=" 141"/>121 <location filename="../src/ui/VCAccountList/vcaccountlist.cpp" line="88"/> 18 122 <source>Do you really want to remove this account?</source> 19 123 <translation>Soll dieses Konto wirklich entfernt werden?</translation> … … 28 132 </message> 29 133 <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"/> 36 150 <source>Filter...</source> 37 151 <translation>Filter...</translation> 38 152 </message> 39 153 <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"/> 51 155 <source>Close</source> 52 156 <translation>Schliessen</translation> … … 61 165 </message> 62 166 <message> 63 <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="28 5"/>64 <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="30 2"/>167 <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="284"/> 168 <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="301"/> 65 169 <source>SMSSender</source> 66 170 <translation>SMSSender</translation> 67 171 </message> 68 172 <message> 69 <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="28 6"/>173 <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="285"/> 70 174 <source>Do you really want to remove this contact?</source> 71 175 <translation>Soll dieser Kontakt wirklich gelöscht werden?</translation> 72 176 </message> 73 177 <message> 74 <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="30 3"/>178 <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="302"/> 75 179 <source>Do you really want to remove this group?</source> 76 180 <translation>Soll diese Gruppe wirklich gelöscht werden?</translation> … … 131 235 <name>VCEditAccount</name> 132 236 <message> 133 <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="9 3"/>237 <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="94"/> 134 238 <source>This account name is already in use.</source> 135 239 <translation>Dieser Kontonamen existiert bereits. </translation> 136 240 </message> 137 241 <message> 138 <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="10 3"/>139 <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="10 8"/>242 <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="102"/> 243 <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="107"/> 140 244 <source>SMSSender</source> 141 245 <translation>SMSSender</translation> … … 261 365 <name>VCEditGroup</name> 262 366 <message> 263 <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="6 2"/>367 <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="61"/> 264 368 <source>Change icon</source> 265 369 <translation>Bild ändern</translation> 266 370 </message> 267 371 <message> 268 <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="6 8"/>372 <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="67"/> 269 373 <source>Remove icon</source> 270 374 <translation>Bild entfernen</translation> 271 375 </message> 272 376 <message> 273 <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="10 7"/>377 <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="106"/> 274 378 <source>Images</source> 275 379 <translation>Bilder</translation> 276 380 </message> 277 381 <message> 278 <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="11 4"/>382 <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="113"/> 279 383 <source>Open File</source> 280 384 <translation>Datei öffnen</translation> … … 319 423 <name>VCMain</name> 320 424 <message> 321 <location filename="../src/ui/VCMain/vcmain.cpp" line="2 81"/>425 <location filename="../src/ui/VCMain/vcmain.cpp" line="297"/> 322 426 <source>SMS sent</source> 323 427 <translation>SMS versandt</translation> 324 428 </message> 325 429 <message> 326 <location filename="../src/ui/VCMain/vcmain.cpp" line="2 81"/>430 <location filename="../src/ui/VCMain/vcmain.cpp" line="297"/> 327 431 <source>Your sms has successfully been sent.</source> 328 432 <translation>Die SMS wurde gesendet.</translation> 329 433 </message> 330 434 <message> 331 <location filename="../src/ui/VCMain/vcmain.cpp" line="3 60"/>435 <location filename="../src/ui/VCMain/vcmain.cpp" line="383"/> 332 436 <source>Error occured</source> 333 437 <translation>Fehler aufgetreten</translation> 334 438 </message> 335 439 <message> 336 <location filename="../src/ui/VCMain/vcmain.cpp" line="3 60"/>440 <location filename="../src/ui/VCMain/vcmain.cpp" line="383"/> 337 441 <source>An unknown error has occured!</source> 338 442 <translation>Ein unbekannter Fehler ist aufgetreten!</translation> … … 362 466 </message> 363 467 <message> 364 <location filename="../src/ui/VCMain/vcmain.ui" line="9 8"/>468 <location filename="../src/ui/VCMain/vcmain.ui" line="95"/> 365 469 <source>Add</source> 366 470 <translation>Hinzufügen</translation> 367 471 </message> 368 472 <message> 369 <location filename="../src/ui/VCMain/vcmain.ui" line="11 8"/>473 <location filename="../src/ui/VCMain/vcmain.ui" line="115"/> 370 474 <source>Remove</source> 371 475 <translation>Entfernen</translation> 372 476 </message> 373 477 <message> 374 <location filename="../src/ui/VCMain/vcmain.ui" line="20 4"/>478 <location filename="../src/ui/VCMain/vcmain.ui" line="201"/> 375 479 <source>Send</source> 376 480 <translation>Senden</translation> 377 481 </message> 378 482 <message> 379 <location filename="../src/ui/VCMain/vcmain.ui" line="23 8"/>483 <location filename="../src/ui/VCMain/vcmain.ui" line="235"/> 380 484 <source>&File</source> 381 485 <translation>&Datei</translation> 382 486 </message> 383 487 <message> 384 <location filename="../src/ui/VCMain/vcmain.ui" line="24 5"/>488 <location filename="../src/ui/VCMain/vcmain.ui" line="242"/> 385 489 <source>&Help</source> 386 490 <translation>&Hilfe</translation> 387 491 </message> 388 492 <message> 389 <location filename="../src/ui/VCMain/vcmain.ui" line="2 51"/>493 <location filename="../src/ui/VCMain/vcmain.ui" line="248"/> 390 494 <source>&Edit</source> 391 495 <translation>&Bearbeiten</translation> 392 496 </message> 393 497 <message> 394 <location filename="../src/ui/VCMain/vcmain.ui" line="26 9"/>498 <location filename="../src/ui/VCMain/vcmain.ui" line="266"/> 395 499 <source>&Exit</source> 396 500 <translation>&Beenden</translation> … … 402 506 </message> 403 507 <message> 404 <location filename="../src/ui/VCMain/vcmain.ui" line="2 87"/>508 <location filename="../src/ui/VCMain/vcmain.ui" line="293"/> 405 509 <source>Prefere&nces</source> 406 510 <translation>&Einstellungen</translation> 407 511 </message> 408 512 <message> 409 <location filename="../src/ui/VCMain/vcmain.ui" line=" 296"/>513 <location filename="../src/ui/VCMain/vcmain.ui" line="305"/> 410 514 <source>&Accounts</source> 411 515 <translation>&Konten</translation> 412 516 </message> 413 517 <message> 414 <location filename="../src/ui/VCMain/vcmain.ui" line="3 05"/>518 <location filename="../src/ui/VCMain/vcmain.ui" line="314"/> 415 519 <source>Address &Book</source> 416 520 <translation>&Adressbuch</translation> 417 521 </message> 418 522 <message> 419 <location filename="../src/ui/VCMain/vcmain.ui" line="3 14"/>523 <location filename="../src/ui/VCMain/vcmain.ui" line="323"/> 420 524 <source>&New message</source> 421 525 <translation>&Neue Mitteilung</translation> -
smssender.pro
r42 r43 5 5 TARGET = smssender-bin 6 6 QT += core \ 7 gui 7 gui \ 8 sql 8 9 LIBS += -Llib/ 9 10 LIBS += -ltntdb \ 10 11 -lcrypto++ \ 11 12 -ldatatypes \ 12 -l interfaces \13 -l utils13 -lutils \ 14 -linterfaces 14 15 INCLUDEPATH += app \ 16 src/ui/components \ 15 17 lib/libinterfaces/src/business \ 16 18 lib/libinterfaces/src/exceptions \ 17 19 lib/libinterfaces/src \ 18 20 lib/libdatatypes/src/business \ 21 lib/libdatatypes/src \ 19 22 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 \ 23 HEADERS += 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 \ 25 35 src/ui/VCEditAccount/vceditaccount.h \ 26 36 src/ui/VCAccountList/vcaccountlist.h \ 27 37 src/business/BCAccountLoadThread.h \ 28 38 src/business/BCGatewayManager.h \ 29 src/persistence/storage/DASQLiteAccountListManager.h \30 39 src/persistence/DAAccountManager.h \ 31 40 src/business/BCAccountManager.h \ … … 41 50 src/business/BCContactManager.h \ 42 51 src/business/BusinessFactory.h \ 43 src/persistence/storage/DASQLiteStorage.h \44 52 src/persistence/DAContactManager.h \ 45 53 src/business/BCSettings.h \ … … 47 55 src/ui/VCMain/vcmain.h \ 48 56 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 \ 57 SOURCES += 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 \ 54 68 src/ui/VCEditAccount/vceditaccount.cpp \ 55 69 src/ui/VCAccountList/vcaccountlist.cpp \ 56 70 src/business/BCAccountLoadThread.cpp \ 57 71 src/business/BCGatewayManager.cpp \ 58 src/persistence/storage/DASQLiteAccountListManager.cpp \59 72 src/persistence/DAAccountManager.cpp \ 60 73 src/business/BCAccountManager.cpp \ … … 70 83 src/business/BCContactManager.cpp \ 71 84 src/business/BusinessFactory.cpp \ 72 src/persistence/storage/DASQLiteStorage.cpp \73 85 src/business/BCSettings.cpp \ 74 86 src/persistence/PersistenceFactory.cpp \ -
src/business/BCAccountManager.cpp
r40 r43 15 15 } 16 16 17 void 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 31 void 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 17 44 void BCAccountManager::readAccountsFromStorage() { 18 45 QSet<IAccount*> accountList = PersistenceFactory::instance()->getAccountManager()->getAccountList(); 19 46 20 accountList_.clear(); 47 foreach(IAccount* account, accountList_.values().toSet().subtract(accountList)) { 48 removeAccountFromList(account); 49 } 21 50 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); 26 53 } 27 54 } … … 53 80 54 81 void BCAccountManager::saveAccount(IAccount* account){ 55 accountList_.remove(account->id());56 82 PersistenceFactory::instance()->getAccountManager()->saveAccount(account); 57 a ccountList_.insert(account->id(), account); // Insert the account to the list83 addAccountToList(account); 58 84 } 59 85 60 86 void BCAccountManager::removeAccount(int accountId){ 61 accountList_.remove(accountId); 87 IAccount* account = getAccount(accountId); 88 if (account == NULL) 89 return; 62 90 63 PersistenceFactory::instance()->getAccountManager()->removeAccount(getAccount(accountId)); 91 PersistenceFactory::instance()->getAccountManager()->removeAccount(account); 92 removeAccountFromList(account); 64 93 } 94 95 96 void BCAccountManager::accountIdChanged(int oldId, int newId) { 97 IAccount* account = accountList_.take(oldId); 98 if (account != NULL) 99 accountList_.insert(newId, account); 100 } 101 void 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 9 9 #define BCACCOUNTMANAGER_H_ 10 10 11 #include <QObject> 11 12 #include <QMap> 12 13 #include <QSet> … … 16 17 #include "BCAccountLoadManager.h" 17 18 18 class BCAccountManager { 19 class BCAccountManager: public QObject { 20 Q_OBJECT 21 19 22 public: 20 23 static BCAccountManager* instance(); … … 30 33 virtual void removeAccount(int accountId); 31 34 35 signals: 36 void accountAdded(IAccount* account); 37 void accountUpdated(IAccount* account); 38 void accountRemoved(IAccount* account); 39 32 40 protected: 33 41 BCAccountManager() {}; 34 virtual ~BCAccountManager(){}; 42 virtual ~BCAccountManager() {}; 43 44 protected slots: 45 void accountIdChanged(int oldId, int newId); 46 void accountDataChanged(); 35 47 36 48 private: … … 38 50 39 51 QMap<int, IAccount*> accountList_; 52 53 void addAccountToList(IAccount* account); 54 void removeAccountFromList(IAccount* account); 40 55 }; 41 56 -
src/business/BCContactManager.cpp
r40 r43 16 16 17 17 BCContactManager::BCContactManager(){ 18 contactList_ = PersistenceFactory::instance()->getContactManager()->getContactList(); 18 readContactsFromStorage(); 19 } 20 21 22 void 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 36 void 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 49 void 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 } 19 59 } 20 60 … … 23 63 } 24 64 25 Q List<IContact*> BCContactManager::getContactList(){26 return contactList_.values() ;65 QSet<IContact*> BCContactManager::getContactList(){ 66 return contactList_.values().toSet(); 27 67 } 28 68 29 69 void BCContactManager::saveContact(IContact* contact){ 30 70 PersistenceFactory::instance()->getContactManager()->saveContact(contact); 31 contactList_[contact->id()] = contact; // Insert the contact to the list71 addContactToList(contact); 32 72 } 33 73 34 74 void 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 35 82 // TODO: Remove contact from contact groups -> (remove empty contact groups?) 83 } 36 84 37 contactList_.erase(contactList_.find(contactId)); 38 PersistenceFactory::instance()->getContactManager()->removeContact(contactId); 85 void BCContactManager::contactIdChanged(int oldId, int newId) { 86 IContact* contact = contactList_.take(oldId); 87 if (contact != NULL) 88 contactList_.insert(newId, contact); 39 89 } 90 void 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 9 9 #define CONTACTMANAGER_H_ 10 10 11 #include <QObject> 11 12 #include <QMap> 12 #include <Q List>13 #include <QSet> 13 14 14 15 #include <icontact.h> 15 16 16 class BCContactManager { 17 class BCContactManager: public QObject { 18 Q_OBJECT 19 17 20 public: 18 21 static BCContactManager* instance(); 19 22 20 23 virtual IContact* getContact(int contactId); 21 virtual Q List<IContact*>getContactList();24 virtual QSet<IContact*> getContactList(); 22 25 virtual void saveContact(IContact* contact); 23 26 virtual void removeContact(int contactId); 27 28 signals: 29 void contactAdded(IContact* contact); 30 void contactUpdated(IContact* contact); 31 void contactRemoved(IContact* contact); 24 32 25 33 protected: … … 27 35 virtual ~BCContactManager(){}; 28 36 37 virtual void readContactsFromStorage(); 38 39 protected slots: 40 void contactIdChanged(int oldId, int newId); 41 void contactDataChanged(); 42 29 43 private: 30 44 static BCContactManager* instance_; 31 45 32 QMap<int, IContact*> contactList_; 46 QMap<int, IContact*> contactList_; 47 48 void addContactToList(IContact* contact); 49 void removeContactFromList(IContact* contact); 33 50 }; 34 51 -
src/business/BCGroupManager.cpp
r40 r43 16 16 17 17 BCGroupManager::BCGroupManager(){ 18 groupList_ = PersistenceFactory::instance()->getGroupManager()->getGroupList();18 readGroupsFromStorage(); 19 19 } 20 21 void 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 35 void 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 48 void 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 20 60 21 61 IGroup* BCGroupManager::getGroup(int groupId){ … … 23 63 } 24 64 25 Q List<IGroup*> BCGroupManager::getGroupList(){26 return groupList_.values() ;65 QSet<IGroup*> BCGroupManager::getGroupList(){ 66 return groupList_.values().toSet(); 27 67 } 28 68 29 69 void BCGroupManager::saveGroup(IGroup* group){ 30 70 PersistenceFactory::instance()->getGroupManager()->saveGroup(group); 31 groupList_[group->id()] = group; // Insert the group to the list71 addGroupToList(group); 32 72 } 33 73 34 74 void 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); 37 81 } 82 83 84 void BCGroupManager::groupIdChanged(int oldId, int newId) { 85 IGroup* group = groupList_.take(oldId); 86 if (group != NULL) 87 groupList_.insert(newId, group); 88 } 89 void 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 9 9 #define BCGROUPMANAGER_H_ 10 10 11 #include <QObject> 11 12 #include <QList> 12 13 #include <QMap> … … 14 15 #include <igroup.h> 15 16 16 class BCGroupManager { 17 class BCGroupManager: public QObject { 18 Q_OBJECT 19 17 20 public: 18 21 static BCGroupManager* instance(); 19 22 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 28 signals: 29 void groupAdded(IGroup* group); 30 void groupUpdated(IGroup* group); 31 void groupRemoved(IGroup* group); 32 33 protected slots: 34 void groupIdChanged(int oldId, int newId); 35 void groupDataChanged(); 24 36 25 37 protected: … … 27 39 virtual ~BCGroupManager(){}; 28 40 41 virtual void readGroupsFromStorage(); 42 29 43 private: 30 44 static BCGroupManager* instance_; 31 45 32 QMap<int, IGroup*> groupList_; 46 QMap<int, IGroup*> groupList_; 47 48 void addGroupToList(IGroup* group); 49 void removeGroupFromList(IGroup* group); 33 50 }; 34 51 -
src/business/BCSettings.cpp
r40 r43 95 95 96 96 97 IShortcut*BCSettings::getNewMessageShortCut(){97 SShortcut BCSettings::getNewMessageShortCut(){ 98 98 return getSettings()->getNewMessageShortCut(); 99 99 } 100 100 101 IShortcut*BCSettings::getClearMessageTextShortCut(){101 SShortcut BCSettings::getClearMessageTextShortCut(){ 102 102 return getSettings()->getClearMessageTextShortCut(); 103 103 } 104 104 105 IShortcut*BCSettings::getClearRecipientsShortCut(){105 SShortcut BCSettings::getClearRecipientsShortCut(){ 106 106 return getSettings()->getClearRecipientsShortCut(); 107 107 } 108 108 109 IShortcut*BCSettings::getSendShortCut(){109 SShortcut BCSettings::getSendShortCut(){ 110 110 return getSettings()->getSendShortCut(); 111 111 } … … 172 172 173 173 174 void BCSettings::setNewMessageShortCut( IShortcut*shortcut){174 void BCSettings::setNewMessageShortCut(const SShortcut& shortcut){ 175 175 return getSettings()->setNewMessageShortCut(shortcut); 176 176 } 177 177 178 void BCSettings::setClearMessageTextShortCut( IShortcut*shortcut){178 void BCSettings::setClearMessageTextShortCut(const SShortcut& shortcut){ 179 179 return getSettings()->setClearMessageTextShortCut(shortcut); 180 180 } 181 181 182 void BCSettings::setClearRecipientsShortCut( IShortcut*shortcut){182 void BCSettings::setClearRecipientsShortCut(const SShortcut& shortcut){ 183 183 return getSettings()->setClearRecipientsShortCut(shortcut); 184 184 } 185 185 186 void BCSettings::setSendShortCut( IShortcut*shortcut){186 void BCSettings::setSendShortCut(const SShortcut& shortcut){ 187 187 return getSettings()->setSendShortCut(shortcut); 188 188 } -
src/business/BCSettings.h
r40 r43 11 11 #include <persistence/isettings.h> 12 12 #include <iaccount.h> 13 #include < ishortcut.h>13 #include <sshortcut.h> 14 14 15 15 class BCSettings { … … 17 17 static BCSettings * instance(); 18 18 19 virtualconst QString getLocalePath();20 virtualQLocale getLocale();21 virtualQList<QLocale> getLocales();19 const QString getLocalePath(); 20 QLocale getLocale(); 21 QList<QLocale> getLocales(); 22 22 23 virtualbool getCheckForUpdates();24 virtualbool getAddSuffix();25 virtualQString getSMSSuffix();26 virtualQString getActiveAccountId();27 virtualbool getShowSentConfirmation();23 bool getCheckForUpdates(); 24 bool getAddSuffix(); 25 QString getSMSSuffix(); 26 QString getActiveAccountId(); 27 bool getShowSentConfirmation(); 28 28 29 virtualbool isProxyEnabled();30 virtualQString getProxyHost();31 virtualint getProxyPort();32 virtualbool isProxyAuthEnabled();33 virtualQString getProxyUsername();34 virtualQString getProxyPassword();29 bool isProxyEnabled(); 30 QString getProxyHost(); 31 int getProxyPort(); 32 bool isProxyAuthEnabled(); 33 QString getProxyUsername(); 34 QString getProxyPassword(); 35 35 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(); 40 40 41 virtualQString getUpdateUrl();41 QString getUpdateUrl(); 42 42 43 virtualQString getSettingsPath();43 QString getSettingsPath(); 44 44 45 45 46 v irtual void setLocale(const QLocale& locale);46 void setLocale(const QLocale& locale); 47 47 48 v irtual void setCheckForUpdates(bool checkForUpdates);49 v irtual void setAddSuffix(bool addSuffix);50 v irtual void setSMSSuffix(const QString& smsSuffix);51 v irtual void setActiveAccountId(const QString& accountId);52 v irtual 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); 53 53 54 v irtual void setProxyEnabled(bool enabled);55 v irtual void setProxyHost(const QString& host);56 v irtual void setProxyPort(int port);57 v irtual void setProxyAuthEnabled(bool enabled);58 v irtual void setProxyUsername(const QString& username);59 v irtual 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); 60 60 61 v irtual void setNewMessageShortCut(IShortcut*shortcut);62 v irtual void setClearMessageTextShortCut(IShortcut*shortcut);63 v irtual void setClearRecipientsShortCut(IShortcut*shortcut);64 v irtual 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); 65 65 66 66 protected: -
src/business/BusinessFactory.cpp
r24 r43 10 10 #include "BCContact.h" 11 11 #include "BCGroup.h" 12 #include "BCShortcut.h"13 12 14 13 BusinessFactory* BusinessFactory::instance_=0; … … 24 23 return new BCGroup; 25 24 } 26 27 IShortcut* BusinessFactory::getShortcutInstance(){28 return new BCShortcut;29 } -
src/business/BusinessFactory.h
r29 r43 11 11 #include <icontact.h> 12 12 #include <igroup.h> 13 #include <ishortcut.h>14 13 15 14 class BusinessFactory { … … 20 19 IContact* getContactInstance(); 21 20 IGroup* getGroupInstance(); 22 IShortcut* getShortcutInstance();23 21 24 22 protected: -
src/persistence/DAAccountManager.cpp
r42 r43 8 8 #include "DAAccountManager.h" 9 9 10 #include "storage/DA SQLiteAccountListManager.h"10 #include "storage/DAAccountListManager.h" 11 11 12 12 DAAccountManager* DAAccountManager::instance_=0; … … 17 17 18 18 IAccount* DAAccountManager::getAccount(int accountId){ 19 return DA SQLiteAccountListManager::instance()->getAccount(accountId);19 return DAAccountListManager::instance()->getAccount(accountId); 20 20 } 21 21 22 22 QSet<IAccount*> DAAccountManager::getAccountList(){ 23 return DA SQLiteAccountListManager::instance()->getAccountList();23 return DAAccountListManager::instance()->getAccountList(); 24 24 } 25 25 -
src/persistence/DAContactManager.cpp
r42 r43 20 20 } 21 21 22 Q Map<int,IContact*> DAContactManager::getContactList(){22 QSet<IContact*> DAContactManager::getContactList(){ 23 23 return getStorage()->readContactList(); 24 24 } … … 31 31 void DAContactManager::removeContact(IContact* contact){ 32 32 getStorage()->removeContact(contact->id()); 33 contact->setI D(-1); // Invalidate the contact33 contact->setId(-1); // Invalidate the contact 34 34 } 35 35 -
src/persistence/DAContactManager.h
r42 r43 21 21 static DAContactManager* instance(); 22 22 23 virtual IContact* 24 virtual Q Map<int,IContact*> getContactList();23 virtual IContact* getContact(int contactId); 24 virtual QSet<IContact*> getContactList(); 25 25 26 26 virtual void saveContact(IContact* contact); -
src/persistence/DAGroupManager.cpp
r42 r43 20 20 } 21 21 22 Q Map<int,IGroup*> DAGroupManager::getGroupList(){22 QSet<IGroup*> DAGroupManager::getGroupList(){ 23 23 return getStorage()->readGroupList(); 24 24 } … … 31 31 void DAGroupManager::removeGroup(IGroup* group){ 32 32 getStorage()->removeGroup(group->id()); 33 group->setI D(-1); // Invalidate the group33 group->setId(-1); // Invalidate the group 34 34 } 35 35 -
src/persistence/DAGroupManager.h
r42 r43 21 21 static DAGroupManager* instance(); 22 22 23 virtual IGroup* 24 virtual Q Map<int,IGroup*> getGroupList();23 virtual IGroup* getGroup(int groupId); 24 virtual QSet<IGroup*> getGroupList(); 25 25 26 26 virtual void saveGroup(IGroup* group); -
src/persistence/DASettings.cpp
r42 r43 66 66 } 67 67 68 IShortcut*DASettings::getNewMessageShortCut(){68 SShortcut DASettings::getNewMessageShortCut(){ 69 69 return getStorage()->readShortcut("newMessage"); 70 70 } 71 71 72 IShortcut*DASettings::getClearMessageTextShortCut(){72 SShortcut DASettings::getClearMessageTextShortCut(){ 73 73 return getStorage()->readShortcut("clearMessageText"); 74 74 } 75 75 76 IShortcut*DASettings::getClearRecipientsShortCut(){76 SShortcut DASettings::getClearRecipientsShortCut(){ 77 77 return getStorage()->readShortcut("clearRecipients"); 78 78 } 79 79 80 IShortcut*DASettings::getSendShortCut(){80 SShortcut DASettings::getSendShortCut(){ 81 81 return getStorage()->readShortcut("sendMessage"); 82 82 }