Changeset 42:63df32d07e95 in SMSSender


Ignore:
Timestamp:
Jan 14, 2010 3:12:17 PM (13 years ago)
Author:
Sämy Zehnder <saemy.zehnder@…>
Branch:
3.0
Convert:
svn:3639001d-8e34-449c-bb86-3782b86c4877/branches/3.0@41
Message:
  • Rearranged util- and data-type-class-files (Created libdatatypes, libutils)
  • Started with translation of SwisscomXtraZone? strings
  • New contactList fetches now names as well as aliases.
  • Segmentationfault in SwisscomXtraZone?-plugin is fixed.
  • Started with account->enabled() stuff.
  • It's not really usable at the moment, but its getting better :)

(Had some conflicts before -> the last commits are connected to this one)

Files:
6 added
1 deleted
56 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r36 r42  
    11#############################################################################
    22# Makefile for building: smssender-bin
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Mon Nov 16 18:21:29 2009
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Thu Jan 14 13:21:33 2010
    44# Project:  smssender.pro
    55# Template: app
     
    77#############################################################################
    88
    9 first: debug
    10 install: debug-install
    11 uninstall: debug-uninstall
     9first: release
     10install: release-install
     11uninstall: release-uninstall
    1212MAKEFILE      = Makefile
    1313QMAKE         = /usr/bin/qmake
     
    2828MKDIR         = mkdir -p
    2929SUBTARGETS    =  \
    30                 debug \
    31                 release
     30                release \
     31                debug
    3232
     33release: $(MAKEFILE).Release FORCE
     34        $(MAKE) -f $(MAKEFILE).Release
     35release-make_default: $(MAKEFILE).Release FORCE
     36        $(MAKE) -f $(MAKEFILE).Release
     37release-make_first: $(MAKEFILE).Release FORCE
     38        $(MAKE) -f $(MAKEFILE).Release first
     39release-all: $(MAKEFILE).Release FORCE
     40        $(MAKE) -f $(MAKEFILE).Release all
     41release-clean: $(MAKEFILE).Release FORCE
     42        $(MAKE) -f $(MAKEFILE).Release clean
     43release-distclean: $(MAKEFILE).Release FORCE
     44        $(MAKE) -f $(MAKEFILE).Release distclean
     45release-install: $(MAKEFILE).Release FORCE
     46        $(MAKE) -f $(MAKEFILE).Release install
     47release-uninstall: $(MAKEFILE).Release FORCE
     48        $(MAKE) -f $(MAKEFILE).Release uninstall
    3349debug: $(MAKEFILE).Debug FORCE
    3450        $(MAKE) -f $(MAKEFILE).Debug
     
    4763debug-uninstall: $(MAKEFILE).Debug FORCE
    4864        $(MAKE) -f $(MAKEFILE).Debug uninstall
    49 release: $(MAKEFILE).Release FORCE
    50         $(MAKE) -f $(MAKEFILE).Release
    51 release-make_default: $(MAKEFILE).Release FORCE
    52         $(MAKE) -f $(MAKEFILE).Release
    53 release-make_first: $(MAKEFILE).Release FORCE
    54         $(MAKE) -f $(MAKEFILE).Release first
    55 release-all: $(MAKEFILE).Release FORCE
    56         $(MAKE) -f $(MAKEFILE).Release all
    57 release-clean: $(MAKEFILE).Release FORCE
    58         $(MAKE) -f $(MAKEFILE).Release clean
    59 release-distclean: $(MAKEFILE).Release FORCE
    60         $(MAKE) -f $(MAKEFILE).Release distclean
    61 release-install: $(MAKEFILE).Release FORCE
    62         $(MAKE) -f $(MAKEFILE).Release install
    63 release-uninstall: $(MAKEFILE).Release FORCE
    64         $(MAKE) -f $(MAKEFILE).Release uninstall
    6565
    6666Makefile: smssender.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
     
    7272                /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
    7373                /usr/share/qt4/mkspecs/features/default_pre.prf \
    74                 /usr/share/qt4/mkspecs/features/debug.prf \
     74                /usr/share/qt4/mkspecs/features/release.prf \
    7575                /usr/share/qt4/mkspecs/features/debug_and_release.prf \
    7676                /usr/share/qt4/mkspecs/features/default_post.prf \
     
    9595/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
    9696/usr/share/qt4/mkspecs/features/default_pre.prf:
    97 /usr/share/qt4/mkspecs/features/debug.prf:
     97/usr/share/qt4/mkspecs/features/release.prf:
    9898/usr/share/qt4/mkspecs/features/debug_and_release.prf:
    9999/usr/share/qt4/mkspecs/features/default_post.prf:
     
    114114qmake_all: FORCE
    115115
    116 make_default: debug-make_default release-make_default FORCE
    117 make_first: debug-make_first release-make_first FORCE
    118 all: debug-all release-all FORCE
    119 clean: debug-clean release-clean FORCE
    120 distclean: debug-distclean release-distclean FORCE
     116make_default: release-make_default debug-make_default FORCE
     117make_first: release-make_first debug-make_first FORCE
     118all: release-all debug-all FORCE
     119clean: release-clean debug-clean FORCE
     120distclean: release-distclean debug-distclean FORCE
    121121        -$(DEL_FILE) Makefile
    122122
     123release-mocclean: $(MAKEFILE).Release
     124        $(MAKE) -f $(MAKEFILE).Release mocclean
    123125debug-mocclean: $(MAKEFILE).Debug
    124126        $(MAKE) -f $(MAKEFILE).Debug mocclean
    125 release-mocclean: $(MAKEFILE).Release
    126         $(MAKE) -f $(MAKEFILE).Release mocclean
    127 mocclean: debug-mocclean release-mocclean
     127mocclean: release-mocclean debug-mocclean
    128128
     129release-mocables: $(MAKEFILE).Release
     130        $(MAKE) -f $(MAKEFILE).Release mocables
    129131debug-mocables: $(MAKEFILE).Debug
    130132        $(MAKE) -f $(MAKEFILE).Debug mocables
    131 release-mocables: $(MAKEFILE).Release
    132         $(MAKE) -f $(MAKEFILE).Release mocables
    133 mocables: debug-mocables release-mocables
     133mocables: release-mocables debug-mocables
    134134FORCE:
    135135
     136$(MAKEFILE).Release: Makefile
    136137$(MAKEFILE).Debug: Makefile
    137 $(MAKEFILE).Release: Makefile
  • Makefile.Debug

    r36 r42  
    11#############################################################################
    22# Makefile for building: smssender-bin
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Mon Nov 16 18:21:29 2009
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Thu Jan 14 13:21:33 2010
    44# Project:  smssender.pro
    55# Template: app
     
    1313CFLAGS        = -pipe -g -D_REENTRANT -Wall -W $(DEFINES)
    1414CXXFLAGS      = -pipe -g -D_REENTRANT -Wall -W $(DEFINES)
    15 INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -Iapp -Ilib/libinterfaces/src/business -Ilib/libinterfaces/src -Idebug -I.
     15INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -Iapp -Ilib/libinterfaces/src/business -Ilib/libinterfaces/src/exceptions -Ilib/libinterfaces/src -Ilib/libdatatypes/src/business -Ilib/libutils/src -Idebug -I.
    1616LINK          = g++
    1717LFLAGS        =
    18 LIBS          = $(SUBLIBS)  -L/usr/lib -Llib/ -ltntdb -lcrypto++ -linterfaces -lpthread -lQtGui -lQtCore
     18LIBS          = $(SUBLIBS)  -L/usr/lib -Llib/ -ltntdb -lcrypto++ -ldatatypes -linterfaces -lutils -lpthread -lQtGui -lQtCore
    1919AR            = ar cqs
    2020RANLIB        =
     
    4242####### Files
    4343
    44 SOURCES       = src/ui/VCEditAccount/vceditaccount.cpp \
     44SOURCES       = src/ui/completers/aliascompleter.cpp \
     45                src/ui/completers/AliasModel.cpp \
     46                src/ui/completers/FilteredPopupCompleter.cpp \
     47                src/ui/VCEditAccount/vceditaccount.cpp \
    4548                src/ui/VCAccountList/vcaccountlist.cpp \
    4649                src/business/BCAccountLoadThread.cpp \
     
    5255                src/business/BCLibraryLoader.cpp \
    5356                src/ui/VCEditGroup/vceditgroup.cpp \
    54                 src/business/BCGroup.cpp \
    5557                src/persistence/DAGroupManager.cpp \
    5658                src/business/BCGroupManager.cpp \
    57                 src/utils/strutils.cpp \
    58                 src/business/BCBinary.cpp \
    5959                src/ui/UIHelper.cpp \
    6060                src/ui/VCEditContact/vceditcontact.cpp \
    6161                src/persistence/DASettings.cpp \
    62                 src/business/BCNumber.cpp \
    6362                src/ui/VCAddressBook/vcaddressbook.cpp \
    6463                src/business/BCContactManager.cpp \
    65                 src/business/BCContact.cpp \
    6664                src/business/BusinessFactory.cpp \
    67                 src/business/BCShortcut.cpp \
    6865                src/persistence/storage/DASQLiteStorage.cpp \
    6966                src/business/BCSettings.cpp \
     
    7269                src/main.cpp \
    7370                src/ui/VCMain/vcmain.cpp \
    74                 src/ui/VCSettings/vcsettings.cpp debug/moc_vceditaccount.cpp \
     71                src/ui/VCSettings/vcsettings.cpp debug/moc_aliascompleter.cpp \
     72                debug/moc_vceditaccount.cpp \
    7573                debug/moc_vcaccountlist.cpp \
    7674                debug/moc_BCAccountLoadThread.cpp \
     75                debug/moc_DASQLiteAccountListManager.cpp \
     76                debug/moc_DAAccountManager.cpp \
    7777                debug/moc_BCAccountLoadManager.cpp \
     78                debug/moc_BCLibraryLoader.cpp \
    7879                debug/moc_vceditgroup.cpp \
     80                debug/moc_DAGroupManager.cpp \
    7981                debug/moc_vceditcontact.cpp \
     82                debug/moc_DASettings.cpp \
    8083                debug/moc_vcaddressbook.cpp \
     84                debug/moc_DASQLiteStorage.cpp \
     85                debug/moc_DAContactManager.cpp \
     86                debug/moc_PersistenceFactory.cpp \
    8187                debug/moc_vcmain.cpp \
    8288                debug/moc_vcsettings.cpp \
    8389                debug/qrc_resource.cpp
    84 OBJECTS       = debug/vceditaccount.o \
     90OBJECTS       = debug/aliascompleter.o \
     91                debug/AliasModel.o \
     92                debug/FilteredPopupCompleter.o \
     93                debug/vceditaccount.o \
    8594                debug/vcaccountlist.o \
    8695                debug/BCAccountLoadThread.o \
     
    92101                debug/BCLibraryLoader.o \
    93102                debug/vceditgroup.o \
    94                 debug/BCGroup.o \
    95103                debug/DAGroupManager.o \
    96104                debug/BCGroupManager.o \
    97                 debug/strutils.o \
    98                 debug/BCBinary.o \
    99105                debug/UIHelper.o \
    100106                debug/vceditcontact.o \
    101107                debug/DASettings.o \
    102                 debug/BCNumber.o \
    103108                debug/vcaddressbook.o \
    104109                debug/BCContactManager.o \
    105                 debug/BCContact.o \
    106110                debug/BusinessFactory.o \
    107                 debug/BCShortcut.o \
    108111                debug/DASQLiteStorage.o \
    109112                debug/BCSettings.o \
     
    113116                debug/vcmain.o \
    114117                debug/vcsettings.o \
     118                debug/moc_aliascompleter.o \
    115119                debug/moc_vceditaccount.o \
    116120                debug/moc_vcaccountlist.o \
    117121                debug/moc_BCAccountLoadThread.o \
     122                debug/moc_DASQLiteAccountListManager.o \
     123                debug/moc_DAAccountManager.o \
    118124                debug/moc_BCAccountLoadManager.o \
     125                debug/moc_BCLibraryLoader.o \
    119126                debug/moc_vceditgroup.o \
     127                debug/moc_DAGroupManager.o \
    120128                debug/moc_vceditcontact.o \
     129                debug/moc_DASettings.o \
    121130                debug/moc_vcaddressbook.o \
     131                debug/moc_DASQLiteStorage.o \
     132                debug/moc_DAContactManager.o \
     133                debug/moc_PersistenceFactory.o \
    122134                debug/moc_vcmain.o \
    123135                debug/moc_vcsettings.o \
     
    181193dist:
    182194        @$(CHK_DIR_EXISTS) debug/smssender-bin3.0.0 || $(MKDIR) debug/smssender-bin3.0.0
    183         $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents 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/business/BCGroup.h src/persistence/DAGroupManager.h src/business/BCGroupManager.h src/business/BCBinary.h src/ui/UIHelper.h src/ui/VCEditContact/vceditcontact.h src/persistence/DASettings.h src/utils/strutils.h src/business/BCNumber.h src/ui/VCAddressBook/vcaddressbook.h src/utils/typeconvert.h src/business/BCContactManager.h src/business/BCContact.h src/business/BusinessFactory.h src/business/BCShortcut.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 src/exceptions/LibraryExceptions.h src/exceptions/HttpExceptions.h src/exceptions/StdExceptions.h src/exceptions/StorageExceptions.h debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents lib/resource.qrc debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents 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/business/BCGroup.cpp src/persistence/DAGroupManager.cpp src/business/BCGroupManager.cpp src/utils/strutils.cpp src/business/BCBinary.cpp src/ui/UIHelper.cpp src/ui/VCEditContact/vceditcontact.cpp src/persistence/DASettings.cpp src/business/BCNumber.cpp src/ui/VCAddressBook/vcaddressbook.cpp src/business/BCContactManager.cpp src/business/BCContact.cpp src/business/BusinessFactory.cpp src/business/BCShortcut.cpp src/persistence/storage/DASQLiteStorage.cpp src/business/BCSettings.cpp src/persistence/PersistenceFactory.cpp src/persistence/DAContactManager.cpp src/main.cpp src/ui/VCMain/vcmain.cpp src/ui/VCSettings/vcsettings.cpp debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/ui/VCEditAccount/vceditaccount.ui src/ui/VCAccountList/vcaccountlist.ui src/ui/VCEditGroup/vceditgroup.ui src/ui/VCEditContact/vceditcontact.ui src/ui/VCAddressBook/vcaddressbook.ui src/ui/VCMain/vcmain.ui src/ui/VCSettings/vcsettings.ui debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents locale/de.ts debug/smssender-bin3.0.0/ && (cd `dirname debug/smssender-bin3.0.0` && $(TAR) smssender-bin3.0.0.tar smssender-bin3.0.0 && $(COMPRESS) smssender-bin3.0.0.tar) && $(MOVE) `dirname debug/smssender-bin3.0.0`/smssender-bin3.0.0.tar.gz . && $(DEL_FILE) -r debug/smssender-bin3.0.0
     195        $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/ui/completers/aliascompleter.h src/ui/completers/AliasModel.h src/ui/completers/FilteredPopupCompleter.h src/ui/VCEditAccount/vceditaccount.h src/ui/VCAccountList/vcaccountlist.h src/business/BCAccountLoadThread.h src/business/BCGatewayManager.h src/persistence/storage/DASQLiteAccountListManager.h src/persistence/DAAccountManager.h src/business/BCAccountManager.h src/business/BCAccountLoadManager.h src/business/BCLibraryLoader.h src/ui/VCEditGroup/vceditgroup.h src/persistence/DAGroupManager.h src/business/BCGroupManager.h src/ui/UIHelper.h src/ui/VCEditContact/vceditcontact.h src/persistence/DASettings.h src/ui/VCAddressBook/vcaddressbook.h src/business/BCContactManager.h src/business/BusinessFactory.h src/persistence/storage/DASQLiteStorage.h src/persistence/DAContactManager.h src/business/BCSettings.h src/persistence/PersistenceFactory.h src/ui/VCMain/vcmain.h src/ui/VCSettings/vcsettings.h debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents lib/resource.qrc debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/ui/completers/aliascompleter.cpp src/ui/completers/AliasModel.cpp src/ui/completers/FilteredPopupCompleter.cpp src/ui/VCEditAccount/vceditaccount.cpp src/ui/VCAccountList/vcaccountlist.cpp src/business/BCAccountLoadThread.cpp src/business/BCGatewayManager.cpp src/persistence/storage/DASQLiteAccountListManager.cpp src/persistence/DAAccountManager.cpp src/business/BCAccountManager.cpp src/business/BCAccountLoadManager.cpp src/business/BCLibraryLoader.cpp src/ui/VCEditGroup/vceditgroup.cpp src/persistence/DAGroupManager.cpp src/business/BCGroupManager.cpp src/ui/UIHelper.cpp src/ui/VCEditContact/vceditcontact.cpp src/persistence/DASettings.cpp src/ui/VCAddressBook/vcaddressbook.cpp src/business/BCContactManager.cpp src/business/BusinessFactory.cpp src/persistence/storage/DASQLiteStorage.cpp src/business/BCSettings.cpp src/persistence/PersistenceFactory.cpp src/persistence/DAContactManager.cpp src/main.cpp src/ui/VCMain/vcmain.cpp src/ui/VCSettings/vcsettings.cpp debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/ui/VCEditAccount/vceditaccount.ui src/ui/VCAccountList/vcaccountlist.ui src/ui/VCEditGroup/vceditgroup.ui src/ui/VCEditContact/vceditcontact.ui src/ui/VCAddressBook/vcaddressbook.ui src/ui/VCMain/vcmain.ui src/ui/VCSettings/vcsettings.ui debug/smssender-bin3.0.0/ && $(COPY_FILE) --parents locale/de.ts debug/smssender-bin3.0.0/ && (cd `dirname debug/smssender-bin3.0.0` && $(TAR) smssender-bin3.0.0.tar smssender-bin3.0.0 && $(COMPRESS) smssender-bin3.0.0.tar) && $(MOVE) `dirname debug/smssender-bin3.0.0`/smssender-bin3.0.0.tar.gz . && $(DEL_FILE) -r debug/smssender-bin3.0.0
    184196
    185197
     
    200212mocables: compiler_moc_header_make_all compiler_moc_source_make_all
    201213
    202 compiler_moc_header_make_all: debug/moc_vceditaccount.cpp debug/moc_vcaccountlist.cpp debug/moc_BCAccountLoadThread.cpp debug/moc_BCAccountLoadManager.cpp debug/moc_vceditgroup.cpp debug/moc_vceditcontact.cpp debug/moc_vcaddressbook.cpp debug/moc_vcmain.cpp debug/moc_vcsettings.cpp
     214compiler_moc_header_make_all: debug/moc_aliascompleter.cpp debug/moc_vceditaccount.cpp debug/moc_vcaccountlist.cpp debug/moc_BCAccountLoadThread.cpp debug/moc_DASQLiteAccountListManager.cpp debug/moc_DAAccountManager.cpp debug/moc_BCAccountLoadManager.cpp debug/moc_BCLibraryLoader.cpp debug/moc_vceditgroup.cpp debug/moc_DAGroupManager.cpp debug/moc_vceditcontact.cpp debug/moc_DASettings.cpp debug/moc_vcaddressbook.cpp debug/moc_DASQLiteStorage.cpp debug/moc_DAContactManager.cpp debug/moc_PersistenceFactory.cpp debug/moc_vcmain.cpp debug/moc_vcsettings.cpp
    203215compiler_moc_header_clean:
    204         -$(DEL_FILE) debug/moc_vceditaccount.cpp debug/moc_vcaccountlist.cpp debug/moc_BCAccountLoadThread.cpp debug/moc_BCAccountLoadManager.cpp debug/moc_vceditgroup.cpp debug/moc_vceditcontact.cpp debug/moc_vcaddressbook.cpp debug/moc_vcmain.cpp debug/moc_vcsettings.cpp
     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
     217debug/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
     219
    205220debug/moc_vceditaccount.cpp: ui_vceditaccount.h \
    206221                src/ui/VCEditAccount/vceditaccount.h
     
    211226        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCAccountList/vcaccountlist.h -o debug/moc_vcaccountlist.cpp
    212227
    213 debug/moc_BCAccountLoadThread.cpp: src/exceptions/StdExceptions.h \
    214                 src/business/BCAccountLoadThread.h
     228debug/moc_BCAccountLoadThread.cpp: src/business/BCAccountLoadThread.h
    215229        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCAccountLoadThread.h -o debug/moc_BCAccountLoadThread.cpp
    216230
     231debug/moc_DASQLiteAccountListManager.cpp: src/persistence/storage/DASQLiteAccountListManager.h
     232        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/storage/DASQLiteAccountListManager.h -o debug/moc_DASQLiteAccountListManager.cpp
     233
     234debug/moc_DAAccountManager.cpp: src/persistence/DAAccountManager.h
     235        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DAAccountManager.h -o debug/moc_DAAccountManager.cpp
     236
    217237debug/moc_BCAccountLoadManager.cpp: src/business/BCAccountLoadThread.h \
    218                 src/exceptions/StdExceptions.h \
    219238                src/business/BCAccountLoadManager.h
    220239        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCAccountLoadManager.h -o debug/moc_BCAccountLoadManager.cpp
     240
     241debug/moc_BCLibraryLoader.cpp: src/business/BCLibraryLoader.h
     242        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCLibraryLoader.h -o debug/moc_BCLibraryLoader.cpp
    221243
    222244debug/moc_vceditgroup.cpp: ui_vceditgroup.h \
     
    224246        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCEditGroup/vceditgroup.h -o debug/moc_vceditgroup.cpp
    225247
     248debug/moc_DAGroupManager.cpp: src/persistence/DAGroupManager.h
     249        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DAGroupManager.h -o debug/moc_DAGroupManager.cpp
     250
    226251debug/moc_vceditcontact.cpp: ui_vceditcontact.h \
    227252                src/ui/VCEditContact/vceditcontact.h
    228253        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCEditContact/vceditcontact.h -o debug/moc_vceditcontact.cpp
    229254
     255debug/moc_DASettings.cpp: src/persistence/DASettings.h
     256        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DASettings.h -o debug/moc_DASettings.cpp
     257
    230258debug/moc_vcaddressbook.cpp: ui_vcaddressbook.h \
    231259                src/ui/VCAddressBook/vcaddressbook.h
    232260        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCAddressBook/vcaddressbook.h -o debug/moc_vcaddressbook.cpp
    233261
     262debug/moc_DASQLiteStorage.cpp: src/persistence/storage/DASQLiteStorage.h
     263        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/storage/DASQLiteStorage.h -o debug/moc_DASQLiteStorage.cpp
     264
     265debug/moc_DAContactManager.cpp: src/persistence/DAContactManager.h
     266        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DAContactManager.h -o debug/moc_DAContactManager.cpp
     267
     268debug/moc_PersistenceFactory.cpp: src/persistence/PersistenceFactory.h
     269        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/PersistenceFactory.h -o debug/moc_PersistenceFactory.cpp
     270
    234271debug/moc_vcmain.cpp: src/business/BCAccountLoadManager.h \
    235272                src/business/BCAccountLoadThread.h \
    236                 src/exceptions/StdExceptions.h \
     273                src/ui/completers/AliasModel.h \
    237274                ui_vcmain.h \
    238275                src/ui/VCMain/vcmain.h
     
    264301                lib/heart.png \
    265302                lib/client_network.png \
     303                lib/sms_new.png \
    266304                lib/exit.png \
    267305                lib/close_cancel.png \
     
    308346####### Compile
    309347
     348debug/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
     351debug/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
     354debug/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
     356
    310357debug/vceditaccount.o: src/ui/VCEditAccount/vceditaccount.cpp src/ui/VCEditAccount/vceditaccount.h \
    311358                ui_vceditaccount.h \
     359                src/business/BCAccountManager.h \
     360                src/business/BCAccountLoadManager.h \
     361                src/business/BCAccountLoadThread.h \
    312362                src/business/BCGatewayManager.h
    313363        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/vceditaccount.o src/ui/VCEditAccount/vceditaccount.cpp
     
    321371                src/business/BCAccountLoadManager.h \
    322372                src/business/BCAccountLoadThread.h \
    323                 src/exceptions/StdExceptions.h \
    324                 src/business/BusinessFactory.h \
    325                 src/utils/typeconvert.h
     373                src/business/BusinessFactory.h
    326374        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/vcaccountlist.o src/ui/VCAccountList/vcaccountlist.cpp
    327375
    328 debug/BCAccountLoadThread.o: src/business/BCAccountLoadThread.cpp src/business/BCAccountLoadThread.h \
    329                 src/exceptions/StdExceptions.h
     376debug/BCAccountLoadThread.o: src/business/BCAccountLoadThread.cpp src/business/BCAccountLoadThread.h
    330377        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BCAccountLoadThread.o src/business/BCAccountLoadThread.cpp
    331378
     
    336383debug/DASQLiteAccountListManager.o: src/persistence/storage/DASQLiteAccountListManager.cpp src/persistence/storage/DASQLiteAccountListManager.h \
    337384                src/business/BCGatewayManager.h \
    338                 src/utils/typeconvert.h \
    339                 src/exceptions/StorageExceptions.h \
    340                 src/exceptions/StdExceptions.h \
    341385                src/persistence/storage/DASQLiteStorage.h
    342386        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/DASQLiteAccountListManager.o src/persistence/storage/DASQLiteAccountListManager.cpp
     
    349393                src/business/BCAccountLoadManager.h \
    350394                src/business/BCAccountLoadThread.h \
    351                 src/exceptions/StdExceptions.h \
    352395                src/persistence/PersistenceFactory.h
    353396        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BCAccountManager.o src/business/BCAccountManager.cpp
     
    355398debug/BCAccountLoadManager.o: src/business/BCAccountLoadManager.cpp src/business/BCAccountLoadManager.h \
    356399                src/business/BCAccountLoadThread.h \
    357                 src/exceptions/StdExceptions.h \
    358400                src/business/BCAccountManager.h
    359401        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BCAccountLoadManager.o src/business/BCAccountLoadManager.cpp
    360402
    361 debug/BCLibraryLoader.o: src/business/BCLibraryLoader.cpp src/business/BCLibraryLoader.h \
    362                 src/exceptions/LibraryExceptions.h \
    363                 src/exceptions/StdExceptions.h
     403debug/BCLibraryLoader.o: src/business/BCLibraryLoader.cpp src/business/BCLibraryLoader.h
    364404        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BCLibraryLoader.o src/business/BCLibraryLoader.cpp
    365405
     
    370410        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/vceditgroup.o src/ui/VCEditGroup/vceditgroup.cpp
    371411
    372 debug/BCGroup.o: src/business/BCGroup.cpp src/business/BCGroup.h \
    373                 src/business/BCBinary.h \
    374                 src/business/BCNumber.h \
    375                 src/business/BCContactManager.h
    376         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BCGroup.o src/business/BCGroup.cpp
    377 
    378412debug/DAGroupManager.o: src/persistence/DAGroupManager.cpp src/persistence/DAGroupManager.h \
    379413                src/persistence/PersistenceFactory.h
     
    384418        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BCGroupManager.o src/business/BCGroupManager.cpp
    385419
    386 debug/strutils.o: src/utils/strutils.cpp src/utils/strutils.h
    387         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/strutils.o src/utils/strutils.cpp
    388 
    389 debug/BCBinary.o: src/business/BCBinary.cpp src/business/BCBinary.h
    390         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BCBinary.o src/business/BCBinary.cpp
    391 
    392 debug/UIHelper.o: src/ui/UIHelper.cpp src/ui/UIHelper.h \
    393                 src/business/BCBinary.h
     420debug/UIHelper.o: src/ui/UIHelper.cpp src/ui/UIHelper.h
    394421        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/UIHelper.o src/ui/UIHelper.cpp
    395422
     
    397424                ui_vceditcontact.h \
    398425                src/ui/UIHelper.h \
    399                 src/business/BusinessFactory.h \
    400                 src/utils/typeconvert.h \
    401                 src/utils/strutils.h
     426                src/business/BusinessFactory.h
    402427        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/vceditcontact.o src/ui/VCEditContact/vceditcontact.cpp
    403428
     
    405430                src/persistence/PersistenceFactory.h
    406431        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/DASettings.o src/persistence/DASettings.cpp
    407 
    408 debug/BCNumber.o: src/business/BCNumber.cpp src/business/BCNumber.h \
    409                 src/exceptions/StdExceptions.h \
    410                 src/utils/strutils.h \
    411                 src/utils/typeconvert.h
    412         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BCNumber.o src/business/BCNumber.cpp
    413432
    414433debug/vcaddressbook.o: src/ui/VCAddressBook/vcaddressbook.cpp src/ui/VCAddressBook/vcaddressbook.h \
     
    421440                src/business/BCContactManager.h \
    422441                src/business/BCGroupManager.h \
    423                 src/business/BusinessFactory.h \
    424                 src/utils/typeconvert.h
     442                src/business/BusinessFactory.h
    425443        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/vcaddressbook.o src/ui/VCAddressBook/vcaddressbook.cpp
    426444
     
    429447        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BCContactManager.o src/business/BCContactManager.cpp
    430448
    431 debug/BCContact.o: src/business/BCContact.cpp src/business/BCContact.h \
    432                 src/business/BCBinary.h \
    433                 src/business/BCNumber.h
    434         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BCContact.o src/business/BCContact.cpp
    435 
    436 debug/BusinessFactory.o: src/business/BusinessFactory.cpp src/business/BusinessFactory.h \
    437                 src/business/BCContact.h \
    438                 src/business/BCGroup.h \
    439                 src/business/BCShortcut.h
     449debug/BusinessFactory.o: src/business/BusinessFactory.cpp src/business/BusinessFactory.h
    440450        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BusinessFactory.o src/business/BusinessFactory.cpp
    441451
    442 debug/BCShortcut.o: src/business/BCShortcut.cpp src/business/BCShortcut.h
    443         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BCShortcut.o src/business/BCShortcut.cpp
    444 
    445452debug/DASQLiteStorage.o: src/persistence/storage/DASQLiteStorage.cpp src/persistence/storage/DASQLiteStorage.h \
    446                 src/business/BCContact.h \
    447                 src/business/BCBinary.h \
    448                 src/business/BCGroup.h \
    449453                src/business/BCSettings.h \
    450                 src/business/BCShortcut.h \
    451                 src/exceptions/StdExceptions.h \
    452                 src/exceptions/StorageExceptions.h \
    453                 src/utils/typeconvert.h
     454                src/business/BCContactManager.h
    454455        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/DASQLiteStorage.o src/persistence/storage/DASQLiteStorage.cpp
    455456
     
    473474                src/business/BCAccountLoadManager.h \
    474475                src/business/BCAccountLoadThread.h \
    475                 src/exceptions/StdExceptions.h \
     476                src/ui/completers/AliasModel.h \
    476477                ui_vcmain.h \
    477478                src/business/BCSettings.h \
    478479                src/business/BCAccountManager.h \
    479                 src/business/BCGatewayManager.h
     480                src/business/BCGatewayManager.h \
     481                src/business/BCLibraryLoader.h
    480482        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/main.o src/main.cpp
    481483
     
    483485                src/business/BCAccountLoadManager.h \
    484486                src/business/BCAccountLoadThread.h \
    485                 src/exceptions/StdExceptions.h \
     487                src/ui/completers/AliasModel.h \
    486488                ui_vcmain.h \
    487489                src/business/BCAccountManager.h \
    488490                src/business/BCContactManager.h \
    489491                src/business/BCGroupManager.h \
    490                 src/utils/typeconvert.h \
    491492                src/ui/UIHelper.h \
    492493                src/ui/VCAccountList/vcaccountlist.h \
     
    501502                ui_vcsettings.h \
    502503                src/business/BusinessFactory.h \
    503                 src/business/BCSettings.h \
    504                 src/utils/typeconvert.h \
    505                 src/utils/strutils.h
     504                src/business/BCSettings.h
    506505        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/vcsettings.o src/ui/VCSettings/vcsettings.cpp
     506
     507debug/moc_aliascompleter.o: debug/moc_aliascompleter.cpp
     508        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_aliascompleter.o debug/moc_aliascompleter.cpp
    507509
    508510debug/moc_vceditaccount.o: debug/moc_vceditaccount.cpp
     
    515517        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCAccountLoadThread.o debug/moc_BCAccountLoadThread.cpp
    516518
     519debug/moc_DASQLiteAccountListManager.o: debug/moc_DASQLiteAccountListManager.cpp
     520        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DASQLiteAccountListManager.o debug/moc_DASQLiteAccountListManager.cpp
     521
     522debug/moc_DAAccountManager.o: debug/moc_DAAccountManager.cpp
     523        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DAAccountManager.o debug/moc_DAAccountManager.cpp
     524
    517525debug/moc_BCAccountLoadManager.o: debug/moc_BCAccountLoadManager.cpp
    518526        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCAccountLoadManager.o debug/moc_BCAccountLoadManager.cpp
    519527
     528debug/moc_BCLibraryLoader.o: debug/moc_BCLibraryLoader.cpp
     529        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCLibraryLoader.o debug/moc_BCLibraryLoader.cpp
     530
    520531debug/moc_vceditgroup.o: debug/moc_vceditgroup.cpp
    521532        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_vceditgroup.o debug/moc_vceditgroup.cpp
    522533
     534debug/moc_DAGroupManager.o: debug/moc_DAGroupManager.cpp
     535        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DAGroupManager.o debug/moc_DAGroupManager.cpp
     536
    523537debug/moc_vceditcontact.o: debug/moc_vceditcontact.cpp
    524538        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_vceditcontact.o debug/moc_vceditcontact.cpp
    525539
     540debug/moc_DASettings.o: debug/moc_DASettings.cpp
     541        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DASettings.o debug/moc_DASettings.cpp
     542
    526543debug/moc_vcaddressbook.o: debug/moc_vcaddressbook.cpp
    527544        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_vcaddressbook.o debug/moc_vcaddressbook.cpp
    528545
     546debug/moc_DASQLiteStorage.o: debug/moc_DASQLiteStorage.cpp
     547        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DASQLiteStorage.o debug/moc_DASQLiteStorage.cpp
     548
     549debug/moc_DAContactManager.o: debug/moc_DAContactManager.cpp
     550        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DAContactManager.o debug/moc_DAContactManager.cpp
     551
     552debug/moc_PersistenceFactory.o: debug/moc_PersistenceFactory.cpp
     553        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_PersistenceFactory.o debug/moc_PersistenceFactory.cpp
     554
    529555debug/moc_vcmain.o: debug/moc_vcmain.cpp
    530556        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_vcmain.o debug/moc_vcmain.cpp
  • Makefile.Release

    r36 r42  
    11#############################################################################
    22# Makefile for building: smssender-bin
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Mon Nov 16 18:21:29 2009
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Thu Jan 14 13:21:33 2010
    44# Project:  smssender.pro
    55# Template: app
     
    1313CFLAGS        = -pipe -O2 -D_REENTRANT -Wall -W $(DEFINES)
    1414CXXFLAGS      = -pipe -O2 -D_REENTRANT -Wall -W $(DEFINES)
    15 INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -Iapp -Ilib/libinterfaces/src/business -Ilib/libinterfaces/src -Irelease -I.
     15INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -Iapp -Ilib/libinterfaces/src/business -Ilib/libinterfaces/src/exceptions -Ilib/libinterfaces/src -Ilib/libdatatypes/src/business -Ilib/libutils/src -Irelease -I.
    1616LINK          = g++
    1717LFLAGS        = -Wl,-O1
    18 LIBS          = $(SUBLIBS)  -L/usr/lib -Llib/ -ltntdb -lcrypto++ -linterfaces -lpthread -lQtGui -lQtCore
     18LIBS          = $(SUBLIBS)  -L/usr/lib -Llib/ -ltntdb -lcrypto++ -ldatatypes -linterfaces -lutils -lpthread -lQtGui -lQtCore
    1919AR            = ar cqs
    2020RANLIB        =
     
    4242####### Files
    4343
    44 SOURCES       = src/ui/VCEditAccount/vceditaccount.cpp \
     44SOURCES       = src/ui/completers/aliascompleter.cpp \
     45                src/ui/completers/AliasModel.cpp \
     46                src/ui/completers/FilteredPopupCompleter.cpp \
     47                src/ui/VCEditAccount/vceditaccount.cpp \
    4548                src/ui/VCAccountList/vcaccountlist.cpp \
    4649                src/business/BCAccountLoadThread.cpp \
     
    5255                src/business/BCLibraryLoader.cpp \
    5356                src/ui/VCEditGroup/vceditgroup.cpp \
    54                 src/business/BCGroup.cpp \
    5557                src/persistence/DAGroupManager.cpp \
    5658                src/business/BCGroupManager.cpp \
    57                 src/utils/strutils.cpp \
    58                 src/business/BCBinary.cpp \
    5959                src/ui/UIHelper.cpp \
    6060                src/ui/VCEditContact/vceditcontact.cpp \
    6161                src/persistence/DASettings.cpp \
    62                 src/business/BCNumber.cpp \
    6362                src/ui/VCAddressBook/vcaddressbook.cpp \
    6463                src/business/BCContactManager.cpp \
    65                 src/business/BCContact.cpp \
    6664                src/business/BusinessFactory.cpp \
    67                 src/business/BCShortcut.cpp \
    6865                src/persistence/storage/DASQLiteStorage.cpp \
    6966                src/business/BCSettings.cpp \
     
    7269                src/main.cpp \
    7370                src/ui/VCMain/vcmain.cpp \
    74                 src/ui/VCSettings/vcsettings.cpp release/moc_vceditaccount.cpp \
     71                src/ui/VCSettings/vcsettings.cpp release/moc_aliascompleter.cpp \
     72                release/moc_vceditaccount.cpp \
    7573                release/moc_vcaccountlist.cpp \
    7674                release/moc_BCAccountLoadThread.cpp \
     75                release/moc_DASQLiteAccountListManager.cpp \
     76                release/moc_DAAccountManager.cpp \
    7777                release/moc_BCAccountLoadManager.cpp \
     78                release/moc_BCLibraryLoader.cpp \
    7879                release/moc_vceditgroup.cpp \
     80                release/moc_DAGroupManager.cpp \
    7981                release/moc_vceditcontact.cpp \
     82                release/moc_DASettings.cpp \
    8083                release/moc_vcaddressbook.cpp \
     84                release/moc_DASQLiteStorage.cpp \
     85                release/moc_DAContactManager.cpp \
     86                release/moc_PersistenceFactory.cpp \
    8187                release/moc_vcmain.cpp \
    8288                release/moc_vcsettings.cpp \
    8389                release/qrc_resource.cpp
    84 OBJECTS       = release/vceditaccount.o \
     90OBJECTS       = release/aliascompleter.o \
     91                release/AliasModel.o \
     92                release/FilteredPopupCompleter.o \
     93                release/vceditaccount.o \
    8594                release/vcaccountlist.o \
    8695                release/BCAccountLoadThread.o \
     
    92101                release/BCLibraryLoader.o \
    93102                release/vceditgroup.o \
    94                 release/BCGroup.o \
    95103                release/DAGroupManager.o \
    96104                release/BCGroupManager.o \
    97                 release/strutils.o \
    98                 release/BCBinary.o \
    99105                release/UIHelper.o \
    100106                release/vceditcontact.o \
    101107                release/DASettings.o \
    102                 release/BCNumber.o \
    103108                release/vcaddressbook.o \
    104109                release/BCContactManager.o \
    105                 release/BCContact.o \
    106110                release/BusinessFactory.o \
    107                 release/BCShortcut.o \
    108111                release/DASQLiteStorage.o \
    109112                release/BCSettings.o \
     
    113116                release/vcmain.o \
    114117                release/vcsettings.o \
     118                release/moc_aliascompleter.o \
    115119                release/moc_vceditaccount.o \
    116120                release/moc_vcaccountlist.o \
    117121                release/moc_BCAccountLoadThread.o \
     122                release/moc_DASQLiteAccountListManager.o \
     123                release/moc_DAAccountManager.o \
    118124                release/moc_BCAccountLoadManager.o \
     125                release/moc_BCLibraryLoader.o \
    119126                release/moc_vceditgroup.o \
     127                release/moc_DAGroupManager.o \
    120128                release/moc_vceditcontact.o \
     129                release/moc_DASettings.o \
    121130                release/moc_vcaddressbook.o \
     131                release/moc_DASQLiteStorage.o \
     132                release/moc_DAContactManager.o \
     133                release/moc_PersistenceFactory.o \
    122134                release/moc_vcmain.o \
    123135                release/moc_vcsettings.o \
     
    181193dist:
    182194        @$(CHK_DIR_EXISTS) release/smssender-bin3.0.0 || $(MKDIR) release/smssender-bin3.0.0
    183         $(COPY_FILE) --parents $(SOURCES) $(DIST) release/smssender-bin3.0.0/ && $(COPY_FILE) --parents 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/business/BCGroup.h src/persistence/DAGroupManager.h src/business/BCGroupManager.h src/business/BCBinary.h src/ui/UIHelper.h src/ui/VCEditContact/vceditcontact.h src/persistence/DASettings.h src/utils/strutils.h src/business/BCNumber.h src/ui/VCAddressBook/vcaddressbook.h src/utils/typeconvert.h src/business/BCContactManager.h src/business/BCContact.h src/business/BusinessFactory.h src/business/BCShortcut.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 src/exceptions/LibraryExceptions.h src/exceptions/HttpExceptions.h src/exceptions/StdExceptions.h src/exceptions/StorageExceptions.h release/smssender-bin3.0.0/ && $(COPY_FILE) --parents lib/resource.qrc release/smssender-bin3.0.0/ && $(COPY_FILE) --parents 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/business/BCGroup.cpp src/persistence/DAGroupManager.cpp src/business/BCGroupManager.cpp src/utils/strutils.cpp src/business/BCBinary.cpp src/ui/UIHelper.cpp src/ui/VCEditContact/vceditcontact.cpp src/persistence/DASettings.cpp src/business/BCNumber.cpp src/ui/VCAddressBook/vcaddressbook.cpp src/business/BCContactManager.cpp src/business/BCContact.cpp src/business/BusinessFactory.cpp src/business/BCShortcut.cpp src/persistence/storage/DASQLiteStorage.cpp src/business/BCSettings.cpp src/persistence/PersistenceFactory.cpp src/persistence/DAContactManager.cpp src/main.cpp src/ui/VCMain/vcmain.cpp src/ui/VCSettings/vcsettings.cpp release/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/ui/VCEditAccount/vceditaccount.ui src/ui/VCAccountList/vcaccountlist.ui src/ui/VCEditGroup/vceditgroup.ui src/ui/VCEditContact/vceditcontact.ui src/ui/VCAddressBook/vcaddressbook.ui src/ui/VCMain/vcmain.ui src/ui/VCSettings/vcsettings.ui release/smssender-bin3.0.0/ && $(COPY_FILE) --parents locale/de.ts release/smssender-bin3.0.0/ && (cd `dirname release/smssender-bin3.0.0` && $(TAR) smssender-bin3.0.0.tar smssender-bin3.0.0 && $(COMPRESS) smssender-bin3.0.0.tar) && $(MOVE) `dirname release/smssender-bin3.0.0`/smssender-bin3.0.0.tar.gz . && $(DEL_FILE) -r release/smssender-bin3.0.0
     195        $(COPY_FILE) --parents $(SOURCES) $(DIST) release/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/ui/completers/aliascompleter.h src/ui/completers/AliasModel.h src/ui/completers/FilteredPopupCompleter.h src/ui/VCEditAccount/vceditaccount.h src/ui/VCAccountList/vcaccountlist.h src/business/BCAccountLoadThread.h src/business/BCGatewayManager.h src/persistence/storage/DASQLiteAccountListManager.h src/persistence/DAAccountManager.h src/business/BCAccountManager.h src/business/BCAccountLoadManager.h src/business/BCLibraryLoader.h src/ui/VCEditGroup/vceditgroup.h src/persistence/DAGroupManager.h src/business/BCGroupManager.h src/ui/UIHelper.h src/ui/VCEditContact/vceditcontact.h src/persistence/DASettings.h src/ui/VCAddressBook/vcaddressbook.h src/business/BCContactManager.h src/business/BusinessFactory.h src/persistence/storage/DASQLiteStorage.h src/persistence/DAContactManager.h src/business/BCSettings.h src/persistence/PersistenceFactory.h src/ui/VCMain/vcmain.h src/ui/VCSettings/vcsettings.h release/smssender-bin3.0.0/ && $(COPY_FILE) --parents lib/resource.qrc release/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/ui/completers/aliascompleter.cpp src/ui/completers/AliasModel.cpp src/ui/completers/FilteredPopupCompleter.cpp src/ui/VCEditAccount/vceditaccount.cpp src/ui/VCAccountList/vcaccountlist.cpp src/business/BCAccountLoadThread.cpp src/business/BCGatewayManager.cpp src/persistence/storage/DASQLiteAccountListManager.cpp src/persistence/DAAccountManager.cpp src/business/BCAccountManager.cpp src/business/BCAccountLoadManager.cpp src/business/BCLibraryLoader.cpp src/ui/VCEditGroup/vceditgroup.cpp src/persistence/DAGroupManager.cpp src/business/BCGroupManager.cpp src/ui/UIHelper.cpp src/ui/VCEditContact/vceditcontact.cpp src/persistence/DASettings.cpp src/ui/VCAddressBook/vcaddressbook.cpp src/business/BCContactManager.cpp src/business/BusinessFactory.cpp src/persistence/storage/DASQLiteStorage.cpp src/business/BCSettings.cpp src/persistence/PersistenceFactory.cpp src/persistence/DAContactManager.cpp src/main.cpp src/ui/VCMain/vcmain.cpp src/ui/VCSettings/vcsettings.cpp release/smssender-bin3.0.0/ && $(COPY_FILE) --parents src/ui/VCEditAccount/vceditaccount.ui src/ui/VCAccountList/vcaccountlist.ui src/ui/VCEditGroup/vceditgroup.ui src/ui/VCEditContact/vceditcontact.ui src/ui/VCAddressBook/vcaddressbook.ui src/ui/VCMain/vcmain.ui src/ui/VCSettings/vcsettings.ui release/smssender-bin3.0.0/ && $(COPY_FILE) --parents locale/de.ts release/smssender-bin3.0.0/ && (cd `dirname release/smssender-bin3.0.0` && $(TAR) smssender-bin3.0.0.tar smssender-bin3.0.0 && $(COMPRESS) smssender-bin3.0.0.tar) && $(MOVE) `dirname release/smssender-bin3.0.0`/smssender-bin3.0.0.tar.gz . && $(DEL_FILE) -r release/smssender-bin3.0.0
    184196
    185197
     
    200212mocables: compiler_moc_header_make_all compiler_moc_source_make_all
    201213
    202 compiler_moc_header_make_all: release/moc_vceditaccount.cpp release/moc_vcaccountlist.cpp release/moc_BCAccountLoadThread.cpp release/moc_BCAccountLoadManager.cpp release/moc_vceditgroup.cpp release/moc_vceditcontact.cpp release/moc_vcaddressbook.cpp release/moc_vcmain.cpp release/moc_vcsettings.cpp
     214compiler_moc_header_make_all: release/moc_aliascompleter.cpp release/moc_vceditaccount.cpp release/moc_vcaccountlist.cpp release/moc_BCAccountLoadThread.cpp release/moc_DASQLiteAccountListManager.cpp release/moc_DAAccountManager.cpp release/moc_BCAccountLoadManager.cpp release/moc_BCLibraryLoader.cpp release/moc_vceditgroup.cpp release/moc_DAGroupManager.cpp release/moc_vceditcontact.cpp release/moc_DASettings.cpp release/moc_vcaddressbook.cpp release/moc_DASQLiteStorage.cpp release/moc_DAContactManager.cpp release/moc_PersistenceFactory.cpp release/moc_vcmain.cpp release/moc_vcsettings.cpp
    203215compiler_moc_header_clean:
    204         -$(DEL_FILE) release/moc_vceditaccount.cpp release/moc_vcaccountlist.cpp release/moc_BCAccountLoadThread.cpp release/moc_BCAccountLoadManager.cpp release/moc_vceditgroup.cpp release/moc_vceditcontact.cpp release/moc_vcaddressbook.cpp release/moc_vcmain.cpp release/moc_vcsettings.cpp
     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
     217release/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
     219
    205220release/moc_vceditaccount.cpp: ui_vceditaccount.h \
    206221                src/ui/VCEditAccount/vceditaccount.h
     
    211226        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCAccountList/vcaccountlist.h -o release/moc_vcaccountlist.cpp
    212227
    213 release/moc_BCAccountLoadThread.cpp: src/exceptions/StdExceptions.h \
    214                 src/business/BCAccountLoadThread.h
     228release/moc_BCAccountLoadThread.cpp: src/business/BCAccountLoadThread.h
    215229        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCAccountLoadThread.h -o release/moc_BCAccountLoadThread.cpp
    216230
     231release/moc_DASQLiteAccountListManager.cpp: src/persistence/storage/DASQLiteAccountListManager.h
     232        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/storage/DASQLiteAccountListManager.h -o release/moc_DASQLiteAccountListManager.cpp
     233
     234release/moc_DAAccountManager.cpp: src/persistence/DAAccountManager.h
     235        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DAAccountManager.h -o release/moc_DAAccountManager.cpp
     236
    217237release/moc_BCAccountLoadManager.cpp: src/business/BCAccountLoadThread.h \
    218                 src/exceptions/StdExceptions.h \
    219238                src/business/BCAccountLoadManager.h
    220239        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCAccountLoadManager.h -o release/moc_BCAccountLoadManager.cpp
     240
     241release/moc_BCLibraryLoader.cpp: src/business/BCLibraryLoader.h
     242        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCLibraryLoader.h -o release/moc_BCLibraryLoader.cpp
    221243
    222244release/moc_vceditgroup.cpp: ui_vceditgroup.h \
     
    224246        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCEditGroup/vceditgroup.h -o release/moc_vceditgroup.cpp
    225247
     248release/moc_DAGroupManager.cpp: src/persistence/DAGroupManager.h
     249        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DAGroupManager.h -o release/moc_DAGroupManager.cpp
     250
    226251release/moc_vceditcontact.cpp: ui_vceditcontact.h \
    227252                src/ui/VCEditContact/vceditcontact.h
    228253        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCEditContact/vceditcontact.h -o release/moc_vceditcontact.cpp
    229254
     255release/moc_DASettings.cpp: src/persistence/DASettings.h
     256        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DASettings.h -o release/moc_DASettings.cpp
     257
    230258release/moc_vcaddressbook.cpp: ui_vcaddressbook.h \
    231259                src/ui/VCAddressBook/vcaddressbook.h
    232260        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/VCAddressBook/vcaddressbook.h -o release/moc_vcaddressbook.cpp
    233261
     262release/moc_DASQLiteStorage.cpp: src/persistence/storage/DASQLiteStorage.h
     263        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/storage/DASQLiteStorage.h -o release/moc_DASQLiteStorage.cpp
     264
     265release/moc_DAContactManager.cpp: src/persistence/DAContactManager.h
     266        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DAContactManager.h -o release/moc_DAContactManager.cpp
     267
     268release/moc_PersistenceFactory.cpp: src/persistence/PersistenceFactory.h
     269        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/PersistenceFactory.h -o release/moc_PersistenceFactory.cpp
     270
    234271release/moc_vcmain.cpp: src/business/BCAccountLoadManager.h \
    235272                src/business/BCAccountLoadThread.h \
    236                 src/exceptions/StdExceptions.h \
     273                src/ui/completers/AliasModel.h \
    237274                ui_vcmain.h \
    238275                src/ui/VCMain/vcmain.h
     
    264301                lib/heart.png \
    265302                lib/client_network.png \
     303                lib/sms_new.png \
    266304                lib/exit.png \
    267305                lib/close_cancel.png \
     
    308346####### Compile
    309347
     348release/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
     351release/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
     354release/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
     356
    310357release/vceditaccount.o: src/ui/VCEditAccount/vceditaccount.cpp src/ui/VCEditAccount/vceditaccount.h \
    311358                ui_vceditaccount.h \
     359                src/business/BCAccountManager.h \
     360                src/business/BCAccountLoadManager.h \
     361                src/business/BCAccountLoadThread.h \
    312362                src/business/BCGatewayManager.h
    313363        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/vceditaccount.o src/ui/VCEditAccount/vceditaccount.cpp
     
    321371                src/business/BCAccountLoadManager.h \
    322372                src/business/BCAccountLoadThread.h \
    323                 src/exceptions/StdExceptions.h \
    324                 src/business/BusinessFactory.h \
    325                 src/utils/typeconvert.h
     373                src/business/BusinessFactory.h
    326374        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/vcaccountlist.o src/ui/VCAccountList/vcaccountlist.cpp
    327375
    328 release/BCAccountLoadThread.o: src/business/BCAccountLoadThread.cpp src/business/BCAccountLoadThread.h \
    329                 src/exceptions/StdExceptions.h
     376release/BCAccountLoadThread.o: src/business/BCAccountLoadThread.cpp src/business/BCAccountLoadThread.h
    330377        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BCAccountLoadThread.o src/business/BCAccountLoadThread.cpp
    331378
     
    336383release/DASQLiteAccountListManager.o: src/persistence/storage/DASQLiteAccountListManager.cpp src/persistence/storage/DASQLiteAccountListManager.h \
    337384                src/business/BCGatewayManager.h \
    338                 src/utils/typeconvert.h \
    339                 src/exceptions/StorageExceptions.h \
    340                 src/exceptions/StdExceptions.h \
    341385                src/persistence/storage/DASQLiteStorage.h
    342386        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/DASQLiteAccountListManager.o src/persistence/storage/DASQLiteAccountListManager.cpp
     
    349393                src/business/BCAccountLoadManager.h \
    350394                src/business/BCAccountLoadThread.h \
    351                 src/exceptions/StdExceptions.h \
    352395                src/persistence/PersistenceFactory.h
    353396        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BCAccountManager.o src/business/BCAccountManager.cpp
     
    355398release/BCAccountLoadManager.o: src/business/BCAccountLoadManager.cpp src/business/BCAccountLoadManager.h \
    356399                src/business/BCAccountLoadThread.h \
    357                 src/exceptions/StdExceptions.h \
    358400                src/business/BCAccountManager.h
    359401        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BCAccountLoadManager.o src/business/BCAccountLoadManager.cpp
    360402
    361 release/BCLibraryLoader.o: src/business/BCLibraryLoader.cpp src/business/BCLibraryLoader.h \
    362                 src/exceptions/LibraryExceptions.h \
    363                 src/exceptions/StdExceptions.h
     403release/BCLibraryLoader.o: src/business/BCLibraryLoader.cpp src/business/BCLibraryLoader.h
    364404        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BCLibraryLoader.o src/business/BCLibraryLoader.cpp
    365405
     
    370410        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/vceditgroup.o src/ui/VCEditGroup/vceditgroup.cpp
    371411
    372 release/BCGroup.o: src/business/BCGroup.cpp src/business/BCGroup.h \
    373                 src/business/BCBinary.h \
    374                 src/business/BCNumber.h \
    375                 src/business/BCContactManager.h
    376         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BCGroup.o src/business/BCGroup.cpp
    377 
    378412release/DAGroupManager.o: src/persistence/DAGroupManager.cpp src/persistence/DAGroupManager.h \
    379413                src/persistence/PersistenceFactory.h
     
    384418        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BCGroupManager.o src/business/BCGroupManager.cpp
    385419
    386 release/strutils.o: src/utils/strutils.cpp src/utils/strutils.h
    387         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/strutils.o src/utils/strutils.cpp
    388 
    389 release/BCBinary.o: src/business/BCBinary.cpp src/business/BCBinary.h
    390         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BCBinary.o src/business/BCBinary.cpp
    391 
    392 release/UIHelper.o: src/ui/UIHelper.cpp src/ui/UIHelper.h \
    393                 src/business/BCBinary.h
     420release/UIHelper.o: src/ui/UIHelper.cpp src/ui/UIHelper.h
    394421        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/UIHelper.o src/ui/UIHelper.cpp
    395422
     
    397424                ui_vceditcontact.h \
    398425                src/ui/UIHelper.h \
    399                 src/business/BusinessFactory.h \
    400                 src/utils/typeconvert.h \
    401                 src/utils/strutils.h
     426                src/business/BusinessFactory.h
    402427        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/vceditcontact.o src/ui/VCEditContact/vceditcontact.cpp
    403428
     
    405430                src/persistence/PersistenceFactory.h
    406431        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/DASettings.o src/persistence/DASettings.cpp
    407 
    408 release/BCNumber.o: src/business/BCNumber.cpp src/business/BCNumber.h \
    409                 src/exceptions/StdExceptions.h \
    410                 src/utils/strutils.h \
    411                 src/utils/typeconvert.h
    412         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BCNumber.o src/business/BCNumber.cpp
    413432
    414433release/vcaddressbook.o: src/ui/VCAddressBook/vcaddressbook.cpp src/ui/VCAddressBook/vcaddressbook.h \
     
    421440                src/business/BCContactManager.h \
    422441                src/business/BCGroupManager.h \
    423                 src/business/BusinessFactory.h \
    424                 src/utils/typeconvert.h
     442                src/business/BusinessFactory.h
    425443        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/vcaddressbook.o src/ui/VCAddressBook/vcaddressbook.cpp
    426444
     
    429447        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BCContactManager.o src/business/BCContactManager.cpp
    430448
    431 release/BCContact.o: src/business/BCContact.cpp src/business/BCContact.h \
    432                 src/business/BCBinary.h \
    433                 src/business/BCNumber.h
    434         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BCContact.o src/business/BCContact.cpp
    435 
    436 release/BusinessFactory.o: src/business/BusinessFactory.cpp src/business/BusinessFactory.h \
    437                 src/business/BCContact.h \
    438                 src/business/BCGroup.h \
    439                 src/business/BCShortcut.h
     449release/BusinessFactory.o: src/business/BusinessFactory.cpp src/business/BusinessFactory.h
    440450        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BusinessFactory.o src/business/BusinessFactory.cpp
    441451
    442 release/BCShortcut.o: src/business/BCShortcut.cpp src/business/BCShortcut.h
    443         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BCShortcut.o src/business/BCShortcut.cpp
    444 
    445452release/DASQLiteStorage.o: src/persistence/storage/DASQLiteStorage.cpp src/persistence/storage/DASQLiteStorage.h \
    446                 src/business/BCContact.h \
    447                 src/business/BCBinary.h \
    448                 src/business/BCGroup.h \
    449453                src/business/BCSettings.h \
    450                 src/business/BCShortcut.h \
    451                 src/exceptions/StdExceptions.h \
    452                 src/exceptions/StorageExceptions.h \
    453                 src/utils/typeconvert.h
     454                src/business/BCContactManager.h
    454455        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/DASQLiteStorage.o src/persistence/storage/DASQLiteStorage.cpp
    455456
     
    473474                src/business/BCAccountLoadManager.h \
    474475                src/business/BCAccountLoadThread.h \
    475                 src/exceptions/StdExceptions.h \
     476                src/ui/completers/AliasModel.h \
    476477                ui_vcmain.h \
    477478                src/business/BCSettings.h \
    478479                src/business/BCAccountManager.h \
    479                 src/business/BCGatewayManager.h
     480                src/business/BCGatewayManager.h \
     481                src/business/BCLibraryLoader.h
    480482        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/main.o src/main.cpp
    481483
     
    483485                src/business/BCAccountLoadManager.h \
    484486                src/business/BCAccountLoadThread.h \
    485                 src/exceptions/StdExceptions.h \
     487                src/ui/completers/AliasModel.h \
    486488                ui_vcmain.h \
    487489                src/business/BCAccountManager.h \
    488490                src/business/BCContactManager.h \
    489491                src/business/BCGroupManager.h \
    490                 src/utils/typeconvert.h \
    491492                src/ui/UIHelper.h \
    492493                src/ui/VCAccountList/vcaccountlist.h \
     
    501502                ui_vcsettings.h \
    502503                src/business/BusinessFactory.h \
    503                 src/business/BCSettings.h \
    504                 src/utils/typeconvert.h \
    505                 src/utils/strutils.h
     504                src/business/BCSettings.h
    506505        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/vcsettings.o src/ui/VCSettings/vcsettings.cpp
     506
     507release/moc_aliascompleter.o: release/moc_aliascompleter.cpp
     508        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_aliascompleter.o release/moc_aliascompleter.cpp
    507509
    508510release/moc_vceditaccount.o: release/moc_vceditaccount.cpp
     
    515517        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCAccountLoadThread.o release/moc_BCAccountLoadThread.cpp
    516518
     519release/moc_DASQLiteAccountListManager.o: release/moc_DASQLiteAccountListManager.cpp
     520        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DASQLiteAccountListManager.o release/moc_DASQLiteAccountListManager.cpp
     521
     522release/moc_DAAccountManager.o: release/moc_DAAccountManager.cpp
     523        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DAAccountManager.o release/moc_DAAccountManager.cpp
     524
    517525release/moc_BCAccountLoadManager.o: release/moc_BCAccountLoadManager.cpp
    518526        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCAccountLoadManager.o release/moc_BCAccountLoadManager.cpp
    519527
     528release/moc_BCLibraryLoader.o: release/moc_BCLibraryLoader.cpp
     529        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCLibraryLoader.o release/moc_BCLibraryLoader.cpp
     530
    520531release/moc_vceditgroup.o: release/moc_vceditgroup.cpp
    521532        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_vceditgroup.o release/moc_vceditgroup.cpp
    522533
     534release/moc_DAGroupManager.o: release/moc_DAGroupManager.cpp
     535        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DAGroupManager.o release/moc_DAGroupManager.cpp
     536
    523537release/moc_vceditcontact.o: release/moc_vceditcontact.cpp
    524538        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_vceditcontact.o release/moc_vceditcontact.cpp
    525539
     540release/moc_DASettings.o: release/moc_DASettings.cpp
     541        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DASettings.o release/moc_DASettings.cpp
     542
    526543release/moc_vcaddressbook.o: release/moc_vcaddressbook.cpp
    527544        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_vcaddressbook.o release/moc_vcaddressbook.cpp
    528545
     546release/moc_DASQLiteStorage.o: release/moc_DASQLiteStorage.cpp
     547        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DASQLiteStorage.o release/moc_DASQLiteStorage.cpp
     548
     549release/moc_DAContactManager.o: release/moc_DAContactManager.cpp
     550        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DAContactManager.o release/moc_DAContactManager.cpp
     551
     552release/moc_PersistenceFactory.o: release/moc_PersistenceFactory.cpp
     553        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_PersistenceFactory.o release/moc_PersistenceFactory.cpp
     554
    529555release/moc_vcmain.o: release/moc_vcmain.cpp
    530556        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_vcmain.o release/moc_vcmain.cpp
  • gateways/SwisscomXtraZone/Makefile

    r37 r42  
    11#############################################################################
    2 # Makefile for building: libSwisscomXtraZone.so.2.0.0
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Sat Nov 21 17:21:23 2009
     2# Makefile for building: libSwisscomXtraZone.so
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Thu Jan 14 08:55:08 2010
    44# Project:  SwisscomXtraZone.pro
    55# Template: lib
     
    7575                /usr/share/qt4/mkspecs/features/debug_and_release.prf \
    7676                /usr/share/qt4/mkspecs/features/default_post.prf \
     77                /usr/share/qt4/mkspecs/features/unix/thread.prf \
    7778                /usr/share/qt4/mkspecs/features/warn_on.prf \
    7879                /usr/share/qt4/mkspecs/features/qt.prf \
    79                 /usr/share/qt4/mkspecs/features/unix/thread.prf \
    8080                /usr/share/qt4/mkspecs/features/moc.prf \
    8181                /usr/share/qt4/mkspecs/features/resources.prf \
     
    9999/usr/share/qt4/mkspecs/features/debug_and_release.prf:
    100100/usr/share/qt4/mkspecs/features/default_post.prf:
     101/usr/share/qt4/mkspecs/features/unix/thread.prf:
    101102/usr/share/qt4/mkspecs/features/warn_on.prf:
    102103/usr/share/qt4/mkspecs/features/qt.prf:
    103 /usr/share/qt4/mkspecs/features/unix/thread.prf:
    104104/usr/share/qt4/mkspecs/features/moc.prf:
    105105/usr/share/qt4/mkspecs/features/resources.prf:
  • gateways/SwisscomXtraZone/Makefile.Debug

    r37 r42  
    11#############################################################################
    2 # Makefile for building: libSwisscomXtraZone.so.2.0.0
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Sat Nov 21 17:21:22 2009
     2# Makefile for building: libSwisscomXtraZone.so
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Thu Jan 14 08:55:08 2010
    44# Project:  SwisscomXtraZone.pro
    55# Template: lib
     
    1010CC            = gcc
    1111CXX           = g++
    12 DEFINES       = -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
    13 CFLAGS        = -pipe -g -Wall -W -D_REENTRANT -fPIC $(DEFINES)
    14 CXXFLAGS      = -pipe -g -Wall -W -D_REENTRANT -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/business -I../../lib/libinterfaces/src/ui -I../../lib/libinterfaces/src -I../../src/exceptions -I../../src/utils -I../../lib/libgateway/src/business -I../../lib/libgateway/src/persistence -I../../lib/libgateway/src/exceptions -Idebug -I.
     12DEFINES       = -DQT_PLUGIN -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
     13CFLAGS        = -pipe -g -D_REENTRANT -Wall -W -fPIC $(DEFINES)
     14CXXFLAGS      = -pipe -g -D_REENTRANT -Wall -W -fPIC $(DEFINES)
     15INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4 -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.
    1616LINK          = g++
    17 LFLAGS        = -shared -Wl,-soname,libSwisscomXtraZone.so.2
    18 LIBS          = $(SUBLIBS)  -L/usr/lib -L../../lib/ -ltntdb -linterfaces -lgateway -lQtGui -lQtNetwork -lQtCore -lpthread
     17LFLAGS        = -shared
     18LIBS          = $(SUBLIBS)  -L/usr/lib -L../../lib/ -ltntdb -linterfaces -lgateway -ldatatypes -lutils -lpthread -lQtGui -lQtNetwork -lQtCore
    1919AR            = ar cqs
    2020RANLIB        =
     
    4242####### Files
    4343
    44 SOURCES       = src/main.cpp \
     44SOURCES       = src/business/validation/BCAccountValidator.cpp \
     45                src/main.cpp \
    4546                src/business/BCAccount.cpp \
    4647                src/business/BCGateway.cpp \
    4748                src/persistence/DAAccountStorageOfficer.cpp \
    48                 src/ui/vcsettingswidget.cpp debug/moc_vcsettingswidget.cpp \
    49                 debug/qrc_certs.cpp
    50 OBJECTS       = debug/main.o \
     49                src/ui/vcsettingswidget.cpp debug/moc_BCAccountValidator.cpp \
     50                debug/moc_main.cpp \
     51                debug/moc_BCAccount.cpp \
     52                debug/moc_BCGateway.cpp \
     53                debug/moc_DAAccountStorageOfficer.cpp \
     54                debug/moc_vcsettingswidget.cpp \
     55                debug/qrc_SwisscomXtraZone.cpp
     56OBJECTS       = debug/BCAccountValidator.o \
     57                debug/main.o \
    5158                debug/BCAccount.o \
    5259                debug/BCGateway.o \
    5360                debug/DAAccountStorageOfficer.o \
    5461                debug/vcsettingswidget.o \
     62                debug/moc_BCAccountValidator.o \
     63                debug/moc_main.o \
     64                debug/moc_BCAccount.o \
     65                debug/moc_BCGateway.o \
     66                debug/moc_DAAccountStorageOfficer.o \
    5567                debug/moc_vcsettingswidget.o \
    56                 debug/qrc_certs.o
     68                debug/qrc_SwisscomXtraZone.o
    5769DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
    5870                /usr/share/qt4/mkspecs/common/unix.conf \
     
    6779                /usr/share/qt4/mkspecs/features/default_post.prf \
    6880                /usr/share/qt4/mkspecs/features/build_pass.prf \
     81                /usr/share/qt4/mkspecs/features/unix/thread.prf \
    6982                /usr/share/qt4/mkspecs/features/warn_on.prf \
    7083                /usr/share/qt4/mkspecs/features/qt.prf \
    71                 /usr/share/qt4/mkspecs/features/unix/thread.prf \
    7284                /usr/share/qt4/mkspecs/features/moc.prf \
    7385                /usr/share/qt4/mkspecs/features/resources.prf \
     
    7991QMAKE_TARGET  = SwisscomXtraZone
    8092DESTDIR       = ../
    81 TARGET        = libSwisscomXtraZone.so.2.0.0
    82 TARGETA       = ../libSwisscomXtraZone.a
    83 TARGETD       = libSwisscomXtraZone.so.2.0.0
    84 TARGET0       = libSwisscomXtraZone.so
    85 TARGET1       = libSwisscomXtraZone.so.2
    86 TARGET2       = libSwisscomXtraZone.so.2.0
     93TARGET        = libSwisscomXtraZone.so
     94TARGETD       = libSwisscomXtraZone.so
    8795
    8896first: all
     
    112120../$(TARGET): ui_vcsettingswidget.h $(OBJECTS) $(SUBLIBS) $(OBJCOMP) 
    113121        @$(CHK_DIR_EXISTS) ../ || $(MKDIR) ../
    114         -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
     122        -$(DEL_FILE) $(TARGET)
    115123        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(OBJCOMP)
    116         -ln -s $(TARGET) $(TARGET0)
    117         -ln -s $(TARGET) $(TARGET1)
    118         -ln -s $(TARGET) $(TARGET2)
    119         -$(DEL_FILE) ../$(TARGET)
    120         -$(DEL_FILE) ../$(TARGET0)
    121         -$(DEL_FILE) ../$(TARGET1)
    122         -$(DEL_FILE) ../$(TARGET2)
    123         -$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) ../
    124 
    125 
    126 
    127 staticlib: $(TARGETA)
    128 
    129 $(TARGETA): ui_vcsettingswidget.h $(OBJECTS) $(OBJCOMP)
    130         -$(DEL_FILE) $(TARGETA)
    131         $(AR) $(TARGETA) $(OBJECTS)
     124        -$(MOVE) $(TARGET) ../
     125
     126
    132127
    133128qmake:  FORCE
     
    136131dist:
    137132        @$(CHK_DIR_EXISTS) debug/SwisscomXtraZone2.0.0 || $(MKDIR) debug/SwisscomXtraZone2.0.0
    138         $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents src/main.h src/business/BCAccount.h src/business/BCGateway.h src/persistence/DAAccountStorageOfficer.h src/ui/vcsettingswidget.h debug/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents lib/certs.qrc debug/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents src/main.cpp src/business/BCAccount.cpp src/business/BCGateway.cpp src/persistence/DAAccountStorageOfficer.cpp src/ui/vcsettingswidget.cpp debug/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents src/ui/vcsettingswidget.ui debug/SwisscomXtraZone2.0.0/ && (cd `dirname debug/SwisscomXtraZone2.0.0` && $(TAR) SwisscomXtraZone2.0.0.tar SwisscomXtraZone2.0.0 && $(COMPRESS) SwisscomXtraZone2.0.0.tar) && $(MOVE) `dirname debug/SwisscomXtraZone2.0.0`/SwisscomXtraZone2.0.0.tar.gz . && $(DEL_FILE) -r debug/SwisscomXtraZone2.0.0
     133        $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents src/business/validation/BCAccountValidator.h src/main.h src/business/BCAccount.h src/business/BCGateway.h src/persistence/DAAccountStorageOfficer.h src/ui/vcsettingswidget.h debug/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents lib/SwisscomXtraZone.qrc debug/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents src/business/validation/BCAccountValidator.cpp src/main.cpp src/business/BCAccount.cpp src/business/BCGateway.cpp src/persistence/DAAccountStorageOfficer.cpp src/ui/vcsettingswidget.cpp debug/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents src/ui/vcsettingswidget.ui debug/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents locale/de.ts debug/SwisscomXtraZone2.0.0/ && (cd `dirname debug/SwisscomXtraZone2.0.0` && $(TAR) SwisscomXtraZone2.0.0.tar SwisscomXtraZone2.0.0 && $(COMPRESS) SwisscomXtraZone2.0.0.tar) && $(MOVE) `dirname debug/SwisscomXtraZone2.0.0`/SwisscomXtraZone2.0.0.tar.gz . && $(DEL_FILE) -r debug/SwisscomXtraZone2.0.0
    139134
    140135
     
    147142
    148143distclean: clean
    149         -$(DEL_FILE) ../$(TARGET)
    150         -$(DEL_FILE) ../$(TARGET0) ../$(TARGET1) ../$(TARGET2) $(TARGETA)
     144        -$(DEL_FILE) $(TARGET)
    151145        -$(DEL_FILE) Makefile.Debug
    152146
     
    156150mocables: compiler_moc_header_make_all compiler_moc_source_make_all
    157151
    158 compiler_moc_header_make_all: debug/moc_vcsettingswidget.cpp
     152compiler_moc_header_make_all: debug/moc_BCAccountValidator.cpp debug/moc_main.cpp debug/moc_BCAccount.cpp debug/moc_BCGateway.cpp debug/moc_DAAccountStorageOfficer.cpp debug/moc_vcsettingswidget.cpp
    159153compiler_moc_header_clean:
    160         -$(DEL_FILE) debug/moc_vcsettingswidget.cpp
     154        -$(DEL_FILE) debug/moc_BCAccountValidator.cpp debug/moc_main.cpp debug/moc_BCAccount.cpp debug/moc_BCGateway.cpp debug/moc_DAAccountStorageOfficer.cpp debug/moc_vcsettingswidget.cpp
     155debug/moc_BCAccountValidator.cpp: src/business/validation/BCAccountValidator.h
     156        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/validation/BCAccountValidator.h -o debug/moc_BCAccountValidator.cpp
     157
     158debug/moc_main.cpp: src/main.h
     159        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/main.h -o debug/moc_main.cpp
     160
     161debug/moc_BCAccount.cpp: src/business/BCAccount.h
     162        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCAccount.h -o debug/moc_BCAccount.cpp
     163
     164debug/moc_BCGateway.cpp: src/business/BCGateway.h
     165        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCGateway.h -o debug/moc_BCGateway.cpp
     166
     167debug/moc_DAAccountStorageOfficer.cpp: src/persistence/DAAccountStorageOfficer.h
     168        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DAAccountStorageOfficer.h -o debug/moc_DAAccountStorageOfficer.cpp
     169
    161170debug/moc_vcsettingswidget.cpp: ui_vcsettingswidget.h \
    162171                src/ui/vcsettingswidget.h
    163172        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/vcsettingswidget.h -o debug/moc_vcsettingswidget.cpp
    164173
    165 compiler_rcc_make_all: debug/qrc_certs.cpp
     174compiler_rcc_make_all: debug/qrc_SwisscomXtraZone.cpp
    166175compiler_rcc_clean:
    167         -$(DEL_FILE) debug/qrc_certs.cpp
    168 debug/qrc_certs.cpp: lib/certs.qrc \
     176        -$(DEL_FILE) debug/qrc_SwisscomXtraZone.cpp
     177debug/qrc_SwisscomXtraZone.cpp: lib/SwisscomXtraZone.qrc \
     178                lib/de.qm \
    169179                lib/Swisscom_Root_CA_1_pem.crt
    170         /usr/bin/rcc -name certs lib/certs.qrc -o debug/qrc_certs.cpp
     180        /usr/bin/rcc -name SwisscomXtraZone lib/SwisscomXtraZone.qrc -o debug/qrc_SwisscomXtraZone.cpp
    171181
    172182compiler_image_collection_make_all: qmake_image_collection.cpp
     
    191201####### Compile
    192202
     203debug/BCAccountValidator.o: src/business/validation/BCAccountValidator.cpp src/business/validation/BCAccountValidator.h
     204        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BCAccountValidator.o src/business/validation/BCAccountValidator.cpp
     205
    193206debug/main.o: src/main.cpp src/main.h \
    194207                src/business/BCGateway.h
     
    197210debug/BCAccount.o: src/business/BCAccount.cpp src/business/BCAccount.h \
    198211                src/business/BCGateway.h \
     212                src/business/validation/BCAccountValidator.h \
    199213                src/persistence/DAAccountStorageOfficer.h
    200214        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/BCAccount.o src/business/BCAccount.cpp
     
    214228        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/vcsettingswidget.o src/ui/vcsettingswidget.cpp
    215229
     230debug/moc_BCAccountValidator.o: debug/moc_BCAccountValidator.cpp
     231        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCAccountValidator.o debug/moc_BCAccountValidator.cpp
     232
     233debug/moc_main.o: debug/moc_main.cpp
     234        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_main.o debug/moc_main.cpp
     235
     236debug/moc_BCAccount.o: debug/moc_BCAccount.cpp
     237        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCAccount.o debug/moc_BCAccount.cpp
     238
     239debug/moc_BCGateway.o: debug/moc_BCGateway.cpp
     240        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_BCGateway.o debug/moc_BCGateway.cpp
     241
     242debug/moc_DAAccountStorageOfficer.o: debug/moc_DAAccountStorageOfficer.cpp
     243        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DAAccountStorageOfficer.o debug/moc_DAAccountStorageOfficer.cpp
     244
    216245debug/moc_vcsettingswidget.o: debug/moc_vcsettingswidget.cpp
    217246        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_vcsettingswidget.o debug/moc_vcsettingswidget.cpp
    218247
    219 debug/qrc_certs.o: debug/qrc_certs.cpp
    220         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/qrc_certs.o debug/qrc_certs.cpp
     248debug/qrc_SwisscomXtraZone.o: debug/qrc_SwisscomXtraZone.cpp
     249        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/qrc_SwisscomXtraZone.o debug/qrc_SwisscomXtraZone.cpp
    221250
    222251####### Install
  • gateways/SwisscomXtraZone/Makefile.Release

    r37 r42  
    11#############################################################################
    2 # Makefile for building: libSwisscomXtraZone.so.2.0.0
    3 # Generated by qmake (2.01a) (Qt 4.5.2) on: Sat Nov 21 17:21:22 2009
     2# Makefile for building: libSwisscomXtraZone.so
     3# Generated by qmake (2.01a) (Qt 4.5.2) on: Thu Jan 14 08:55:08 2010
    44# Project:  SwisscomXtraZone.pro
    55# Template: lib
     
    1010CC            = gcc
    1111CXX           = g++
    12 DEFINES       = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
    13 CFLAGS        = -pipe -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES)
    14 CXXFLAGS      = -pipe -O2 -Wall -W -D_REENTRANT -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/business -I../../lib/libinterfaces/src/ui -I../../lib/libinterfaces/src -I../../src/exceptions -I../../src/utils -I../../lib/libgateway/src/business -I../../lib/libgateway/src/persistence -I../../lib/libgateway/src/exceptions -Irelease -I.
     12DEFINES       = -DQT_NO_DEBUG -DQT_PLUGIN -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
     13CFLAGS        = -pipe -O2 -D_REENTRANT -Wall -W -fPIC $(DEFINES)
     14CXXFLAGS      = -pipe -O2 -D_REENTRANT -Wall -W -fPIC $(DEFINES)
     15INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4 -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.
    1616LINK          = g++
    17 LFLAGS        = -Wl,-O1 -shared -Wl,-soname,libSwisscomXtraZone.so.2
    18 LIBS          = $(SUBLIBS)  -L/usr/lib -L../../lib/ -ltntdb -linterfaces -lgateway -lQtGui -lQtNetwork -lQtCore -lpthread
     17LFLAGS        = -Wl,-O1 -shared
     18LIBS          = $(SUBLIBS)  -L/usr/lib -L../../lib/ -ltntdb -linterfaces -lgateway -ldatatypes -lutils -lpthread -lQtGui -lQtNetwork -lQtCore
    1919AR            = ar cqs
    2020RANLIB        =
     
    4242####### Files
    4343
    44 SOURCES       = src/main.cpp \
     44SOURCES       = src/business/validation/BCAccountValidator.cpp \
     45                src/main.cpp \
    4546                src/business/BCAccount.cpp \
    4647                src/business/BCGateway.cpp \
    4748                src/persistence/DAAccountStorageOfficer.cpp \
    48                 src/ui/vcsettingswidget.cpp release/moc_vcsettingswidget.cpp \
    49                 release/qrc_certs.cpp
    50 OBJECTS       = release/main.o \
     49                src/ui/vcsettingswidget.cpp release/moc_BCAccountValidator.cpp \
     50                release/moc_main.cpp \
     51                release/moc_BCAccount.cpp \
     52                release/moc_BCGateway.cpp \
     53                release/moc_DAAccountStorageOfficer.cpp \
     54                release/moc_vcsettingswidget.cpp \
     55                release/qrc_SwisscomXtraZone.cpp
     56OBJECTS       = release/BCAccountValidator.o \
     57                release/main.o \
    5158                release/BCAccount.o \
    5259                release/BCGateway.o \
    5360                release/DAAccountStorageOfficer.o \
    5461                release/vcsettingswidget.o \
     62                release/moc_BCAccountValidator.o \
     63                release/moc_main.o \
     64                release/moc_BCAccount.o \
     65                release/moc_BCGateway.o \
     66                release/moc_DAAccountStorageOfficer.o \
    5567                release/moc_vcsettingswidget.o \
    56                 release/qrc_certs.o
     68                release/qrc_SwisscomXtraZone.o
    5769DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
    5870                /usr/share/qt4/mkspecs/common/unix.conf \
     
    6779                /usr/share/qt4/mkspecs/features/default_post.prf \
    6880                /usr/share/qt4/mkspecs/features/build_pass.prf \
     81                /usr/share/qt4/mkspecs/features/unix/thread.prf \
    6982                /usr/share/qt4/mkspecs/features/warn_on.prf \
    7083                /usr/share/qt4/mkspecs/features/qt.prf \
    71                 /usr/share/qt4/mkspecs/features/unix/thread.prf \
    7284                /usr/share/qt4/mkspecs/features/moc.prf \
    7385                /usr/share/qt4/mkspecs/features/resources.prf \
     
    7991QMAKE_TARGET  = SwisscomXtraZone
    8092DESTDIR       = ../
    81 TARGET        = libSwisscomXtraZone.so.2.0.0
    82 TARGETA       = ../libSwisscomXtraZone.a
    83 TARGETD       = libSwisscomXtraZone.so.2.0.0
    84 TARGET0       = libSwisscomXtraZone.so
    85 TARGET1       = libSwisscomXtraZone.so.2
    86 TARGET2       = libSwisscomXtraZone.so.2.0
     93TARGET        = libSwisscomXtraZone.so
     94TARGETD       = libSwisscomXtraZone.so
    8795
    8896first: all
     
    112120../$(TARGET): ui_vcsettingswidget.h $(OBJECTS) $(SUBLIBS) $(OBJCOMP) 
    113121        @$(CHK_DIR_EXISTS) ../ || $(MKDIR) ../
    114         -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
     122        -$(DEL_FILE) $(TARGET)
    115123        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(OBJCOMP)
    116         -ln -s $(TARGET) $(TARGET0)
    117         -ln -s $(TARGET) $(TARGET1)
    118         -ln -s $(TARGET) $(TARGET2)
    119         -$(DEL_FILE) ../$(TARGET)
    120         -$(DEL_FILE) ../$(TARGET0)
    121         -$(DEL_FILE) ../$(TARGET1)
    122         -$(DEL_FILE) ../$(TARGET2)
    123         -$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) ../
    124 
    125 
    126 
    127 staticlib: $(TARGETA)
    128 
    129 $(TARGETA): ui_vcsettingswidget.h $(OBJECTS) $(OBJCOMP)
    130         -$(DEL_FILE) $(TARGETA)
    131         $(AR) $(TARGETA) $(OBJECTS)
     124        -$(MOVE) $(TARGET) ../
     125
     126
    132127
    133128qmake:  FORCE
     
    136131dist:
    137132        @$(CHK_DIR_EXISTS) release/SwisscomXtraZone2.0.0 || $(MKDIR) release/SwisscomXtraZone2.0.0
    138         $(COPY_FILE) --parents $(SOURCES) $(DIST) release/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents src/main.h src/business/BCAccount.h src/business/BCGateway.h src/persistence/DAAccountStorageOfficer.h src/ui/vcsettingswidget.h release/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents lib/certs.qrc release/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents src/main.cpp src/business/BCAccount.cpp src/business/BCGateway.cpp src/persistence/DAAccountStorageOfficer.cpp src/ui/vcsettingswidget.cpp release/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents src/ui/vcsettingswidget.ui release/SwisscomXtraZone2.0.0/ && (cd `dirname release/SwisscomXtraZone2.0.0` && $(TAR) SwisscomXtraZone2.0.0.tar SwisscomXtraZone2.0.0 && $(COMPRESS) SwisscomXtraZone2.0.0.tar) && $(MOVE) `dirname release/SwisscomXtraZone2.0.0`/SwisscomXtraZone2.0.0.tar.gz . && $(DEL_FILE) -r release/SwisscomXtraZone2.0.0
     133        $(COPY_FILE) --parents $(SOURCES) $(DIST) release/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents src/business/validation/BCAccountValidator.h src/main.h src/business/BCAccount.h src/business/BCGateway.h src/persistence/DAAccountStorageOfficer.h src/ui/vcsettingswidget.h release/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents lib/SwisscomXtraZone.qrc release/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents src/business/validation/BCAccountValidator.cpp src/main.cpp src/business/BCAccount.cpp src/business/BCGateway.cpp src/persistence/DAAccountStorageOfficer.cpp src/ui/vcsettingswidget.cpp release/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents src/ui/vcsettingswidget.ui release/SwisscomXtraZone2.0.0/ && $(COPY_FILE) --parents locale/de.ts release/SwisscomXtraZone2.0.0/ && (cd `dirname release/SwisscomXtraZone2.0.0` && $(TAR) SwisscomXtraZone2.0.0.tar SwisscomXtraZone2.0.0 && $(COMPRESS) SwisscomXtraZone2.0.0.tar) && $(MOVE) `dirname release/SwisscomXtraZone2.0.0`/SwisscomXtraZone2.0.0.tar.gz . && $(DEL_FILE) -r release/SwisscomXtraZone2.0.0
    139134
    140135
     
    147142
    148143distclean: clean
    149         -$(DEL_FILE) ../$(TARGET)
    150         -$(DEL_FILE) ../$(TARGET0) ../$(TARGET1) ../$(TARGET2) $(TARGETA)
     144        -$(DEL_FILE) $(TARGET)
    151145        -$(DEL_FILE) Makefile.Release
    152146
     
    156150mocables: compiler_moc_header_make_all compiler_moc_source_make_all
    157151
    158 compiler_moc_header_make_all: release/moc_vcsettingswidget.cpp
     152compiler_moc_header_make_all: release/moc_BCAccountValidator.cpp release/moc_main.cpp release/moc_BCAccount.cpp release/moc_BCGateway.cpp release/moc_DAAccountStorageOfficer.cpp release/moc_vcsettingswidget.cpp
    159153compiler_moc_header_clean:
    160         -$(DEL_FILE) release/moc_vcsettingswidget.cpp
     154        -$(DEL_FILE) release/moc_BCAccountValidator.cpp release/moc_main.cpp release/moc_BCAccount.cpp release/moc_BCGateway.cpp release/moc_DAAccountStorageOfficer.cpp release/moc_vcsettingswidget.cpp
     155release/moc_BCAccountValidator.cpp: src/business/validation/BCAccountValidator.h
     156        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/validation/BCAccountValidator.h -o release/moc_BCAccountValidator.cpp
     157
     158release/moc_main.cpp: src/main.h
     159        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/main.h -o release/moc_main.cpp
     160
     161release/moc_BCAccount.cpp: src/business/BCAccount.h
     162        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCAccount.h -o release/moc_BCAccount.cpp
     163
     164release/moc_BCGateway.cpp: src/business/BCGateway.h
     165        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/business/BCGateway.h -o release/moc_BCGateway.cpp
     166
     167release/moc_DAAccountStorageOfficer.cpp: src/persistence/DAAccountStorageOfficer.h
     168        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/persistence/DAAccountStorageOfficer.h -o release/moc_DAAccountStorageOfficer.cpp
     169
    161170release/moc_vcsettingswidget.cpp: ui_vcsettingswidget.h \
    162171                src/ui/vcsettingswidget.h
    163172        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ui/vcsettingswidget.h -o release/moc_vcsettingswidget.cpp
    164173
    165 compiler_rcc_make_all: release/qrc_certs.cpp
     174compiler_rcc_make_all: release/qrc_SwisscomXtraZone.cpp
    166175compiler_rcc_clean:
    167         -$(DEL_FILE) release/qrc_certs.cpp
    168 release/qrc_certs.cpp: lib/certs.qrc \
     176        -$(DEL_FILE) release/qrc_SwisscomXtraZone.cpp
     177release/qrc_SwisscomXtraZone.cpp: lib/SwisscomXtraZone.qrc \
     178                lib/de.qm \
    169179                lib/Swisscom_Root_CA_1_pem.crt
    170         /usr/bin/rcc -name certs lib/certs.qrc -o release/qrc_certs.cpp
     180        /usr/bin/rcc -name SwisscomXtraZone lib/SwisscomXtraZone.qrc -o release/qrc_SwisscomXtraZone.cpp
    171181
    172182compiler_image_collection_make_all: qmake_image_collection.cpp
     
    191201####### Compile
    192202
     203release/BCAccountValidator.o: src/business/validation/BCAccountValidator.cpp src/business/validation/BCAccountValidator.h
     204        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BCAccountValidator.o src/business/validation/BCAccountValidator.cpp
     205
    193206release/main.o: src/main.cpp src/main.h \
    194207                src/business/BCGateway.h
     
    197210release/BCAccount.o: src/business/BCAccount.cpp src/business/BCAccount.h \
    198211                src/business/BCGateway.h \
     212                src/business/validation/BCAccountValidator.h \
    199213                src/persistence/DAAccountStorageOfficer.h
    200214        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/BCAccount.o src/business/BCAccount.cpp
     
    214228        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/vcsettingswidget.o src/ui/vcsettingswidget.cpp
    215229
     230release/moc_BCAccountValidator.o: release/moc_BCAccountValidator.cpp
     231        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCAccountValidator.o release/moc_BCAccountValidator.cpp
     232
     233release/moc_main.o: release/moc_main.cpp
     234        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_main.o release/moc_main.cpp
     235
     236release/moc_BCAccount.o: release/moc_BCAccount.cpp
     237        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCAccount.o release/moc_BCAccount.cpp
     238
     239release/moc_BCGateway.o: release/moc_BCGateway.cpp
     240        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_BCGateway.o release/moc_BCGateway.cpp
     241
     242release/moc_DAAccountStorageOfficer.o: release/moc_DAAccountStorageOfficer.cpp
     243        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DAAccountStorageOfficer.o release/moc_DAAccountStorageOfficer.cpp
     244
    216245release/moc_vcsettingswidget.o: release/moc_vcsettingswidget.cpp
    217246        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_vcsettingswidget.o release/moc_vcsettingswidget.cpp
    218247
    219 release/qrc_certs.o: release/qrc_certs.cpp
    220         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/qrc_certs.o release/qrc_certs.cpp
     248release/qrc_SwisscomXtraZone.o: release/qrc_SwisscomXtraZone.cpp
     249        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/qrc_SwisscomXtraZone.o release/qrc_SwisscomXtraZone.cpp
    221250
    222251####### Install
  • gateways/SwisscomXtraZone/SwisscomXtraZone.pro

    r36 r42  
    11VERSION = 2.0.0
    22TEMPLATE = lib
     3CONFIG += plugin \
     4    thread \
     5    debug_and_release
     6DESTDIR = ../
    37TARGET = SwisscomXtraZone
    4 DESTDIR = ../
     8QT = core \
     9    network \
     10    gui
    511LIBS += -L../../lib/
    612LIBS += -ltntdb \
    713    -linterfaces \
    8     -lgateway
     14    -lgateway \
     15    -ldatatypes \
     16    -lutils
    917INCLUDEPATH += app \
     18    ../../lib/libinterfaces/src/exceptions/ \
    1019    ../../lib/libinterfaces/src/business/ \
    1120    ../../lib/libinterfaces/src/ui/ \
    1221    ../../lib/libinterfaces/src/ \
    13     ../../src/exceptions/ \
    14     ../../src/utils/ \
     22    ../../lib/libgateway/src/exceptions/ \
    1523    ../../lib/libgateway/src/business/ \
    1624    ../../lib/libgateway/src/persistence/ \
    17     ../../lib/libgateway/src/exceptions/
    18 QT = core \
    19     network \
    20     gui
    21 HEADERS += src/main.h \
     25    ../../lib/libdatatypes/src/business \
     26    ../../lib/libutils/src/
     27HEADERS += src/business/validation/BCAccountValidator.h \
     28    src/main.h \
    2229    src/business/BCAccount.h \
    2330    src/business/BCGateway.h \
    2431    src/persistence/DAAccountStorageOfficer.h \
    2532    src/ui/vcsettingswidget.h
    26 SOURCES += src/main.cpp \
     33SOURCES += src/business/validation/BCAccountValidator.cpp \
     34    src/main.cpp \
    2735    src/business/BCAccount.cpp \
    2836    src/business/BCGateway.cpp \
     
    3038    src/ui/vcsettingswidget.cpp
    3139FORMS += src/ui/vcsettingswidget.ui
    32 RESOURCES += lib/certs.qrc
     40RESOURCES += lib/SwisscomXtraZone.qrc
     41TRANSLATIONS += locale/de.ts
  • gateways/SwisscomXtraZone/src/business/BCAccount.cpp

    r33 r42  
    1414
    1515#include <StdExceptions.h>
    16 #include <ELoginAccountExceptions.h>
     16#include <LoginAccountExceptions.h>
     17
    1718#include <typeconvert.h>
    1819
    1920#include "BCGateway.h"
     21#include "validation/BCAccountValidator.h"
    2022#include "../persistence/DAAccountStorageOfficer.h"
    2123
     24namespace SwisscomXtraZone {
    2225
    2326BCAccount::BCAccount(ISQLiteStorage* storage)
    24     : MAX_MOBILE(10)
     27    : AbstractLoginAccount(new DAAccountStorageOfficer(this, storage), new BCAccountValidator(this))
     28
     29    , MAX_MOBILE(10)
    2530{
    26     storageOfficer_ = new DAAccountStorageOfficer(this, storage);
    2731    httpHelper_     = new HttpHelper();
    28 
    2932
    3033    /* Insert the swisscom-mobile.ch certificate to allow propper loading of the websites... */
     
    4346
    4447BCAccount::~BCAccount(){
    45     delete storageOfficer_;
     48    delete getStorageOfficer();
     49    delete getValidator();
     50    delete httpHelper_;
     51}
     52
     53IAccount* BCAccount::getClonedInstance() const {
     54    return new BCAccount(dynamic_cast<ISQLiteStorage*>(getStorageOfficer()->storage()));
    4655}
    4756
     
    4958ILoginGateway* BCAccount::gateway() const {
    5059    return BCGateway::instance();
    51 }
    52 
    53 IStorageOfficer* BCAccount::getStorageOfficer() const {
    54     return storageOfficer_;
    5560}
    5661
     
    121126    rx.setCaseSensitivity(Qt::CaseInsensitive); // Caseinsensitive
    122127
    123     BCGateway* gtwy = reinterpret_cast<BCGateway*>(gateway());
     128    BCGateway* gtwy = static_cast<BCGateway*>(gateway());
    124129
    125130    rx.setPattern("<input.*id=\"CobYouthSMSSenden_txtMessageDisabled\".*value=\"(.*)\".*/>");
    126131    if (rx.indexIn(lastHtml_) == -1) {
    127         throw new EException(QObject::tr("Could not get the addon text!"));
     132        throw new EException(tr("Could not get the addon text!"));
    128133    }
    129134    gtwy->setAddonText(rx.cap(1));
     
    131136    rx.setPattern("<input.*id=\"lblcounter\".*value='(\\d*)'.*/?>");
    132137    if (rx.indexIn(lastHtml_) == -1){
    133         throw new EException(QObject::tr("Could not get the longSMSLength!"));
     138        throw new EException(tr("Could not get the longSMSLength!"));
    134139    }
    135140    gtwy->setLongSMSLength(rx.cap(1).toInt() + gtwy->addonText().length());
     
    137142    rx.setPattern("<span.*id=\"CobYouthMMSSMSKonto_lblGuthaben\">(\\d*)</span>");
    138143    if (rx.indexIn(lastHtml_) == -1) {
    139         throw new EException(QObject::tr("Could not get the free sms count!"));
     144        throw new EException(tr("Could not get the free sms count!"));
    140145    }
    141146    setFreeSMSCount(rx.cap(1).toInt());
     
    173178
    174179
    175 void BCAccount::sendSMS(const QString& message, const QSet<IContact*>& recipients) {
     180void BCAccount::sendSMS(const QString& message, const QList<IContact*>& recipients) {
    176181    if ((message == "") || recipients.empty()){
    177182        return;
     
    210215    int freeSMSNeeded = shortSMSLst.size() * recipients.size();
    211216    if (freeSMSNeeded > freeSMSCount()) {
    212         throw new EException(QObject::tr("You have only %1 SMS for free. (You need at least %2 SMS left to send this message!").arg(freeSMSCount()).arg(freeSMSNeeded));
     217        throw new EException(tr("You have only %1 SMS for free. (You need at least %2 SMS left to send this message!)").arg(freeSMSCount()).arg(freeSMSNeeded));
    213218    }
    214219
     
    223228        int y = 0;
    224229
    225         QSetIterator<IContact*> j(recipients);
     230        QListIterator<IContact*> j(recipients);
    226231        do {
    227232            setStatus(LoginAccount::Status::RemovingRecipients);
     
    261266    setStatus(LoginAccount::Status::SMSSent, 100);
    262267}
     268
     269}
  • gateways/SwisscomXtraZone/src/business/BCAccount.h

    r30 r42  
    66 */
    77
    8 #ifndef BCACCOUNT_H_
    9 #define BCACCOUNT_H_
     8#ifndef SWISSCOMXTRAZONE_BCACCOUNT_H_
     9#define SWISSCOMXTRAZONE_BCACCOUNT_H_
    1010
    1111#include <AbstractLoginAccount.h>
     
    1414#include <HttpHelper.h>
    1515
     16namespace SwisscomXtraZone {
     17
    1618class BCAccount: public AbstractLoginAccount {
     19    Q_OBJECT
     20
    1721public:
    18     BCAccount(ISQLiteStorage* storage);
     22    explicit BCAccount(ISQLiteStorage* storage);
    1923    virtual ~BCAccount();
    2024
     
    2327
    2428    /* IAccount */
    25     virtual void             sendSMS(const QString& message, const QSet<IContact*>& recipients);
     29    virtual void             sendSMS(const QString& message, const QList<IContact*>& recipients);
    2630    virtual void             cancelSMSSending();
    2731
    28     /* IStorable */
    29     virtual IStorageOfficer* getStorageOfficer() const;
     32    virtual IAccount*        getClonedInstance() const;
    3033protected:
    3134    /* AbstractAccount */
     
    3841
    3942private:
    40     IStorageOfficer* storageOfficer_;
    41     HttpHelper* httpHelper_;
     43    HttpHelper*     httpHelper_;
    4244
    4345    const int MAX_MOBILE;
     
    5052    void _addRecipient(const IContact* recipient);
    5153    void _sendSMS(const QString& text);
     54
     55    Q_DISABLE_COPY(BCAccount);
    5256};
    5357
    54 #endif /* BCACCOUNT_H_ */
     58}
     59
     60#endif /* SWISSCOMXTRAZONE_BCACCOUNT_H_ */
  • gateways/SwisscomXtraZone/src/business/BCGateway.cpp

    r36 r42  
    1111#include "../ui/vcsettingswidget.h"
    1212
     13namespace SwisscomXtraZone {
     14
    1315ILoginGateway* BCGateway::instance_ = NULL;
    1416ILoginGateway* BCGateway::instance(){
     
    2123}
    2224
    23 IAccount* BCGateway::createAccountInstance(ISQLiteStorage* storage) const {
    24     return new BCAccount(storage);
     25IAccount* BCGateway::createAccountInstance(IStorage* storage) const {
     26    return new BCAccount(static_cast<ISQLiteStorage*>(storage));
    2527}
    2628
     
    4143    return longSMSLength_;
    4244}
    43 void BCGateway::setLongSMSLength(const int& longSMSLength) {
     45void BCGateway::setLongSMSLength(int longSMSLength) {
    4446    longSMSLength_ = longSMSLength;
    4547}
     
    9395    return shortSMSList;
    9496}
     97
     98}
  • gateways/SwisscomXtraZone/src/business/BCGateway.h

    r36 r42  
    66 */
    77
    8 #ifndef BCGATEWAY_H_
    9 #define BCGATEWAY_H_
     8#ifndef SWISSCOMXTRAZONE_BCGATEWAY_H_
     9#define SWISSCOMXTRAZONE_BCGATEWAY_H_
    1010
    1111#include <AbstractLoginGateway.h>
    1212#include <persistence/isqlitestorage.h>
     13
     14
     15namespace SwisscomXtraZone {
    1316
    1417const QString LOGIN_PAGE  = "https://www.swisscom-mobile.ch/youth/sms_senden-de.aspx?login";
     
    1619const QString LOGOUT_PAGE = "https://www.swisscom-mobile.ch/youth/youth_zone_home-de.aspx?logout";
    1720
     21class BCGateway: public AbstractLoginGateway {
     22    Q_OBJECT
    1823
    19 class BCGateway: public AbstractLoginGateway {
    2024public:
    2125    static ILoginGateway*  instance();
     
    2327    /* IGateway */
    2428    virtual QString        name() const;
    25     virtual IAccount*      createAccountInstance(ISQLiteStorage* storage) const;
     29    virtual IAccount*      createAccountInstance(IStorage* storage) const;
    2630
    2731    virtual QList<QString> splitTextToLongSMS(const QString& text) const;
     
    3539
    3640    virtual int            longSMSLength() const;
    37     virtual void           setLongSMSLength(const int& longSMSLength);
     41    virtual void           setLongSMSLength(int longSMSLength);
    3842
    3943protected:
    4044    BCGateway()
    41         : SHORTSMS_LENGTH(160)
     45        : AbstractLoginGateway()
     46
     47        , SHORTSMS_LENGTH(160)
    4248
    4349        , addonText_("")
     
    5359    int     longSMSLength_;
    5460
     61    Q_DISABLE_COPY(BCGateway);
     62
    5563};
    5664
    57 namespace SwisscomXtraZone {
    58     class Gateway: public BCGateway {};
    5965}
    6066
    61 #endif /* BCGATEWAY_H_ */
     67#endif /* SWISSCOMXTRAZONE_BCGATEWAY_H_ */
  • gateways/SwisscomXtraZone/src/main.cpp

    r26 r42  
    11#include "main.h"
     2
     3#include <QtPlugin>
    24
    35#include "business/BCGateway.h"
    46
    5 class LibraryImpl {
    6 public:
    7     IGateway* getGateway();
    8 };
     7namespace SwisscomXtraZone {
    98
    10 IGateway* LibraryImpl::getGateway() {
     9/*ILibrary* Library::instance_ = NULL;
     10ILibrary* Library::instance() {
     11    return instance_ ? instance_ : (instance_ = new Library);
     12}*/
     13
     14
     15QTranslator* Library::getTranslator(const QLocale& locale) {
     16    QTranslator* translator = new QTranslator();
     17    translator->load(locale.name(), ":/locale/");
     18    return translator;
     19}
     20
     21IGateway* Library::getGateway() const {
    1122    return BCGateway::instance();
    1223}
    1324
    14 
    15 
    16 ILibrary* Library::instance_ = NULL;
    17 ILibrary* Library::instance() {
    18     return instance_ ? instance_ : (instance_ = new Library);
    19 }
    20 
    21 Library::Library() {
    22     library_ = new LibraryImpl();
    23 }
    24 
    25 Library::~Library() {
    26     delete library_;
    27 }
    28 
    29 IGateway* Library::getGateway() const {
    30     return library_->getGateway();
    3125}
    3226
    3327
    34 extern "C" {
     28/*extern "C" {
    3529    IMPORT_EXPORT
    3630    ILibrary* getLibrary(){
    3731        return Library::instance();
    3832    }
    39 }
     33}*/
    4034
     35Q_EXPORT_PLUGIN2(SwisscomXtraZone, SwisscomXtraZone::Library)
  • gateways/SwisscomXtraZone/src/main.h

    r26 r42  
    66 */
    77
    8 #ifndef MAIN_H_
    9 #define MAIN_H_
     8#ifndef SWISSCOMXTRAZONE_MAIN_H_
     9#define SWISSCOMXTRAZONE_MAIN_H_
    1010
    11 #include <QtCore/QtGlobal>
     11#include <QObject>
     12//#include <QtCore/QtGlobal>
    1213
    13 #if (defined(QT_DLL) || defined(QT_SHARED)) && !defined(QT_PLUGIN)
     14/*#if (defined(QT_DLL) || defined(QT_SHARED)) && !defined(QT_PLUGIN)
    1415#   define IMPORT_EXPORT Q_DECL_EXPORT
    1516#else
    1617#   define IMPORT_EXPORT Q_DECL_IMPORT
    17 #endif
     18#endif*/
    1819
    1920
     
    2122#include <igateway.h>
    2223
    23 class LibraryImpl;
     24namespace SwisscomXtraZone {
    2425
    25 class Library: public ILibrary {
     26class Library: public QObject, public ILibrary {
     27    Q_OBJECT
     28    Q_INTERFACES(ILibrary)
     29
    2630public:
    27     static ILibrary* instance();
     31    Library(){}
     32//    static ILibrary* instance();
    2833
     34    virtual QTranslator* getTranslator(const QLocale& locale);
    2935    IGateway* getGateway() const;
    3036
    31 protected:
    32     Library();
    33     virtual ~Library();
     37//protected:
    3438
    3539private:
    36     static ILibrary* instance_;
    37     LibraryImpl* library_;
     40    Q_DISABLE_COPY(Library);
    3841};
    3942
    40 extern "C" {
    41     IMPORT_EXPORT ILibrary* getLibrary();
    4243}
    4344
     45/*extern "C" {
     46    IMPORT_EXPORT ILibrary* getLibrary();
     47}*/
    4448
    45 #endif /* MAIN_H_ */
     49#endif /* SWISSCOMXTRAZONE_MAIN_H_ */
  • gateways/SwisscomXtraZone/src/persistence/DAAccountStorageOfficer.cpp

    r26 r42  
    77
    88#include "DAAccountStorageOfficer.h"
     9
     10namespace SwisscomXtraZone {
    911
    1012void DAAccountStorageOfficer::readFromStorage() {
     
    2527    }
    2628}
     29
     30}
  • gateways/SwisscomXtraZone/src/persistence/DAAccountStorageOfficer.h

    r26 r42  
    66 */
    77
    8 #ifndef DAACCOUNTSTORAGEOFFICER_H_
    9 #define DAACCOUNTSTORAGEOFFICER_H_
     8#ifndef SWISSCOMXTRAZONE_DAACCOUNTSTORAGEOFFICER_H_
     9#define SWISSCOMXTRAZONE_DAACCOUNTSTORAGEOFFICER_H_
    1010
    1111#include <AbstractLoginAccountStorageOfficer.h>
    1212
     13namespace SwisscomXtraZone {
     14
    1315class DAAccountStorageOfficer: public AbstractLoginAccountStorageOfficer {
     16    Q_OBJECT
     17
    1418public:
    1519    DAAccountStorageOfficer(ILoginAccount* account, ISQLiteStorage* storage)
    16         : AbstractLoginAccountStorageOfficer(account, storage)
     20        : AbstractLoginAccountStorageOfficer(account, storage, "sdo2o0034_k!Qdoc0DiwnfDaLdY<ymWWpovDmwpovDö__dmkosadDLDd.:easdfDSs")
    1721    {};
    1822
     
    2125};
    2226
    23 #endif /* DAACCOUNTSTORAGEOFFICER_H_ */
     27}
     28
     29#endif /* SWISSCOMXTRAZONE_DAACCOUNTSTORAGEOFFICER_H_ */
  • gateways/SwisscomXtraZone/src/ui/vcsettingswidget.cpp

    r37 r42  
    77
    88#include "../business/BCAccount.h"
     9
     10namespace SwisscomXtraZone {
    911
    1012VCSettingsWidget::VCSettingsWidget(QWidget* parent /* = 0 */)
     
    4749
    4850     if (username.contains(QRegExp("[^\\d]")) || (username.length() != 10)) {
    49          errorMsg += QWidget::tr("The mobile number should be of the form 0791234567.") + "\n";
     51         errorMsg += tr("The mobile number should be of the form 0791234567.") + "\n";
    5052     }
    5153
    5254     if (password.isEmpty()) {
    53          errorMsg += QWidget::tr("Your password can't be empty.") + "\n";
     55         errorMsg += tr("Your password can't be empty.") + "\n";
    5456     }
    5557
     
    5759
    5860     if (errorMsg != "") {
    59          QMessageBox::warning(this, QWidget::tr("Swisscom Xtra Zone Account"), errorMsg, QMessageBox::Ok, QMessageBox::Ok);
     61         QMessageBox::warning(this, tr("Swisscom Xtra Zone Account"), errorMsg, QMessageBox::Ok, QMessageBox::Ok);
    6062     }
    6163     return errorMsg == "";
    6264}
     65
     66}
  • gateways/SwisscomXtraZone/src/ui/vcsettingswidget.h

    r36 r42  
    1 #ifndef VCSETTINGSWIDGETCOMP_H
    2 #define VCSETTINGSWIDGETCOMP_H
     1#ifndef SWISSCOMXTRAZONE_VCSETTINGSWIDGET_H
     2#define SWISSCOMXTRAZONE_VCSETTINGSWIDGET_H
    33
    44#include <QtGui/QWidget>
     
    77#include <iaccountsettingswidget.h>
    88
     9namespace SwisscomXtraZone {
     10
    911class VCSettingsWidget : public IAccountSettingsWidget {
    1012    Q_OBJECT
     13    Q_INTERFACES(IAccountSettingsWidget)
    1114
    1215public:
     
    2427};
    2528
    26 #endif // VCSETTINGSWIDGETCOMP_H
     29}
     30
     31#endif // SWISSCOMXTRAZONE_VCSETTINGSWIDGETCOMP_H
  • gateways/SwisscomXtraZone/src/ui/vcsettingswidget.ui

    r36 r42  
    1212  </property>
    1313  <property name="windowTitle">
    14    <string>VCSettingsWidget</string>
     14   <string notr="true"/>
    1515  </property>
    1616  <layout class="QFormLayout" name="formLayout">
  • gateways/SwisscomXtraZone/ui_vcsettingswidget.h

    r37 r42  
    22** Form generated from reading ui file 'vcsettingswidget.ui'
    33**
    4 ** Created: Thu Dec 3 22:16:02 2009
     4** Created: Thu Jan 14 08:55:41 2010
    55**      by: Qt User Interface Compiler version 4.5.2
    66**
     
    3737            VCSettingsWidgetClass->setObjectName(QString::fromUtf8("VCSettingsWidgetClass"));
    3838        VCSettingsWidgetClass->resize(400, 76);
     39        VCSettingsWidgetClass->setWindowTitle(QString::fromUtf8(""));
    3940        formLayout = new QFormLayout(VCSettingsWidgetClass);
    4041        formLayout->setSpacing(6);
     
    7071    void retranslateUi(QWidget *VCSettingsWidgetClass)
    7172    {
    72         VCSettingsWidgetClass->setWindowTitle(QApplication::translate("VCSettingsWidgetClass", "VCSettingsWidget", 0, QApplication::UnicodeUTF8));
    7373        label->setText(QApplication::translate("VCSettingsWidgetClass", "Mobile number:", 0, QApplication::UnicodeUTF8));
    7474        label_2->setText(QApplication::translate("VCSettingsWidgetClass", "Password:", 0, QApplication::UnicodeUTF8));
  • locale/de.ts

    r36 r42  
    6161    </message>
    6262    <message>
    63         <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="294"/>
    64         <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="311"/>
     63        <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="285"/>
     64        <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="302"/>
    6565        <source>SMSSender</source>
    6666        <translation>SMSSender</translation>
    6767    </message>
    6868    <message>
    69         <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="295"/>
     69        <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="286"/>
    7070        <source>Do you really want to remove this contact?</source>
    7171        <translation>Soll dieser Kontakt wirklich gelöscht werden?</translation>
    7272    </message>
    7373    <message>
    74         <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="312"/>
     74        <location filename="../src/ui/VCAddressBook/vcaddressbook.cpp" line="303"/>
    7575        <source>Do you really want to remove this group?</source>
    7676        <translation>Soll diese Gruppe wirklich gelöscht werden?</translation>
     
    126126        <source>Members</source>
    127127        <translation>Mitglied</translation>
     128    </message>
     129</context>
     130<context>
     131    <name>VCEditAccount</name>
     132    <message>
     133        <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="93"/>
     134        <source>This account name is already in use.</source>
     135        <translation>Dieser Kontonamen existiert bereits.       </translation>
     136    </message>
     137    <message>
     138        <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="103"/>
     139        <location filename="../src/ui/VCEditAccount/vceditaccount.cpp" line="108"/>
     140        <source>SMSSender</source>
     141        <translation>SMSSender</translation>
     142    </message>
     143</context>
     144<context>
     145    <name>VCEditAccountClass</name>
     146    <message>
     147        <location filename="../src/ui/VCEditAccount/vceditaccount.ui" line="14"/>
     148        <source>Edit account</source>
     149        <translation>Konto bearbeiten</translation>
     150    </message>
     151    <message>
     152        <location filename="../src/ui/VCEditAccount/vceditaccount.ui" line="26"/>
     153        <source>Account information</source>
     154        <translation>Kontoinformationen</translation>
     155    </message>
     156    <message>
     157        <location filename="../src/ui/VCEditAccount/vceditaccount.ui" line="32"/>
     158        <source>Name:</source>
     159        <translation>Name:</translation>
     160    </message>
     161    <message>
     162        <location filename="../src/ui/VCEditAccount/vceditaccount.ui" line="42"/>
     163        <source>Gateway:</source>
     164        <translation>Dienst:</translation>
     165    </message>
     166    <message>
     167        <location filename="../src/ui/VCEditAccount/vceditaccount.ui" line="62"/>
     168        <source>Account settings</source>
     169        <translation>Kontoeinstellungen</translation>
    128170    </message>
    129171</context>
     
    219261    <name>VCEditGroup</name>
    220262    <message>
    221         <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="65"/>
     263        <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="62"/>
    222264        <source>Change icon</source>
    223265        <translation>Bild ändern</translation>
    224266    </message>
    225267    <message>
    226         <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="71"/>
     268        <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="68"/>
    227269        <source>Remove icon</source>
    228270        <translation>Bild entfernen</translation>
    229271    </message>
    230272    <message>
    231         <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="110"/>
     273        <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="107"/>
    232274        <source>Images</source>
    233275        <translation>Bilder</translation>
    234276    </message>
    235277    <message>
    236         <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="117"/>
     278        <location filename="../src/ui/VCEditGroup/vceditgroup.cpp" line="114"/>
    237279        <source>Open File</source>
    238280        <translation>Datei öffnen</translation>
     
    275317</context>
    276318<context>
     319    <name>VCMain</name>
     320    <message>
     321        <location filename="../src/ui/VCMain/vcmain.cpp" line="281"/>
     322        <source>SMS sent</source>
     323        <translation>SMS versandt</translation>
     324    </message>
     325    <message>
     326        <location filename="../src/ui/VCMain/vcmain.cpp" line="281"/>
     327        <source>Your sms has successfully been sent.</source>
     328        <translation>Die SMS wurde gesendet.</translation>
     329    </message>
     330    <message>
     331        <location filename="../src/ui/VCMain/vcmain.cpp" line="360"/>
     332        <source>Error occured</source>
     333        <translation>Fehler aufgetreten</translation>
     334    </message>
     335    <message>
     336        <location filename="../src/ui/VCMain/vcmain.cpp" line="360"/>
     337        <source>An unknown error has occured!</source>
     338        <translation>Ein unbekannter Fehler ist aufgetreten!</translation>
     339    </message>
     340</context>
     341<context>
    277342    <name>VCMainClass</name>
    278343    <message>
     
    317382    </message>
    318383    <message>
    319         <location filename="../src/ui/VCMain/vcmain.ui" line="244"/>
     384        <location filename="../src/ui/VCMain/vcmain.ui" line="245"/>
    320385        <source>&amp;Help</source>
    321386        <translation>&amp;Hilfe</translation>
    322387    </message>
    323388    <message>
    324         <location filename="../src/ui/VCMain/vcmain.ui" line="250"/>
     389        <location filename="../src/ui/VCMain/vcmain.ui" line="251"/>
    325390        <source>&amp;Edit</source>
    326391        <translation>&amp;Bearbeiten</translation>
    327392    </message>
    328393    <message>
    329         <location filename="../src/ui/VCMain/vcmain.ui" line="268"/>
     394        <location filename="../src/ui/VCMain/vcmain.ui" line="269"/>
    330395        <source>&amp;Exit</source>
    331396        <translation>&amp;Beenden</translation>
    332397    </message>
    333398    <message>
    334         <location filename="../src/ui/VCMain/vcmain.ui" line="277"/>
     399        <location filename="../src/ui/VCMain/vcmain.ui" line="278"/>
    335400        <source>&amp;About</source>
    336401        <translation>Ü&amp;ber</translation>
    337402    </message>
    338403    <message>
    339         <location filename="../src/ui/VCMain/vcmain.ui" line="286"/>
     404        <location filename="../src/ui/VCMain/vcmain.ui" line="287"/>
    340405        <source>Prefere&amp;nces</source>
    341406        <translation>&amp;Einstellungen</translation>
    342407    </message>
    343408    <message>
    344         <location filename="../src/ui/VCMain/vcmain.ui" line="295"/>
     409        <location filename="../src/ui/VCMain/vcmain.ui" line="296"/>
    345410        <source>&amp;Accounts</source>
    346411        <translation>&amp;Konten</translation>
    347412    </message>
    348413    <message>
    349         <location filename="../src/ui/VCMain/vcmain.ui" line="304"/>
     414        <location filename="../src/ui/VCMain/vcmain.ui" line="305"/>
    350415        <source>Address &amp;Book</source>
    351416        <translation>&amp;Adressbuch</translation>
     417    </message>
     418    <message>
     419        <location filename="../src/ui/VCMain/vcmain.ui" line="314"/>
     420        <source>&amp;New message</source>
     421        <translation>&amp;Neue Mitteilung</translation>
    352422    </message>
    353423</context>
  • smssender.pro

    r36 r42  
    11VERSION = 3.0.0
    2 INCLUDEPATH += app \
    3     lib/libinterfaces/src/business \
    4     lib/libinterfaces/src/
     2CONFIG += qt \
     3    thread \
     4    debug_and_release
     5TARGET = smssender-bin
     6QT += core \
     7    gui
    58LIBS += -Llib/
    69LIBS += -ltntdb \
    710    -lcrypto++ \
    8     -linterfaces
    9 CONFIG += qt \
    10     thread \
    11     debug
    12 
    13 # CONFIG += link_pkgconfig
    14 # PKGCONFIG = glibmm-2.4
    15 TARGET = smssender-bin
    16 QT += core \
    17     gui
    18 HEADERS += src/ui/VCEditAccount/vceditaccount.h \
     11    -ldatatypes \
     12    -linterfaces \
     13    -lutils
     14INCLUDEPATH += app \
     15    lib/libinterfaces/src/business \
     16    lib/libinterfaces/src/exceptions \
     17    lib/libinterfaces/src \
     18    lib/libdatatypes/src/business \
     19    lib/libutils/src
     20HEADERS += 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 \   
     25    src/ui/VCEditAccount/vceditaccount.h \
    1926    src/ui/VCAccountList/vcaccountlist.h \
    2027    src/business/BCAccountLoadThread.h \
     
    2633    src/business/BCLibraryLoader.h \
    2734    src/ui/VCEditGroup/vceditgroup.h \
    28     src/business/BCGroup.h \
    2935    src/persistence/DAGroupManager.h \
    3036    src/business/BCGroupManager.h \
    31     src/business/BCBinary.h \
    3237    src/ui/UIHelper.h \
    3338    src/ui/VCEditContact/vceditcontact.h \
    3439    src/persistence/DASettings.h \
    35     src/utils/strutils.h \
    36     src/business/BCNumber.h \
    3740    src/ui/VCAddressBook/vcaddressbook.h \
    38     src/utils/typeconvert.h \
    3941    src/business/BCContactManager.h \
    40     src/business/BCContact.h \
    4142    src/business/BusinessFactory.h \
    42     src/business/BCShortcut.h \
    4343    src/persistence/storage/DASQLiteStorage.h \
    4444    src/persistence/DAContactManager.h \
     
    4646    src/persistence/PersistenceFactory.h \
    4747    src/ui/VCMain/vcmain.h \
    48     src/ui/VCSettings/vcsettings.h \
    49     src/exceptions/LibraryExceptions.h \
    50     src/exceptions/HttpExceptions.h \
    51     src/exceptions/StdExceptions.h \
    52     src/exceptions/StorageExceptions.h
    53 SOURCES += src/ui/VCEditAccount/vceditaccount.cpp \
     48    src/ui/VCSettings/vcsettings.h
     49SOURCES += 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 \
     54    src/ui/VCEditAccount/vceditaccount.cpp \
    5455    src/ui/VCAccountList/vcaccountlist.cpp \
    5556    src/business/BCAccountLoadThread.cpp \
     
    6162    src/business/BCLibraryLoader.cpp \
    6263    src/ui/VCEditGroup/vceditgroup.cpp \
    63     src/business/BCGroup.cpp \
    6464    src/persistence/DAGroupManager.cpp \
    6565    src/business/BCGroupManager.cpp \
    66     src/utils/strutils.cpp \
    67     src/business/BCBinary.cpp \
    6866    src/ui/UIHelper.cpp \
    6967    src/ui/VCEditContact/vceditcontact.cpp \
    7068    src/persistence/DASettings.cpp \
    71     src/business/BCNumber.cpp \
    7269    src/ui/VCAddressBook/vcaddressbook.cpp \
    7370    src/business/BCContactManager.cpp \
    74     src/business/BCContact.cpp \
    7571    src/business/BusinessFactory.cpp \
    76     src/business/BCShortcut.cpp \
    7772    src/persistence/storage/DASQLiteStorage.cpp \
    7873    src/business/BCSettings.cpp \
  • src/main.cpp

    r36 r42  
    77
    88#include <QString>
     9#include <QtPlugin>
    910
    1011#include "business/BCSettings.h"
    1112#include "business/BCAccountManager.h"
    1213#include "business/BCGatewayManager.h"
     14#include "business/BCLibraryLoader.h"
    1315
     16//Q_IMPORT_PLUGIN(interfaces)
    1417
    1518void loadGateways() {
    1619    // TODO: Exception handling
    17     BCGatewayManager::instance()->loadGatewaysFromLibraryPath("./gateways/");
     20    QDir gatewayPath(qApp->applicationDirPath());
     21    #if defined(Q_OS_WIN)
     22        if (gatewayPath.dirName().toLower() == "debug" || gatewayPath.dirName().toLower() == "release")
     23            gatewayPath.cdUp();
     24    #elif defined(Q_OS_MAC)
     25        if (gatewayPath.dirName() == "MacOS") {
     26            gatewayPath.cdUp();
     27            gatewayPath.cdUp();
     28            gatewayPath.cdUp();
     29        }
     30    #endif
     31    gatewayPath.cd("gateways");
     32
     33    BCGatewayManager::instance()->loadGatewaysFromLibraryPath(gatewayPath);
    1834}
    1935
     
    2137    // TODO: Exception handling
    2238    BCAccountManager::instance()->readAccountsFromStorage();
    23     // TODO: (DEBUG_ONLY -> reenable) BCAccountManager::instance()->accountLoadManager()->loadAccounts(BCAccountManager::instance()->getAccountList());
     39    BCAccountManager::instance()->accountLoadManager()->loadAccounts(BCAccountManager::instance()->getAccountList());
    2440}
    2541
     
    6278
    6379    loadGateways();
     80
     81    foreach (ILibrary* library, BCLibraryLoader::instance()->libraries()) {
     82        QTranslator* translator = library->getTranslator(locale);
     83        if (!translator->isEmpty()){
     84            a.installTranslator(translator);
     85        }
     86    }
     87
    6488    loadAccounts();
    65 
    6689
    6790    return a.exec();
  • src/persistence/DAAccountManager.cpp

    r33 r42  
    1616
    1717
    18 IAccount* DAAccountManager::getAccount(const int& accountId){
     18IAccount* DAAccountManager::getAccount(int accountId){
    1919    return DASQLiteAccountListManager::instance()->getAccount(accountId);
    2020}
  • src/persistence/DAAccountManager.h

    r33 r42  
    99#define DAACCOUNTMANAGER_H_
    1010
     11#include <QObject>
    1112#include <QSet>
    1213
     
    1617#include <persistence/istorage.h>
    1718
    18 class DAAccountManager : public IAccountManager {
     19class DAAccountManager: public QObject, public IAccountManager {
     20    Q_OBJECT
     21    Q_INTERFACES(IAccountManager)
     22
    1923public:
    2024    static DAAccountManager* instance();
    2125
    22     virtual IAccount*        getAccount(const int& accountId);
     26    virtual IAccount*        getAccount(int accountId);
    2327    virtual QSet<IAccount*>  getAccountList();
    2428
  • src/persistence/DAContactManager.cpp

    r36 r42  
    1616
    1717
    18 IContact* DAContactManager::getContact(const int& contactId){
     18IContact* DAContactManager::getContact(int contactId){
    1919    return getStorage()->readContact(contactId);
    2020}
     
    3434}
    3535
    36 void DAContactManager::removeContact(const int& contactId){
     36void DAContactManager::removeContact(int contactId){
    3737    getStorage()->removeContact(contactId);
    3838}
  • src/persistence/DAContactManager.h

    r36 r42  
    99#define DACONTACTMANAGER_H_
    1010
     11#include <QObject>
     12
    1113#include <persistence/icontactmanager.h>
    1214#include <persistence/istorage.h>
    1315
    14 class DAContactManager : public IContactManager {
     16class DAContactManager: public QObject, public IContactManager {
     17    Q_OBJECT
     18    Q_INTERFACES(IContactManager)
     19
    1520public:
    1621    static DAContactManager* instance();
    1722
    18     virtual IContact*            getContact(const int& contactId);
     23    virtual IContact*            getContact(int contactId);
    1924    virtual QMap<int, IContact*> getContactList();
    2025
    2126    virtual void saveContact(IContact* contact);
    2227    virtual void removeContact(IContact* contact);
    23     virtual void removeContact(const int& contactId);
     28    virtual void removeContact(int contactId);
    2429
    2530protected:
  • src/persistence/DAGroupManager.cpp

    r36 r42  
    1616
    1717
    18 IGroup* DAGroupManager::getGroup(const int& groupId){
     18IGroup* DAGroupManager::getGroup(int groupId){
    1919    return getStorage()->readGroup(groupId);
    2020}
     
    3434}
    3535
    36 void DAGroupManager::removeGroup(const int& groupId){
     36void DAGroupManager::removeGroup(int groupId){
    3737    getStorage()->removeGroup(groupId);
    3838}
  • src/persistence/DAGroupManager.h

    r36 r42  
    99#define DAGROUPMANAGER_H_
    1010
     11#include <QObject>
     12
    1113#include <persistence/igroupmanager.h>
    1214#include <persistence/istorage.h>
    1315
    14 class DAGroupManager : public IGroupManager {
     16class DAGroupManager: public QObject, public IGroupManager {
     17    Q_OBJECT
     18    Q_INTERFACES(IGroupManager)
     19
    1520public:
    1621    static DAGroupManager* instance();
    1722
    18     virtual IGroup*            getGroup(const int& groupId);
     23    virtual IGroup*            getGroup(int groupId);
    1924    virtual QMap<int, IGroup*> getGroupList();
    2025
    2126    virtual void saveGroup(IGroup* group);
    2227    virtual void removeGroup(IGroup* group);
    23     virtual void removeGroup(const int& groupId);
     28    virtual void removeGroup(int groupId);
    2429
    2530protected:
  • src/persistence/DASettings.cpp

    r37 r42  
    9292}
    9393
    94 void DASettings::setCheckForUpdates(const bool& checkForUpdates){
     94void DASettings::setCheckForUpdates(bool checkForUpdates){
    9595    getStorage()->writeBool("", "checkForUpdates", checkForUpdates);
    9696}
    9797
    98 void DASettings::setAddSuffix(const bool& addSuffix){
     98void DASettings::setAddSuffix(bool addSuffix){
    9999    getStorage()->writeBool("", "addSuffix", addSuffix);
    100100}
     
    108108}
    109109
    110 void DASettings::setShowSentConfirmation(const bool& showSentConfirmation){
     110void DASettings::setShowSentConfirmation(bool showSentConfirmation){
    111111    getStorage()->writeBool("", "showSentConfirmation", showSentConfirmation);
    112112}
    113113
    114114
    115 void DASettings::setProxyEnabled(const bool& enabled){
     115void DASettings::setProxyEnabled(bool enabled){
    116116    getStorage()->writeBool("proxy", "enabled", enabled);
    117117}
     
    121121}
    122122
    123 void DASettings::setProxyPort(const int& port){
     123void DASettings::setProxyPort(int port){
    124124    getStorage()->writeInt("proxy", "port", port);
    125125}
    126126
    127 void DASettings::setProxyAuthEnabled(const bool& enabled){
     127void DASettings::setProxyAuthEnabled(bool enabled){
    128128    getStorage()->writeBool("proxy", "authEnabled", enabled);
    129129}
  • src/persistence/DASettings.h

    r37 r42  
    99#define DASETTINGS_H_
    1010
     11#include <QObject>
     12
    1113#include <persistence/isettings.h>
    1214#include <persistence/istorage.h>
    1315
    14 class DASettings : public ISettings {
     16class DASettings: public QObject, public ISettings {
     17    Q_OBJECT
     18    Q_INTERFACES(ISettings)
     19
    1520public:
    1621    DASettings()
     
    4348        virtual void setLocale(const QLocale& locale);
    4449
    45         virtual void setCheckForUpdates(const bool& checkForUpdates);
    46         virtual void setAddSuffix(const bool& addSuffix);
     50        virtual void setCheckForUpdates(bool checkForUpdates);
     51        virtual void setAddSuffix(bool addSuffix);
    4752        virtual void setSMSSuffix(const QString& smsSuffix);
    4853        virtual void setActiveAccountId(const QString& accountId);
    49         virtual void setShowSentConfirmation(const bool& showSentConfirmation);
     54        virtual void setShowSentConfirmation(bool showSentConfirmation);
    5055
    51         virtual void setProxyEnabled(const bool& enabled);
     56        virtual void setProxyEnabled(bool enabled);
    5257        virtual void setProxyHost(const QString& host);
    53         virtual void setProxyPort(const int& port);
    54     virtual void setProxyAuthEnabled(const bool& enabled);
     58        virtual void setProxyPort(int port);
     59    virtual void setProxyAuthEnabled(bool enabled);
    5560        virtual void setProxyUsername(const QString& username);
    5661        virtual void setProxyPassword(const QString& password);
  • src/persistence/PersistenceFactory.h

    r33 r42  
    99#define PERSISTENCEFACTORY_H_
    1010
     11#include <QObject>
     12
    1113#include <persistence/iaccountmanager.h>
    1214#include <persistence/icontactmanager.h>
     
    1517#include <persistence/istorage.h>
    1618
    17 class PersistenceFactory {
     19class PersistenceFactory: public QObject {
     20    Q_OBJECT
    1821
    1922public:
  • src/persistence/storage/DASQLiteAccountListManager.cpp

    r36 r42  
    1111
    1212#include <igateway.h>
     13#include <StorageExceptions.h>
     14#include <typeconvert.h>
    1315
    1416#include "../../business/BCGatewayManager.h"
    15 
    16 #include "../../utils/typeconvert.h"
    17 #include "../../exceptions/StorageExceptions.h"
    1817
    1918#include "DASQLiteStorage.h"
     
    2524
    2625
    27 IAccount* DASQLiteAccountListManager::getAccount(const int& accountId, const bool& skeletonOnly /* = false */) {
     26IAccount* DASQLiteAccountListManager::getAccount(int accountId, bool skeletonOnly /* = false */) {
    2827    tntdb::Result res = storage()->connection().select(s("SELECT type "
    2928                                                           "FROM t_accounts "
     
    3433
    3534    IGateway* gateway = BCGatewayManager::instance()->getGateway(QString::fromStdString(res.getRow(0).getString("type")));
     35
     36    // TODO: What if this gateway is NULL (is not loaded)?
    3637    gateway->setDefaultStorage(storage());
     38
    3739    IAccount* account = gateway->createAccountInstance();
    3840    account->setId(accountId);
     
    4547}
    4648
    47 QSet<IAccount*> DASQLiteAccountListManager::getAccountList(const bool& skeletonsOnly /* = false */) {
     49QSet<IAccount*> DASQLiteAccountListManager::getAccountList(bool skeletonsOnly /* = false */) {
    4850    QSet<IAccount*> accountList;
    4951
  • src/persistence/storage/DASQLiteAccountListManager.h

    r33 r42  
    99#define DASQLITEACCOUNTLISTMANAGER_H_
    1010
     11#include <QObject>
    1112#include <QSet>
    1213
     
    1516#include <persistence/isqlitestorage.h>
    1617
    17 class DASQLiteAccountListManager {
     18class DASQLiteAccountListManager: public QObject {
     19    Q_OBJECT
     20
    1821public:
    1922    static DASQLiteAccountListManager* instance();
    2023
    21     IAccount*       getAccount(const int& accountId, const bool& skeletonOnly = false);
    22     QSet<IAccount*> getAccountList(const bool& skeletonsOnly = false);
     24    IAccount*       getAccount(int accountId, bool skeletonOnly = false);
     25    QSet<IAccount*> getAccountList(bool skeletonsOnly = false);
    2326
    2427protected:
    2528    DASQLiteAccountListManager()
    26         : storage_(0)
     29        : storage_(NULL)
    2730    {};
    2831
  • src/persistence/storage/DASQLiteStorage.cpp

    r36 r42  
    88#include "DASQLiteStorage.h"
    99
    10 #include <iaccount.h>
    11 
    12 #include "../../business/BCContact.h"
    13 #include "../../business/BCBinary.h"
    14 #include "../../business/BCGroup.h"
    15 #include "../../business/BCSettings.h"
    16 #include "../../business/BCShortcut.h"
    17 
    18 #include "../../exceptions/StdExceptions.h"
    19 #include "../../exceptions/StorageExceptions.h"
    20 
    21 #include "../../utils/typeconvert.h"
    22 
    2310#include <crypto++/default.h>
    2411
     
    3118
    3219#include <QStringList>
     20
     21#include <iaccount.h>
     22
     23#include <StdExceptions.h>
     24#include <StorageExceptions.h>
     25
     26#include <BCContact.h>
     27#include <BCBinary.h>
     28#include <BCGroup.h>
     29#include <BCShortcut.h>
     30#include "../../business/BCSettings.h"
     31#include "../../business/BCContactManager.h"
     32
     33#include <typeconvert.h>
    3334
    3435DASQLiteStorage* DASQLiteStorage::instance_=0;
     
    7778}
    7879
    79 bool DASQLiteStorage::readBool(const QString& _namespace, const QString& key, const bool& defaultValue){
     80bool DASQLiteStorage::readBool(const QString& _namespace, const QString& key, bool defaultValue){
    8081    try{
    8182        return getSettingValue(_namespace, key).getBool();
     
    8889}
    8990
    90 int DASQLiteStorage::readInt(const QString& _namespace, const QString& key, const int& defaultValue){
     91int DASQLiteStorage::readInt(const QString& _namespace, const QString& key, int defaultValue){
    9192    try{
    9293        return getSettingValue(_namespace, key).getInt();
     
    153154
    154155
    155 IContact* DASQLiteStorage::readContact(const int& contactId){
     156IContact* DASQLiteStorage::readContact(int contactId){
    156157    IContact* contact = new BCContact();
    157158
     
    176177}
    177178
    178 IGroup* DASQLiteStorage::readGroup(const int& groupId){
     179IGroup* DASQLiteStorage::readGroup(int groupId){
    179180    IGroup* group = new BCGroup();
    180181
     
    190191        QStringList contactIds = contactIdsStr.split("\t", QString::SkipEmptyParts);
    191192        for (int x = 0; x < contactIds.size(); ++x){
    192             group->addContact(contactIds.at(x).toInt());
     193            IContact* contact = BCContactManager::instance()->getContact(contactIds.at(x).toInt());
     194            group->addContact(contact);
    193195        }
    194196
     
    205207}
    206208
    207 
    208 QMap<QString, IAccount*> DASQLiteStorage::readAccountList(){
    209 
    210 }
    211209
    212210QMap<int, IContact*> DASQLiteStorage::readContactList(){
     
    247245
    248246
    249 void DASQLiteStorage::writeBool(const QString& _namespace, const QString& key, const bool& value){
     247void DASQLiteStorage::writeBool(const QString& _namespace, const QString& key, bool value){
    250248    writeString(_namespace, key, to_string(value));
    251249}
    252250
    253 void DASQLiteStorage::writeInt(const QString& _namespace, const QString& key, const int& value){
     251void DASQLiteStorage::writeInt(const QString& _namespace, const QString& key, int value){
    254252    writeString(_namespace, key, to_string(value));
    255253}
     
    295293}
    296294
    297 void DASQLiteStorage::writeBlob(const QString& _namespace, const QString& key, const char* value, const int& size){
     295void DASQLiteStorage::writeBlob(const QString& _namespace, const QString& key, const char* value, int size){
    298296    tntdb::Blob blobValue(value, size);
    299297    tntdb::Statement statement = dbConnection_.prepare("INSERT OR REPLACE INTO t_settings (namespace, key, value) "
     
    365363    // Save the contacts of the group
    366364    QString contactIdsStr = "";
    367     QSetIterator<IContact*> i(group->contacts());
    368     while (i.hasNext()){
    369         contactIdsStr += to_string(i.next()->id()) + "\t";
     365    foreach (IContact* contact, group->contacts()) {
     366        contactIdsStr += to_string(contact->id()) + "\t";
    370367    }
    371368    contactIdsStr.resize(contactIdsStr.size() - 1); // Remove last "\t"
     
    390387
    391388
    392 void DASQLiteStorage::removeContact(const int& contactId){
     389void DASQLiteStorage::removeContact(int contactId){
    393390    // Remove the settings of the contact
    394391    removeValues("contact_" + contactId);
     
    399396}
    400397
    401 void DASQLiteStorage::removeGroup(const int& groupId){
     398void DASQLiteStorage::removeGroup(int groupId){
    402399    // Remove the settings of the group
    403400    dbConnection_.execute(s("DELETE FROM t_settings "
  • src/persistence/storage/DASQLiteStorage.h

    r36 r42  
    99#define DASQLITESTORAGE_H_
    1010
     11#include <QObject>
    1112#include <tntdb/connection.h>
    1213
    1314#include <persistence/isqlitestorage.h>
    1415
    15 class DASQLiteStorage: public ISQLiteStorage {
     16class DASQLiteStorage: public QObject, public ISQLiteStorage {
     17    Q_OBJECT
     18    Q_INTERFACES (ISQLiteStorage)
     19
    1620public:
    1721    static DASQLiteStorage* instance();
    1822
    1923    virtual IBinary*   readBlob(const QString& _namespace, const QString& key, const char* defaultValue = 0);
    20     virtual bool       readBool(const QString& _namespace, const QString& key, const bool& defaultValue = false);
    21     virtual int        readInt(const QString& _namespace, const QString& key, const int& defaultValue = 0);
     24    virtual bool       readBool(const QString& _namespace, const QString& key, bool defaultValue = false);
     25    virtual int        readInt(const QString& _namespace, const QString& key, int defaultValue = 0);
    2226    virtual QString    readString(const QString& _namespace, const QString& key, const QString& defaultValue = "");
    2327    virtual QString    readEncryptedString(const QString& _namespace, const QString& key, const QString& password, const QString& defaultValue = "");
    24     virtual IContact*  readContact(const int& contactId);
    25     virtual IGroup*    readGroup(const int& groupId);
     28    virtual IContact*  readContact(int contactId);
     29    virtual IGroup*    readGroup(int groupId);
    2630    virtual IShortcut* readShortcut(const QString& key);
    2731
    28     virtual QMap<QString, IAccount*> readAccountList();
    2932    virtual QMap<int, IContact*>     readContactList();
    3033    virtual QMap<int, IGroup*>       readGroupList();
    3134
    32     virtual void writeBlob(const QString& _namespace, const QString& key, const char* value, const int& size);
     35    virtual void writeBlob(const QString& _namespace, const QString& key, const char* value, int size);
    3336    virtual void writeBlob(const QString& _namespace, const QString& key, const IBinary& binary);
    34     virtual void writeBool(const QString& _namespace, const QString& key, const bool& value);
    35     virtual void writeInt(const QString& _namespace, const QString& key, const int& value);
     37    virtual void writeBool(const QString& _namespace, const QString& key, bool value);
     38    virtual void writeInt(const QString& _namespace, const QString& key, int value);
    3639    virtual void writeString(const QString& _namespace, const QString& key, const QString& value);
    3740    virtual void writeEncryptedString(const QString& _namespace, const QString& key, const QString& password, const QString& value);
     
    4447    virtual void removeValues(const QString& _namespace);
    4548
    46     virtual void removeContact(const int& contactId);
    47     virtual void removeGroup(const int& groupId);
     49    virtual void removeContact(int contactId);
     50    virtual void removeGroup(int groupId);
    4851
    4952    virtual tntdb::Connection  connection();
  • src/ui/VCAccountList/vcaccountlist.cpp

    r36 r42  
    11#include "vcaccountlist.h"
    22
     3#include <QtGui/QCheckBox>
    34#include <QtGui/QMessageBox>
    45
     
    1112#include "../../business/BusinessFactory.h"
    1213
    13 #include "../../utils/typeconvert.h"
     14#include <typeconvert.h>
    1415
    1516
    1617const int ACCOUNT_COL_INDEX_NAME    = 0;
    1718const int ACCOUNT_COL_INDEX_GATEWAY = 1;
     19const int ACCOUNT_COL_INDEX_ENABLED = 2;
    1820
    1921
     
    6264    tblAccounts->resizeColumnToContents(ACCOUNT_COL_INDEX_NAME);
    6365    tblAccounts->resizeColumnToContents(ACCOUNT_COL_INDEX_GATEWAY);
     66    tblAccounts->resizeColumnToContents(ACCOUNT_COL_INDEX_ENABLED);
    6467
    6568    on_tblAccounts_itemSelectionChanged();
     
    110113    cell = new QTableWidgetItem(account->gateway()->name());
    111114    tblAccounts->setItem(rowId, ACCOUNT_COL_INDEX_GATEWAY, cell);
     115
     116    /* Enabled */
     117    QCheckBox* cb = new QCheckBox(tblAccounts);
     118    cb->setChecked(account->isEnabled());
     119    //cell = new QTableWidgetItem();
     120    tblAccounts->setCellWidget(rowId, ACCOUNT_COL_INDEX_ENABLED, cb);
     121    //TODO: add click_handler that saves enabled to the account
    112122}
    113123
    114 IAccount* VCAccountList::getAccountFromRow(const int& rowId){
     124IAccount* VCAccountList::getAccountFromRow(int rowId){
    115125    QString name = ui.tblAccounts->item(rowId, ACCOUNT_COL_INDEX_NAME)->text();
    116126    return accountNameToAccount_[name];
  • src/ui/VCAccountList/vcaccountlist.h

    r36 r42  
    3030
    3131    QSet<IAccount*> getFilteredAccountList();
    32     IAccount* getAccountFromRow(const int& rowId);
     32    IAccount* getAccountFromRow(int rowId);
    3333    void editAccount(IAccount* account);
    3434
  • src/ui/VCAccountList/vcaccountlist.ui

    r36 r42  
    9696    </widget>
    9797   </item>
     98   <item row="2" column="4">
     99    <spacer name="verticalSpacer">
     100     <property name="orientation">
     101      <enum>Qt::Vertical</enum>
     102     </property>
     103     <property name="sizeType">
     104      <enum>QSizePolicy::Fixed</enum>
     105     </property>
     106     <property name="sizeHint" stdset="0">
     107      <size>
     108       <width>20</width>
     109       <height>3</height>
     110      </size>
     111     </property>
     112    </spacer>
     113   </item>
     114   <item row="3" column="0" colspan="4">
     115    <spacer name="horizontalSpacer_13">
     116     <property name="orientation">
     117      <enum>Qt::Horizontal</enum>
     118     </property>
     119     <property name="sizeHint" stdset="0">
     120      <size>
     121       <width>492</width>
     122       <height>20</height>
     123      </size>
     124     </property>
     125    </spacer>
     126   </item>
     127   <item row="3" column="4">
     128    <widget class="QPushButton" name="btnClose">
     129     <property name="minimumSize">
     130      <size>
     131       <width>92</width>
     132       <height>0</height>
     133      </size>
     134     </property>
     135     <property name="text">
     136      <string>Close</string>
     137     </property>
     138     <property name="icon">
     139      <iconset resource="../../../lib/resource.qrc">
     140       <normaloff>:/ico/close_cancel.png</normaloff>:/ico/close_cancel.png</iconset>
     141     </property>
     142    </widget>
     143   </item>
    98144   <item row="1" column="0" colspan="5">
    99145    <widget class="QTableWidget" name="tblAccounts">
     
    134180      <bool>false</bool>
    135181     </property>
    136      <attribute name="horizontalHeaderStretchLastSection">
    137       <bool>true</bool>
    138      </attribute>
    139182     <attribute name="verticalHeaderVisible">
    140183      <bool>false</bool>
     
    156199      </property>
    157200     </column>
    158     </widget>
    159    </item>
    160    <item row="2" column="4">
    161     <spacer name="verticalSpacer">
    162      <property name="orientation">
    163       <enum>Qt::Vertical</enum>
    164      </property>
    165      <property name="sizeType">
    166       <enum>QSizePolicy::Fixed</enum>
    167      </property>
    168      <property name="sizeHint" stdset="0">
    169       <size>
    170        <width>20</width>
    171        <height>3</height>
    172       </size>
    173      </property>
    174     </spacer>
    175    </item>
    176    <item row="3" column="0" colspan="4">
    177     <spacer name="horizontalSpacer_13">
    178      <property name="orientation">
    179       <enum>Qt::Horizontal</enum>
    180      </property>
    181      <property name="sizeHint" stdset="0">
    182       <size>
    183        <width>492</width>
    184        <height>20</height>
    185       </size>
    186      </property>
    187     </spacer>
    188    </item>
    189    <item row="3" column="4">
    190     <widget class="QPushButton" name="btnClose">
    191      <property name="minimumSize">
    192       <size>
    193        <width>92</width>
    194        <height>0</height>
    195       </size>
    196      </property>
    197      <property name="text">
    198       <string>Close</string>
    199      </property>
    200      <property name="icon">
    201       <iconset resource="../../../lib/resource.qrc">
    202        <normaloff>:/ico/close_cancel.png</normaloff>:/ico/close_cancel.png</iconset>
    203      </property>
     201     <column>
     202      <property name="text">
     203       <string>Enabled</string>
     204      </property>
     205      <property name="textAlignment">
     206       <set>AlignLeft|AlignVCenter</set>
     207      </property>
     208     </column>
    204209    </widget>
    205210   </item>
  • src/ui/VCAddressBook/vcaddressbook.cpp

    r37 r42  
    1313#include "../../business/BusinessFactory.h"
    1414
    15 #include "../../utils/typeconvert.h"
     15#include <typeconvert.h>
    1616
    1717
     
    5959    tblContacts->setSortingEnabled(false);
    6060
    61     QSetIterator<IContact*> i(getFilteredContactList());
    62     while (i.hasNext()){
    63         addContactTableRow(i.next());
     61    foreach (IContact* contact, getFilteredContactList()) {
     62        addContactTableRow(contact);
    6463    }
    6564    tblContacts->setSortingEnabled(sortingEnabled);
     
    7372}
    7473
    75 QSet<IContact*> VCAddressBook::getFilteredContactList(){
     74QList<IContact*> VCAddressBook::getFilteredContactList(){
    7675    if (actualContactFilterStr_ == ""){
    7776        return contactList_;
    7877    }
    7978
    80     QSet<IContact*> contactList;
    81 
    82     QSetIterator<IContact*> i(contactList_);
    83     while (i.hasNext()){
    84         IContact* contact = i.next();
    85 
     79    QList<IContact*> contactList;
     80
     81    foreach (IContact* contact, contactList_) {
    8682        bool containsFilter = false;
    8783
     
    107103
    108104        if (containsFilter){
    109             contactList.insert(contact);
     105            contactList.append(contact);
    110106        }
    111107    }
     
    143139}
    144140
    145 IContact* VCAddressBook::getContactFromRow(const int& rowId){
     141IContact* VCAddressBook::getContactFromRow(int rowId){
    146142    QString name = ui.tblContacts->item(rowId, CONTACT_COL_INDEX_NAME)->text();
    147143    return contactNameToContact_[name];
     
    178174    tblGroups->setSortingEnabled(false);
    179175
    180     QSetIterator<IGroup*> i(getFilteredGroupList());
    181     while (i.hasNext()){
    182         addGroupTableRow(i.next());
     176    foreach (IGroup* group, getFilteredGroupList()) {
     177        addGroupTableRow(group);
    183178    }
    184179    tblGroups->setSortingEnabled(sortingEnabled);
     
    191186}
    192187
    193 QSet<IGroup*> VCAddressBook::getFilteredGroupList(){
     188QList<IGroup*> VCAddressBook::getFilteredGroupList(){
    194189    if (actualGroupFilterStr_ == ""){
    195190        return groupList_;
    196191    }
    197192
    198     QSet<IGroup*> groupList;
    199     QSetIterator<IGroup*> i(groupList_);
    200     while (i.hasNext()){
    201         IGroup* group = i.next();
    202 
     193    QList<IGroup*> groupList;
     194    foreach (IGroup* group, groupList_) {
    203195        bool containsFilter = false;
    204196
     
    213205
    214206        if (containsFilter){
    215             groupList.insert(group);
     207            groupList.append(group);
    216208        }
    217209    }
     
    246238    /* Members */
    247239    QStringList memberNames;
    248     QSetIterator<IContact*> i(group->contacts());
    249     while (i.hasNext()){
    250         memberNames.append(i.next()->name());
     240    foreach (IContact* contact, group->contacts()) {
     241        memberNames.append(contact->name());
    251242    }
    252243    memberNames.sort(); // Sort the member names
     
    263254}
    264255
    265 IGroup* VCAddressBook::getGroupFromRow(const int& rowId){
     256IGroup* VCAddressBook::getGroupFromRow(int rowId){
    266257    QString name = ui.tblGroups->item(rowId, GROUP_COL_INDEX_NAME)->text();
    267258    return groupNameToGroup_[name];
  • src/ui/VCAddressBook/vcaddressbook.h

    r29 r42  
    66
    77#include <QMap>
    8 #include <QSet>
     8#include <QList>
    99
    1010#include <icontact.h>
     
    2020private:
    2121    Ui::VCAddressBookClass ui;
    22     QSet<IContact*> contactList_;
    23     QSet<IGroup*> groupList_;
     22    QList<IContact*> contactList_;
     23    QList<IGroup*> groupList_;
    2424    QMap<QString, IContact*> contactNameToContact_;
    2525    QMap<QString, IGroup*> groupNameToGroup_;
     
    3333    void addContactTableRow(IContact* contact);
    3434
    35     QSet<IContact*> getFilteredContactList();
    36     IContact* getContactFromRow(const int& rowId);
     35    QList<IContact*> getFilteredContactList();
     36    IContact* getContactFromRow(int rowId);
    3737    void editContact(IContact* contact);
    3838
     
    4242    void addGroupTableRow(IGroup* group);
    4343
    44     QSet<IGroup*> getFilteredGroupList();
    45     IGroup* getGroupFromRow(const int& rowId);
     44    QList<IGroup*> getFilteredGroupList();
     45    IGroup* getGroupFromRow(int rowId);
    4646    void editGroup(IGroup* group);
    4747
  • src/ui/VCEditAccount/vceditaccount.cpp

    r37 r42  
    11#include "vceditaccount.h"
    22
     3#include <QRegExp>
    34#include <QSet>
     5#include <QMessageBox>
    46
     7#include <ivalidationresult.h>
     8
     9#include "../../business/BCAccountManager.h"
    510#include "../../business/BCGatewayManager.h"
    611
     
    1015        ui.setupUi(this);
    1116
    12         accountSettingsWidget_ = NULL; // <--- why is this f*** pointer sometimes 0x00a0??? (ends with a seg. fault)
     17        account_               = NULL;
     18        accountSettingsWidget_ = NULL;
    1319        originalAccount_       = account;
    1420
    1521        ui.selGateway->clear();
    16         QSetIterator<IGateway*> i(BCGatewayManager::instance()->getGatewayList());
    17         while (i.hasNext()) {
    18             ui.selGateway->addItem(i.next()->name());
     22        foreach (IGateway* gateway, BCGatewayManager::instance()->getGatewayList()) {
     23            ui.selGateway->addItem(gateway->name());
    1924        }
    2025        ui.selGateway->setCurrentIndex(0);
     
    2429            setAccount(account);
    2530        }
    26 }
    27 
    28 VCEditAccount::~VCEditAccount(){
    29 
    3031}
    3132
     
    7273
    7374
    74 void VCEditAccount::on_selGateway_currentIndexChanged(int index) {
     75void VCEditAccount::on_selGateway_currentIndexChanged(int) {
    7576    IGateway* gateway = BCGatewayManager::instance()->getGateway(ui.selGateway->currentText());
    7677    setGateway(gateway);
    7778}
    7879
     80void VCEditAccount::saveToAccount(IAccount* account) const {
     81    account->setName(ui.edtName->text());
     82    accountSettingsWidget_->saveToAccount(account);
     83}
    7984
     85bool VCEditAccount::validate(bool suppressMessages /* = false */) {
     86    IAccount* validationAccount = account()->getClonedInstance();
     87    saveToAccount(validationAccount);
     88
     89    IValidationResult* validationResult = validationAccount->getValidator()->validate();
     90    delete validationAccount;
     91
     92    foreach (IAccount* acc, BCAccountManager::instance()->getAccountList()) {
     93        if ((acc != account()) && (acc->name().toLower() == account()->name().toLower())) {
     94            validationResult->addError(tr("This account name is already in use."));
     95            break;
     96        }
     97    }
     98
     99    switch (validationResult->validationType()) {
     100        case Error:
     101            if (!suppressMessages) {
     102                QMessageBox::critical(this, tr("SMSSender"), validationResult->getErrorString("\n"), QMessageBox::Ok, QMessageBox::Ok);
     103            }
     104            return false;
     105        case Warning:
     106            if (!suppressMessages) {
     107                QMessageBox::warning(this, tr("SMSSender"), validationResult->getWarningString("\n"), QMessageBox::Ok, QMessageBox::Ok);
     108            }
     109            return false;
     110        default:
     111            return true;
     112    }
     113
     114}
    80115
    81116void VCEditAccount::on_btnsNavigation_clicked(QAbstractButton* button){
    82    /* TODO: if (button == ui.btnsNavigation->button(QDialogButtonBox::Ok)){
     117    if (ui.btnsNavigation->standardButton(button) == QDialogButtonBox::Ok){
    83118        // TODO: validate (is this name / number already there?)
    84119        // TODO: implement exception handling...
     120        if (!validate()){
     121            return;
     122        }
    85123
    86 
    87 
     124        saveToAccount(account());
    88125
    89126        done(QDialog::Accepted);
     
    91128        setAccount(originalAccount_);
    92129        done(QDialog::Rejected);
    93     }*/
     130    }
    94131}
  • src/ui/VCEditAccount/vceditaccount.h

    r36 r42  
    1414public:
    1515    VCEditAccount(IAccount* account = NULL, QWidget* parent = 0);
    16     ~VCEditAccount();
     16    ~VCEditAccount(){};
    1717
    1818    IAccount* account();
    1919
    2020private slots:
    21     void on_selGateway_currentIndexChanged(int index);
     21    void on_selGateway_currentIndexChanged(int);
    2222
    2323    void on_btnsNavigation_clicked(QAbstractButton* button);
     
    3333    void setAccountSettingsWidget(IAccountSettingsWidget* widget);
    3434    void setGateway(IGateway* gateway);
     35
     36    void saveToAccount(IAccount* account) const;
     37    bool validate(bool suppressMessages = false);
    3538};
    3639
  • src/ui/VCEditAccount/vceditaccount.ui

    r36 r42  
    1212  </property>
    1313  <property name="windowTitle">
    14    <string>VCEditAccount</string>
     14   <string>Edit account</string>
    1515  </property>
    1616  <layout class="QGridLayout" name="gridLayout">
  • src/ui/VCEditContact/vceditcontact.cpp

    r29 r42  
    1414#include "../../business/BusinessFactory.h"
    1515
    16 #include "../../utils/typeconvert.h"
    17 #include "../../utils/strutils.h"
     16#include <typeconvert.h>
     17#include <strutils.h>
    1818
    1919VCEditContact::VCEditContact(IContact* contact, QWidget *parent) : QDialog(parent){
  • src/ui/VCEditGroup/vceditgroup.cpp

    r23 r42  
    2424    // Load member contacts
    2525    ui.lstMemberContacts->clear();
    26     QSet<IContact*> members = group->contacts();
    27     QSetIterator<IContact*> i(members);
    28     while (i.hasNext()){
    29         IContact* contact = i.next();
     26    QSet<IContact*> members = QSet<IContact*>::fromList(group->contacts());
     27    foreach (IContact* contact, members) {
    3028        ui.lstMemberContacts->addItem(contact->name());
    3129        contactNameToContact_.insert(contact->name(), contact);
     
    3533    // Load available contacts
    3634    ui.lstAvailableContacts->clear();
    37     QSet<IContact*> available = BCContactManager::instance()->getContactList();
     35    QSet<IContact*> available = QSet<IContact*>::fromList(BCContactManager::instance()->getContactList());
     36
    3837    available.subtract(members);
    39     i = QSetIterator<IContact*>(available);
    40     while (i.hasNext()){
    41         IContact* contact = i.next();
     38    foreach (IContact* contact, available) {
    4239        ui.lstAvailableContacts->addItem(contact->name());
    4340        contactNameToContact_.insert(contact->name(), contact);
     
    183180        group_->setName(ui.edtName->text());
    184181
    185         QSet<IContact*> contacts;
     182        QList<IContact*> contacts;
    186183        for (int x = 0; x < ui.lstMemberContacts->count(); ++x){
    187             contacts.insert(contactNameToContact_[ui.lstMemberContacts->item(x)->text()]);
     184            contacts.append(contactNameToContact_.value(ui.lstMemberContacts->item(x)->text()));
    188185        }
    189186        group_->setContacts(contacts);
  • src/ui/VCMain/vcmain.cpp

    r36 r42  
    33#include <QSortFilterProxyModel>
    44#include <QMessageBox>
     5
     6#include <QCompleter>
     7#include <QDebug>
    58
    69#include <algorithm>
     
    1013#include "../../business/BCGroupManager.h"
    1114
    12 #include "../../utils/typeconvert.h"
     15#include <typeconvert.h>
    1316
    1417#include "../UIHelper.h"
     
    1821#include "../VCSettings/vcsettings.h"
    1922
     23#include "../completers/aliascompleter.h"
     24
     25
    2026VCMain::VCMain(QWidget *parent) : QMainWindow(parent){
    2127        ui.setupUi(this);
    2228
    2329        contactListModel = new QStringListModel;
    24 
    25         QSortFilterProxyModel* proxy = new QSortFilterProxyModel;
     30        //contactListModel = new AliasModel;
     31
     32        QCompleter* completer = ui.lstContacts->completer();
     33        completer->setCompletionMode(QCompleter::PopupCompletion);
     34        completer->setCaseSensitivity(Qt::CaseInsensitive);
     35        completer->setModel(contactListModel);
     36
     37
     38    AliasCompletionModel* completionModel = new AliasCompletionModel(completer->model()->parent());
     39    completionModel->setSourceModel(contactListModel);
     40    AliasCompleter* aliasCompleter = new AliasCompleter(completionModel, completer->parent());
     41    aliasCompleter->setCompletionMode(QCompleter::PopupCompletion);
     42    aliasCompleter->setCaseSensitivity(Qt::CaseInsensitive);
     43
     44    ui.lstContacts->setCompleter(aliasCompleter);
     45/*    // Should this be in Qt by default?
     46    QAbstractItemView *popup = m_lineEditCompleter->popup();
     47    QListView *listView = qobject_cast<QListView*>(popup);
     48    if (listView) {
     49        // Urls are always LeftToRight
     50        listView->setLayoutDirection(Qt::LeftToRight);
     51        listView->setUniformItemSizes(true);
     52    }*/
     53
     54//      ui.lstContacts->setCompleter(completer);
     55
     56/*      QSortFilterProxyModel* proxy = new QSortFilterProxyModel;
    2657    proxy->setSourceModel(contactListModel);
    2758
    28     ui.lstContacts->setModel(proxy);
     59    ui.lstContacts->setModel(proxy);*/
    2960    ui.lstContacts->setEditable(true);
    30     ui.lstContacts->setCompleter(0);
    31 
    32     // When the edit text changes, use it to filter the proxy model.
    33     QObject::connect(ui.lstContacts, SIGNAL(editTextChanged(QString)),
    34                      proxy, SLOT(setFilterWildcard(QString)));
     61
    3562
    3663    QObject::connect(ui.lstContacts->lineEdit(), SIGNAL(returnPressed()),
     
    7097    QPixmap blankIcon = QPixmap(":/ico/blank.png");
    7198
    72     QSetIterator<IContact*> contacts(BCContactManager::instance()->getContactList());
    73     while (contacts.hasNext()){
    74         IContact* contact = contacts.next();
    75 
     99    foreach (IContact* contact, BCContactManager::instance()->getContactList()) {
    76100        QPixmap icon = QPixmap::fromImage(*UIHelper::BinaryToQImage(*contact->image()));
    77101        if (icon.isNull()){
     
    97121    }
    98122
    99     QSetIterator<IGroup*> groups(BCGroupManager::instance()->getGroupList());
    100     while (groups.hasNext()){
    101         IGroup* group = groups.next();
    102 
     123    foreach (IGroup* group, BCGroupManager::instance()->getGroupList()) {
    103124        QPixmap icon = QPixmap::fromImage(*UIHelper::BinaryToQImage(*group->image()));
    104125        if (icon.isNull()){
     
    168189}
    169190
    170 QSet<IContact*> VCMain::getRecipientContacts(const bool& withGroupContacts /* = true */) {
    171     QSet<IContact*> result;
     191QList<IContact*> VCMain::getRecipientContacts(bool withGroupContacts /* = true */) {
     192    QList<IContact*> result;
    172193    for (int x = 0; x < ui.treeRecipients->topLevelItemCount(); ++x){
    173194        if (isContactNode(ui.treeRecipients->topLevelItem(x))){
    174             result.insert(getContactOfNode(ui.treeRecipients->topLevelItem(x)));
     195            result.append(getContactOfNode(ui.treeRecipients->topLevelItem(x)));
    175196        } else if (withGroupContacts && isGroupNode(ui.treeRecipients->topLevelItem(x))) {
    176             result.unite(getGroupOfNode(ui.treeRecipients->topLevelItem(x))->contacts());
     197            result.append(getGroupOfNode(ui.treeRecipients->topLevelItem(x))->contacts());
    177198        }
    178199    }
     
    180201}
    181202
    182 QSet<IGroup*> VCMain::getRecipientGroups() {
    183     QSet<IGroup*> result;
     203QList<IGroup*> VCMain::getRecipientGroups() {
     204    QList<IGroup*> result;
    184205    for (int x = 0; x < ui.treeRecipients->topLevelItemCount(); ++x){
    185206        if (isGroupNode(ui.treeRecipients->topLevelItem(x))){
    186             result.insert(getGroupOfNode(ui.treeRecipients->topLevelItem(x)));
     207            result.append(getGroupOfNode(ui.treeRecipients->topLevelItem(x)));
    187208        }
    188209    }
     
    220241    nodeToGroup[node] = group;
    221242
    222     QSetIterator<IContact*> i(group->contacts());
    223     while (i.hasNext()){
    224         addRecipient(i.next(), node);
     243    foreach (IContact* contact, group->contacts()) {
     244        addRecipient(contact, node);
    225245    }
    226246}
     
    261281
    262282    accLst->clear();
    263     QSetIterator<IAccount*> i(BCAccountManager::instance()->getAccountListByLoadState(Loaded));
    264     while(i.hasNext()) {
    265         IAccount* account = i.next();
     283    foreach(IAccount* account, BCAccountManager::instance()->getAccountListByLoadState(Loaded)) {
    266284        accLst->addItem(account->name());
    267285        accountStrToAccount.insert(account->name(), account);
     
    280298
    281299
     300void VCMain::clearMessage() {
     301    ui.txtMessage->clear();
     302    ui.treeRecipients->clear();
     303    ui.txtMessage->setFocus();
     304}
     305
    282306void VCMain::sendMessage() {
    283     IAccount* account          = accountStrToAccount[ui.lstAccounts->currentText()];
    284     QString message            = ui.txtMessage->toPlainText().trimmed();
    285     QSet<IContact*> recipients = getRecipientContacts(true);
     307    IAccount* account           = accountStrToAccount[ui.lstAccounts->currentText()];
     308    QString message             = ui.txtMessage->toPlainText().trimmed();
     309    QList<IContact*> recipients = getRecipientContacts(true);
    286310
    287311    account->sendSMS(message, recipients);
    288     QMessageBox::information(this, "SMS sent", "Your sms has successfully been sent.", QMessageBox::Ok, QMessageBox::Ok);
     312    QMessageBox::information(this, tr("SMS sent"), tr("Your sms has successfully been sent."), QMessageBox::Ok, QMessageBox::Ok);
    289313}
    290314
     
    310334    }
    311335    ui.lstContacts->setCurrentIndex(-1);
     336    ui.lstContacts->clearEditText();
    312337    enableSendBtnIfAllFilled();
    313338}
     
    322347
    323348
     349/* File menu */
     350
     351void VCMain::on_actionNewMessage_activated() {
     352    clearMessage();
     353}
     354
    324355/* Edit menu */
    325356
     
    365396
    366397void VCMain::on_accountLoadingFailed(IAccount* account, EException* exception) {
    367     QMessageBox::critical(this, "Error occured", "An unknown error has occured!\n\n" + QString(exception->what()), QMessageBox::Ok, QMessageBox::Ok);
     398    QMessageBox::critical(this, tr("Error occured"), tr("An unknown error has occured!") + "\n\n" + QString(exception->what()), QMessageBox::Ok, QMessageBox::Ok);
    368399    reloadAccountList();
    369400}
  • src/ui/VCMain/vcmain.h

    r36 r42  
    5050    void            removeNode(QTreeWidgetItem* node);
    5151
    52     QSet<IContact*> getRecipientContacts(const bool& withGroupContacts = true);
    53     QSet<IGroup*>   getRecipientGroups();
     52    QList<IContact*> getRecipientContacts(bool withGroupContacts = true);
     53    QList<IGroup*>   getRecipientGroups();
    5454
    5555    void reloadAccountList();
    5656    void enableSendBtnIfAllFilled();
    5757
     58    void clearMessage();
    5859    void sendMessage();
    5960
     
    6869    void on_selAccounts_currentIndexChanged(int index);
    6970
     71    void on_actionNewMessage_activated();
     72
    7073    void on_actionAccounts_activated();
    7174    void on_actionAddressBook_activated();
  • src/ui/VCMain/vcmain.ui

    r36 r42  
    8585            <bool>true</bool>
    8686           </property>
    87            <property name="currentIndex">
    88             <number>-1</number>
    89            </property>
    9087           <property name="insertPolicy">
    9188            <enum>QComboBox::NoInsert</enum>
     
    231228     <y>0</y>
    232229     <width>750</width>
    233      <height>25</height>
     230     <height>24</height>
    234231    </rect>
    235232   </property>
     
    238235     <string>&amp;File</string>
    239236    </property>
     237    <addaction name="actionNewMessage"/>
    240238    <addaction name="actionExit"/>
    241239   </widget>
     
    268266    <string>&amp;Exit</string>
    269267   </property>
     268   <property name="menuRole">
     269    <enum>QAction::QuitRole</enum>
     270   </property>
    270271  </action>
    271272  <action name="actionAbout">
     
    277278    <string>&amp;About</string>
    278279   </property>
     280   <property name="shortcutContext">
     281    <enum>Qt::WidgetWithChildrenShortcut</enum>
     282   </property>
     283   <property name="menuRole">
     284    <enum>QAction::AboutRole</enum>
     285   </property>
    279286  </action>
    280287  <action name="actionPreferences">
     
    286293    <string>Prefere&amp;nces</string>
    287294   </property>
     295   <property name="menuRole">
     296    <enum>QAction::PreferencesRole</enum>
     297   </property>
    288298  </action>
    289299  <action name="actionAccounts">
     
    303313   <property name="text">
    304314    <string>Address &amp;Book</string>
     315   </property>
     316  </action>
     317  <action name="actionNewMessage">
     318   <property name="icon">
     319    <iconset resource="../../../lib/resource.qrc">
     320     <normaloff>:/ico/sms_new.png</normaloff>:/ico/sms_new.png</iconset>
     321   </property>
     322   <property name="text">
     323    <string>&amp;New message</string>
    305324   </property>
    306325  </action>
  • src/ui/VCSettings/vcsettings.cpp

    r37 r42  
    66#include <ishortcut.h>
    77
    8 #include "../../utils/typeconvert.h"
    9 #include "../../utils/strutils.h"
     8#include <typeconvert.h>
     9#include <strutils.h>
    1010
    1111const int ITEM_INDEX_GENERAL   = 0;
  • ui_vcaccountlist.h

    r37 r42  
    22** Form generated from reading ui file 'vcaccountlist.ui'
    33**
    4 ** Created: Thu Dec 3 22:13:17 2009
     4** Created: Thu Jan 14 08:55:55 2010
    55**      by: Qt User Interface Compiler version 4.5.2
    66**
     
    3333    QSpacerItem *horizontalSpacer;
    3434    QLineEdit *edtAccountFilter;
    35     QTableWidget *tblAccounts;
    3635    QSpacerItem *verticalSpacer;
    3736    QSpacerItem *horizontalSpacer_13;
    3837    QPushButton *btnClose;
     38    QTableWidget *tblAccounts;
    3939
    4040    void setupUi(QDialog *VCAccountListClass)
     
    7878        gridLayout->addWidget(edtAccountFilter, 0, 3, 1, 2);
    7979
    80         tblAccounts = new QTableWidget(VCAccountListClass);
    81         if (tblAccounts->columnCount() < 2)
    82             tblAccounts->setColumnCount(2);
    83         QTableWidgetItem *__qtablewidgetitem = new QTableWidgetItem();
    84         __qtablewidgetitem->setTextAlignment(Qt::AlignLeft|Qt::AlignVCenter);
    85         tblAccounts->setHorizontalHeaderItem(0, __qtablewidgetitem);
    86         QTableWidgetItem *__qtablewidgetitem1 = new QTableWidgetItem();
    87         __qtablewidgetitem1->setTextAlignment(Qt::AlignLeft|Qt::AlignVCenter);
    88         tblAccounts->setHorizontalHeaderItem(1, __qtablewidgetitem1);
    89         tblAccounts->setObjectName(QString::fromUtf8("tblAccounts"));
    90         QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
    91         sizePolicy.setHorizontalStretch(0);
    92         sizePolicy.setVerticalStretch(0);
    93         sizePolicy.setHeightForWidth(tblAccounts->sizePolicy().hasHeightForWidth());
    94         tblAccounts->setSizePolicy(sizePolicy);
    95         tblAccounts->setEditTriggers(QAbstractItemView::NoEditTriggers);
    96         tblAccounts->setAlternatingRowColors(true);
    97         tblAccounts->setSelectionMode(QAbstractItemView::SingleSelection);
    98         tblAccounts->setSelectionBehavior(QAbstractItemView::SelectRows);
    99         tblAccounts->setIconSize(QSize(50, 64));
    100         tblAccounts->setShowGrid(false);
    101         tblAccounts->setGridStyle(Qt::SolidLine);
    102         tblAccounts->setSortingEnabled(true);
    103         tblAccounts->setWordWrap(false);
    104         tblAccounts->horizontalHeader()->setStretchLastSection(true);
    105         tblAccounts->verticalHeader()->setVisible(false);
    106 
    107         gridLayout->addWidget(tblAccounts, 1, 0, 1, 5);
    108 
    10980        verticalSpacer = new QSpacerItem(20, 3, QSizePolicy::Minimum, QSizePolicy::Fixed);
    11081
     
    12495        gridLayout->addWidget(btnClose, 3, 4, 1, 1);
    12596
     97        tblAccounts = new QTableWidget(VCAccountListClass);
     98        if (tblAccounts->columnCount() < 3)
     99            tblAccounts->setColumnCount(3);
     100        QTableWidgetItem *__qtablewidgetitem = new QTableWidgetItem();
     101        __qtablewidgetitem->setTextAlignment(Qt::AlignLeft|Qt::AlignVCenter);
     102        tblAccounts->setHorizontalHeaderItem(0, __qtablewidgetitem);
     103        QTableWidgetItem *__qtablewidgetitem1 = new QTableWidgetItem();
     104        __qtablewidgetitem1->setTextAlignment(Qt::AlignLeft|Qt::AlignVCenter);
     105        tblAccounts->setHorizontalHeaderItem(1, __qtablewidgetitem1);
     106        QTableWidgetItem *__qtablewidgetitem2 = new QTableWidgetItem();
     107        __qtablewidgetitem2->setTextAlignment(Qt::AlignLeft|Qt::AlignVCenter);
     108        tblAccounts->setHorizontalHeaderItem(2, __qtablewidgetitem2);
     109        tblAccounts->setObjectName(QString::fromUtf8("tblAccounts"));
     110        QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     111        sizePolicy.setHorizontalStretch(0);
     112        sizePolicy.setVerticalStretch(0);
     113        sizePolicy.setHeightForWidth(tblAccounts->sizePolicy().hasHeightForWidth());
     114        tblAccounts->setSizePolicy(sizePolicy);
     115        tblAccounts->setEditTriggers(QAbstractItemView::NoEditTriggers);
     116        tblAccounts->setAlternatingRowColors(true);
     117        tblAccounts->setSelectionMode(QAbstractItemView::SingleSelection);
     118        tblAccounts->setSelectionBehavior(QAbstractItemView::SelectRows);
     119        tblAccounts->setIconSize(QSize(50, 64));
     120        tblAccounts->setShowGrid(false);
     121        tblAccounts->setGridStyle(Qt::SolidLine);
     122        tblAccounts->setSortingEnabled(true);
     123        tblAccounts->setWordWrap(false);
     124        tblAccounts->verticalHeader()->setVisible(false);
     125
     126        gridLayout->addWidget(tblAccounts, 1, 0, 1, 5);
     127
    126128
    127129        retranslateUi(VCAccountListClass);
     
    138140        edtAccountFilter->setStyleSheet(QApplication::translate("VCAccountListClass", "color: rgb(128, 128, 128);", 0, QApplication::UnicodeUTF8));
    139141        edtAccountFilter->setText(QApplication::translate("VCAccountListClass", "Filter...", 0, QApplication::UnicodeUTF8));
     142        btnClose->setText(QApplication::translate("VCAccountListClass", "Close", 0, QApplication::UnicodeUTF8));
    140143        QTableWidgetItem *___qtablewidgetitem = tblAccounts->horizontalHeaderItem(0);
    141144        ___qtablewidgetitem->setText(QApplication::translate("VCAccountListClass", "Name", 0, QApplication::UnicodeUTF8));
    142145        QTableWidgetItem *___qtablewidgetitem1 = tblAccounts->horizontalHeaderItem(1);
    143146        ___qtablewidgetitem1->setText(QApplication::translate("VCAccountListClass", "Gateway", 0, QApplication::UnicodeUTF8));
    144         btnClose->setText(QApplication::translate("VCAccountListClass", "Close", 0, QApplication::UnicodeUTF8));
     147        QTableWidgetItem *___qtablewidgetitem2 = tblAccounts->horizontalHeaderItem(2);
     148        ___qtablewidgetitem2->setText(QApplication::translate("VCAccountListClass", "Enabled", 0, QApplication::UnicodeUTF8));
    145149        Q_UNUSED(VCAccountListClass);
    146150    } // retranslateUi
  • ui_vcaddressbook.h

    r37 r42  
    22** Form generated from reading ui file 'vcaddressbook.ui'
    33**
    4 ** Created: Thu Dec 3 22:13:17 2009
     4** Created: Thu Jan 14 08:55:55 2010
    55**      by: Qt User Interface Compiler version 4.5.2
    66**
  • ui_vceditaccount.h

    r37 r42  
    22** Form generated from reading ui file 'vceditaccount.ui'
    33**
    4 ** Created: Thu Dec 3 22:13:17 2009
     4** Created: Thu Jan 14 08:55:55 2010
    55**      by: Qt User Interface Compiler version 4.5.2
    66**
     
    116116    void retranslateUi(QDialog *VCEditAccountClass)
    117117    {
    118         VCEditAccountClass->setWindowTitle(QApplication::translate("VCEditAccountClass", "VCEditAccount", 0, QApplication::UnicodeUTF8));
     118        VCEditAccountClass->setWindowTitle(QApplication::translate("VCEditAccountClass", "Edit account", 0, QApplication::UnicodeUTF8));
    119119        grpAccountInfos->setTitle(QApplication::translate("VCEditAccountClass", "Account information", 0, QApplication::UnicodeUTF8));
    120120        label->setText(QApplication::translate("VCEditAccountClass", "Name:", 0, QApplication::UnicodeUTF8));
  • ui_vceditcontact.h

    r37 r42  
    22** Form generated from reading ui file 'vceditcontact.ui'
    33**
    4 ** Created: Thu Dec 3 22:13:17 2009
     4** Created: Thu Jan 14 08:55:55 2010
    55**      by: Qt User Interface Compiler version 4.5.2
    66**
  • ui_vceditgroup.h

    r37 r42  
    22** Form generated from reading ui file 'vceditgroup.ui'
    33**
    4 ** Created: Thu Dec 3 22:13:17 2009
     4** Created: Thu Jan 14 08:55:55 2010
    55**      by: Qt User Interface Compiler version 4.5.2
    66**
  • ui_vcmain.h

    r37 r42  
    22** Form generated from reading ui file 'vcmain.ui'
    33**
    4 ** Created: Thu Dec 3 22:13:17 2009
     4** Created: Thu Jan 14 14:39:11 2010
    55**      by: Qt User Interface Compiler version 4.5.2
    66**
     
    4141    QAction *actionAccounts;
    4242    QAction *actionAddressBook;
     43    QAction *actionNewMessage;
    4344    QWidget *centralwidget;
    4445    QHBoxLayout *horizontalLayout_2;
     
    7980        icon.addFile(QString::fromUtf8(":/ico/exit.png"), QSize(), QIcon::Normal, QIcon::Off);
    8081        actionExit->setIcon(icon);
     82        actionExit->setMenuRole(QAction::QuitRole);
    8183        actionAbout = new QAction(VCMainClass);
    8284        actionAbout->setObjectName(QString::fromUtf8("actionAbout"));
     
    8486        icon1.addFile(QString::fromUtf8(":/ico/about.png"), QSize(), QIcon::Normal, QIcon::Off);
    8587        actionAbout->setIcon(icon1);
     88        actionAbout->setShortcutContext(Qt::WidgetWithChildrenShortcut);
     89        actionAbout->setMenuRole(QAction::AboutRole);
    8690        actionPreferences = new QAction(VCMainClass);
    8791        actionPreferences->setObjectName(QString::fromUtf8("actionPreferences"));
     
    8993        icon2.addFile(QString::fromUtf8(":/ico/preferences.png"), QSize(), QIcon::Normal, QIcon::Off);
    9094        actionPreferences->setIcon(icon2);
     95        actionPreferences->setMenuRole(QAction::PreferencesRole);
    9196        actionAccounts = new QAction(VCMainClass);
    9297        actionAccounts->setObjectName(QString::fromUtf8("actionAccounts"));
     
    99104        icon4.addFile(QString::fromUtf8(":/ico/address_book.png"), QSize(), QIcon::Normal, QIcon::Off);
    100105        actionAddressBook->setIcon(icon4);
     106        actionNewMessage = new QAction(VCMainClass);
     107        actionNewMessage->setObjectName(QString::fromUtf8("actionNewMessage"));
     108        QIcon icon5;
     109        icon5.addFile(QString::fromUtf8(":/ico/sms_new.png"), QSize(), QIcon::Normal, QIcon::Off);
     110        actionNewMessage->setIcon(icon5);
    101111        centralwidget = new QWidget(VCMainClass);
    102112        centralwidget->setObjectName(QString::fromUtf8("centralwidget"));
     
    212222        menubar = new QMenuBar(VCMainClass);
    213223        menubar->setObjectName(QString::fromUtf8("menubar"));
    214         menubar->setGeometry(QRect(0, 0, 750, 25));
     224        menubar->setGeometry(QRect(0, 0, 750, 24));
    215225        menuFile = new QMenu(menubar);
    216226        menuFile->setObjectName(QString::fromUtf8("menuFile"));
     
    227237        menubar->addAction(menu_Edit->menuAction());
    228238        menubar->addAction(menuHelp->menuAction());
     239        menuFile->addAction(actionNewMessage);
    229240        menuFile->addAction(actionExit);
    230241        menuHelp->addAction(actionAbout);
     
    236247        retranslateUi(VCMainClass);
    237248        QObject::connect(actionExit, SIGNAL(activated()), VCMainClass, SLOT(close()));
    238 
    239         lstContacts->setCurrentIndex(-1);
    240 
    241249
    242250        QMetaObject::connectSlotsByName(VCMainClass);
     
    251259        actionAccounts->setText(QApplication::translate("VCMainClass", "&Accounts", 0, QApplication::UnicodeUTF8));
    252260        actionAddressBook->setText(QApplication::translate("VCMainClass", "Address &Book", 0, QApplication::UnicodeUTF8));
     261        actionNewMessage->setText(QApplication::translate("VCMainClass", "&New message", 0, QApplication::UnicodeUTF8));
    253262        groupBox->setTitle(QApplication::translate("VCMainClass", "Message", 0, QApplication::UnicodeUTF8));
    254263        groupBox_3->setTitle(QApplication::translate("VCMainClass", "Account", 0, QApplication::UnicodeUTF8));
  • ui_vcsettings.h

    r37 r42  
    22** Form generated from reading ui file 'vcsettings.ui'
    33**
    4 ** Created: Thu Dec 3 22:13:17 2009
     4** Created: Thu Jan 14 08:55:55 2010
    55**      by: Qt User Interface Compiler version 4.5.2
    66**
Note: See TracChangeset for help on using the changeset viewer.