Changeset 71:415b45c71663 in SMSSender
- Timestamp:
- Feb 7, 2010 10:17:45 PM (12 years ago)
- Branch:
- 3.0
- Convert:
- svn:3639001d-8e34-449c-bb86-3782b86c4877/branches/3.0@70
- Files:
-
- 68 added
- 8 deleted
- 26 edited
Legend:
- Unmodified
- Added
- Removed
-
gateways/SwisscomXtraZone/SwisscomXtraZone.pro
r65 r71 11 11 LIBS += -L../../lib/ 12 12 # Attend the order! 13 LIBS += -linterfaces \ 14 -lgateway \ 15 -linterfaces \ 16 -ldatatypes \ 13 LIBS += -ldatatypes \ 17 14 -lutils 18 INCLUDEPATH += app \ 19 ../../lib/libinterfaces/src/exceptions/ \ 20 ../../lib/libinterfaces/src/business/ \ 21 ../../lib/libinterfaces/src/ui/ \ 22 ../../lib/libinterfaces/src/ \ 23 ../../lib/libgateway/src/exceptions/ \ 24 ../../lib/libgateway/src/business/ \ 25 ../../lib/libgateway/src/persistence/ \ 26 ../../lib/libdatatypes/src/business \ 15 INCLUDEPATH += src/ \ 16 ../../lib/libdatatypes/src/interfaces \ 17 ../../lib/libdatatypes/src/exceptions \ 27 18 ../../lib/libdatatypes/src \ 28 19 ../../lib/libutils/src/ -
gateways/SwisscomXtraZone/src/business/BCAccount.cpp
r62 r71 14 14 #include <QDebug> 15 15 16 #include < StdExceptions.h>17 #include < LoginAccountExceptions.h>16 #include <stdexceptions.h> 17 #include <loginaccountexceptions.h> 18 18 19 19 #include <snumber.h> … … 22 22 #include "BCGateway.h" 23 23 #include "validation/BCAccountValidator.h" 24 #include " ../persistence/DAAccountStorageOfficer.h"24 #include "persistence/DAAccountStorageOfficer.h" 25 25 26 26 namespace SwisscomXtraZone { … … 31 31 , MAX_MOBILE(10) 32 32 { 33 httpHelper_ = new HttpHelper();33 httpHelper_ = new SHttpHelper(); 34 34 35 35 /* Insert the swisscom-mobile.ch certificate to allow propper loading of the websites... */ … … 58 58 59 59 60 ILoginGateway* BCAccount::gateway() const {60 AbstractLoginGateway* BCAccount::gateway() const { 61 61 return BCGateway::instance(); 62 62 } -
gateways/SwisscomXtraZone/src/business/BCAccount.h
r43 r71 9 9 #define SWISSCOMXTRAZONE_BCACCOUNT_H_ 10 10 11 #include < AbstractLoginAccount.h>11 #include <abstract/abstractloginaccount.h> 12 12 #include <persistence/istorage.h> 13 13 14 #include < HttpHelper.h>14 #include <shttphelper.h> 15 15 16 16 namespace SwisscomXtraZone { … … 24 24 25 25 /* ILoginAccount */ 26 virtual ILoginGateway* gateway() const;26 virtual AbstractLoginGateway* gateway() const; 27 27 28 28 /* IAccount */ … … 41 41 42 42 private: 43 HttpHelper*httpHelper_;43 SHttpHelper* httpHelper_; 44 44 45 45 const int MAX_MOBILE; -
gateways/SwisscomXtraZone/src/business/BCGateway.cpp
r56 r71 9 9 10 10 #include "BCAccount.h" 11 #include " ../ui/vcsettingswidget.h"11 #include "ui/vcsettingswidget.h" 12 12 13 13 namespace SwisscomXtraZone { 14 14 15 ILoginGateway* BCGateway::instance_ = NULL;16 ILoginGateway* BCGateway::instance(){15 AbstractLoginGateway* BCGateway::instance_ = NULL; 16 AbstractLoginGateway* BCGateway::instance(){ 17 17 return instance_ ? instance_ : (instance_ = new BCGateway); 18 18 } -
gateways/SwisscomXtraZone/src/business/BCGateway.h
r56 r71 9 9 #define SWISSCOMXTRAZONE_BCGATEWAY_H_ 10 10 11 #include < AbstractLoginGateway.h>11 #include <abstract/abstractlogingateway.h> 12 12 #include <persistence/istorage.h> 13 13 … … 23 23 24 24 public: 25 static ILoginGateway* instance();25 static AbstractLoginGateway* instance(); 26 26 27 27 /* IGateway */ … … 55 55 56 56 private: 57 static ILoginGateway* instance_;57 static AbstractLoginGateway* instance_; 58 58 59 59 const int SHORTSMS_LENGTH; -
gateways/SwisscomXtraZone/src/business/validation/BCAccountValidator.cpp
r42 r71 13 13 14 14 IValidationResult* BCAccountValidator::validate() const { 15 IValidationResult* result = BCLoginAccountValidator::validate();15 IValidationResult* result = SLoginAccountValidator::validate(); 16 16 17 17 if (account()->username().contains(QRegExp("[^\\d]")) || (account()->username().length() != 10)) { -
gateways/SwisscomXtraZone/src/business/validation/BCAccountValidator.h
r42 r71 9 9 #define BCACCOUNTVALIDATOR_H_ 10 10 11 #include "validation/ BCLoginAccountValidator.h"11 #include "validation/sloginaccountvalidator.h" 12 12 13 13 namespace SwisscomXtraZone { 14 14 15 class BCAccountValidator: public BCLoginAccountValidator {15 class BCAccountValidator: public SLoginAccountValidator { 16 16 Q_OBJECT 17 17 18 18 public: 19 explicit BCAccountValidator( IAccount* account)20 : BCLoginAccountValidator(account)19 explicit BCAccountValidator(AbstractLoginAccount* account) 20 : SLoginAccountValidator(account) 21 21 {}; 22 22 IValidationResult* validate() const; -
gateways/SwisscomXtraZone/src/persistence/DAAccountStorageOfficer.h
r43 r71 9 9 #define SWISSCOMXTRAZONE_DAACCOUNTSTORAGEOFFICER_H_ 10 10 11 #include < AbstractLoginAccountStorageOfficer.h>11 #include <abstract/persistence/abstractloginaccountstorageofficer.h> 12 12 13 13 namespace SwisscomXtraZone { … … 17 17 18 18 public: 19 DAAccountStorageOfficer( ILoginAccount* account, IStorage* storage)19 DAAccountStorageOfficer(AbstractLoginAccount* account, IStorage* storage) 20 20 : AbstractLoginAccountStorageOfficer(account, storage, "sdo2o0034_k!Qdoc0DiwnfDaLdY<ymWWpovDmwpovDö__dmkosadDLDd.:easdfDSs") 21 21 {}; -
gateways/SwisscomXtraZone/src/ui/vcsettingswidget.cpp
r43 r71 4 4 #include <QMessageBox> 5 5 6 #include < StdExceptions.h>6 #include <stdexceptions.h> 7 7 8 #include " ../business/BCAccount.h"8 #include "business/BCAccount.h" 9 9 10 10 namespace SwisscomXtraZone { -
gateways/SwisscomXtraZone/src/ui/vcsettingswidget.h
r42 r71 5 5 #include "ui_vcsettingswidget.h" 6 6 7 #include < iaccountsettingswidget.h>7 #include <ui/iaccountsettingswidget.h> 8 8 9 9 namespace SwisscomXtraZone { -
lib/libdatatypes/datatypes.pro
r67 r71 1 # ##################################################################### 2 # Automatically generated by qmake (2.01a) Sun Feb 7 17:57:32 2010 3 # ##################################################################### 1 4 VERSION = 2.0.0 2 5 TEMPLATE = lib 3 6 CONFIG += staticlib \ 4 thread 7 thread 5 8 DESTDIR = ../ 6 9 TARGET = datatypes 7 10 QT += core \ 8 network 11 network \ 12 sql \ 13 gui 9 14 LIBS += -L../ 10 15 LIBS += -linterfaces \ 11 16 -lutils 12 INCLUDEPATH += app \ 13 ../libinterfaces/src/exceptions/ \ 14 ../libinterfaces/src/business/ \ 15 ../libinterfaces/src/ \ 17 DEPENDPATH += . \ 18 src \ 19 src/abstract \ 20 src/eventmappers \ 21 src/exceptions \ 22 src/interfaces \ 23 src/ui \ 24 src/validation \ 25 src/abstract/persistence \ 26 src/exceptions/persistence \ 27 src/interfaces/persistence 28 INCLUDEPATH += src \ 29 src/interfaces \ 16 30 ../libutils/src/ 17 HEADERS += src/business/BCBinary.h \ 18 src/business/BCContact.h \ 19 src/business/BCGroup.h \ 31 32 # Input 33 HEADERS += src/scontact.h \ 34 src/sgroup.h \ 35 src/shttpcookiemanager.h \ 36 src/shttphelper.h \ 20 37 src/snumber.h \ 21 38 src/sshortcut.h \ 22 src/synchttp.h 23 SOURCES += src/business/BCBinary.cpp \ 24 src/business/BCContact.cpp \ 25 src/business/BCGroup.cpp \ 39 src/synchttp.h \ 40 src/abstract/abstractaccount.h \ 41 src/abstract/abstractgateway.h \ 42 src/abstract/abstractloginaccount.h \ 43 src/abstract/abstractlogingateway.h \ 44 src/abstract/persistence/abstractaccountstorageofficer.h \ 45 src/abstract/persistence/abstractloginaccountstorageofficer.h \ 46 src/abstract/persistence/abstractstorageofficer.h \ 47 src/exceptions/eexception.h \ 48 src/exceptions/ehttpreadexception.h \ 49 src/exceptions/elibraryloadexception.h \ 50 src/exceptions/eloginaccountloginexception.h \ 51 src/exceptions/eparseexception.h \ 52 src/exceptions/httpexceptions.h \ 53 src/exceptions/libraryexceptions.h \ 54 src/exceptions/loginaccountexceptions.h \ 55 src/exceptions/stdexceptions.h \ 56 src/exceptions/persistence/estoragereadexception.h \ 57 src/exceptions/persistence/estoragewriteexception.h \ 58 src/exceptions/persistence/storageexceptions.h \ 59 src/interfaces/iaccount.h \ 60 src/interfaces/ibinary.h \ 61 src/interfaces/icontact.h \ 62 src/interfaces/igateway.h \ 63 src/interfaces/igroup.h \ 64 src/interfaces/iinterface.h \ 65 src/interfaces/ilibrary.h \ 66 src/interfaces/ilibraryloader.h \ 67 src/interfaces/inumber.h \ 68 src/interfaces/istorable.h \ 69 src/interfaces/istreamable.h \ 70 src/interfaces/ivalidatable.h \ 71 src/interfaces/ivalidationresult.h \ 72 src/interfaces/ivalidator.h \ 73 src/interfaces/persistence/iaccountmanager.h \ 74 src/interfaces/persistence/icontactmanager.h \ 75 src/interfaces/persistence/igroupmanager.h \ 76 src/interfaces/persistence/isettings.h \ 77 src/interfaces/persistence/istorage.h \ 78 src/interfaces/persistence/istorageofficer.h \ 79 src/eventmappers/eventinterfaces.h \ 80 src/eventmappers/saccounteventmapper.h \ 81 src/eventmappers/scontacteventmapper.h \ 82 src/eventmappers/sgroupeventmapper.h \ 83 src/eventmappers/sloginaccounteventmapper.h \ 84 src/ui/iaccountsettingswidget.h \ 85 src/validation/sloginaccountvalidator.h \ 86 src/validation/sstdaccountvalidator.h \ 87 src/validation/svalidationresult.h 88 SOURCES += src/scontact.cpp \ 89 src/sgoup.cpp \ 90 src/shttpcookiemanager.cpp \ 91 src/shttphelper.cpp \ 26 92 src/snumber.cpp \ 27 src/sshortcut.cpp 28 FORMS += 29 RESOURCES += 93 src/sshortcut.cpp \ 94 src/abstract/abstractaccount.cpp \ 95 src/abstract/abstractgateway.cpp \ 96 src/abstract/abstractloginaccount.cpp \ 97 src/abstract/abstractlogingateway.cpp \ 98 src/abstract/persistence/abstractaccountstorageofficer.cpp \ 99 src/abstract/persistence/abstractloginaccountstorageofficer.cpp \ 100 src/abstract/persistence/abstractstorageofficer.cpp \ 101 src/interfaces/iaccount.cpp \ 102 src/interfaces/inumber.cpp \ 103 src/validation/sloginaccountvalidator.cpp \ 104 src/validation/sstdaccountvalidator.cpp \ 105 src/validation/svalidationresult.cpp -
lib/libdatatypes/src/snumber.cpp
r56 r71 11 11 #include <QStringList> 12 12 13 #include <StdExceptions.h>13 #include "exceptions/stdexceptions.h" 14 14 15 15 #include <typeconvert.h> -
lib/libutils/src/strutils.cpp
r41 r71 15 15 16 16 bool StrUtils::isPositiveNumeric(const QString& s){ 17 QString test(s); 18 return test.remove(QRegExp("^\\d+$")) == ""; 17 bool ok; 18 int val = s.toInt(&ok); 19 return ok && val >= 0; 19 20 } 20 21 21 22 bool StrUtils::isNegativeNumeric(const QString& s){ 22 QString test(s); 23 return test.remove(QRegExp("^-\\d+$")) == ""; 23 bool ok; 24 int val = s.toInt(&ok); 25 return ok && val <= 0; 24 26 } -
smssender.pro
r65 r71 1 1 VERSION = 3.0.0 2 2 CONFIG += qt \ 3 thread 3 thread 4 4 TARGET = smssender-bin 5 5 QT += core \ … … 9 9 LIBS += -lcrypto++ \ 10 10 -ldatatypes \ 11 -lutils \ 12 -linterfaces 13 INCLUDEPATH += app \ 11 -lutils 12 INCLUDEPATH += src/ \ 14 13 src/ui/components \ 15 lib/libinterfaces/src/business \ 16 lib/libinterfaces/src/exceptions \ 17 lib/libinterfaces/src \ 18 lib/libdatatypes/src/business \ 14 lib/libdatatypes/src/interfaces \ 15 lib/libdatatypes/src/exceptions \ 19 16 lib/libdatatypes/src \ 20 17 lib/libutils/src \ 21 include 18 include/ 22 19 HEADERS += src/ui/models/accounttreemodel.h \ 23 20 src/ui/models/loadedaccountmodel.h \ … … 46 43 src/persistence/DAGroupManager.h \ 47 44 src/business/BCGroupManager.h \ 48 src/ui/UIHelper.h \49 45 src/ui/VCEditContact/vceditcontact.h \ 50 46 src/persistence/DASettings.h \ … … 82 78 src/persistence/DAGroupManager.cpp \ 83 79 src/business/BCGroupManager.cpp \ 84 src/ui/UIHelper.cpp \85 80 src/ui/VCEditContact/vceditcontact.cpp \ 86 81 src/persistence/DASettings.cpp \ -
src/business/BCAccountLoadManager.h
r36 r71 13 13 14 14 #include <iaccount.h> 15 #include <stdexceptions.h> 15 16 16 17 #include "BCAccountLoadThread.h" -
src/business/BCAccountLoadThread.h
r40 r71 7 7 #include <iaccount.h> 8 8 9 #include < StdExceptions.h>9 #include <stdexceptions.h> 10 10 11 11 enum AccountLoadState { -
src/business/BCAccountManager.cpp
r67 r71 100 100 } 101 101 void BCAccountManager::accountDataChanged() { 102 AccountEventMapper* eventMapper = qobject_cast<AccountEventMapper*>(sender());102 SAccountEventMapper* eventMapper = static_cast<SAccountEventMapper*>(sender()); //TODO: this is wrong... (sender() is not the eventManager) 103 103 IAccount* account = eventMapper->account(); 104 104 Q_ASSERT(account); -
src/business/BCContactManager.cpp
r56 r71 99 99 } 100 100 void BCContactManager::contactDataChanged() { 101 IContact* contact= static_cast< ContactEventMapper*>(sender())->contact();101 IContact* contact= static_cast<SContactEventMapper*>(sender())->contact(); 102 102 Q_ASSERT(contact); 103 103 emit contactUpdated(contact); -
src/business/BCGroupManager.cpp
r43 r71 88 88 } 89 89 void BCGroupManager::groupDataChanged() { 90 IGroup* group= static_cast< GroupEventMapper*>(sender())->group();90 IGroup* group= static_cast<SGroupEventMapper*>(sender())->group(); 91 91 Q_ASSERT(group); 92 92 emit groupUpdated(group); -
src/business/BCLibraryLoader.cpp
r66 r71 15 15 16 16 #include <ilibrary.h> 17 #include < LibraryExceptions.h>17 #include <libraryexceptions.h> 18 18 19 19 BCLibraryLoader* BCLibraryLoader::instance_=0; -
src/business/BusinessFactory.cpp
r43 r71 8 8 #include "BusinessFactory.h" 9 9 10 #include "BCContact.h"11 #include "BCGroup.h"12 13 10 BusinessFactory* BusinessFactory::instance_=0; 14 11 BusinessFactory* BusinessFactory::instance(){ 15 12 return instance_ ? instance_ : (instance_ = new BusinessFactory); 16 13 } 17 18 IContact* BusinessFactory::getContactInstance(){19 return new BCContact;20 }21 22 IGroup* BusinessFactory::getGroupInstance(){23 return new BCGroup;24 } -
src/business/BusinessFactory.h
r43 r71 9 9 #define BUSINESSFACTORY_H_ 10 10 11 #include <icontact.h>12 #include <igroup.h>13 14 11 class BusinessFactory { 15 12 16 13 public: 17 14 static BusinessFactory* instance(); 18 19 IContact* getContactInstance();20 IGroup* getGroupInstance();21 15 22 16 protected: -
src/persistence/storage/DAAccountListManager.cpp
r44 r71 11 11 12 12 #include <igateway.h> 13 #include < StorageExceptions.h>13 #include <persistence/storageexceptions.h> 14 14 #include <typeconvert.h> 15 15 -
src/persistence/storage/DAStorage.cpp
r63 r71 17 17 #include <iaccount.h> 18 18 19 #include <StdExceptions.h> 20 #include <StorageExceptions.h> 21 22 #include <BCContact.h> 23 #include <BCBinary.h> 24 #include <BCGroup.h> 19 #include <stdexceptions.h> 20 #include <persistence/storageexceptions.h> 21 22 #include <scontact.h> 23 #include <sgroup.h> 25 24 #include <sshortcut.h> 26 #include " ../../business/BCSettings.h"27 #include " ../../business/BCContactManager.h"25 #include "business/BCSettings.h" 26 #include "business/BCContactManager.h" 28 27 29 28 #include <typeconvert.h> … … 127 126 128 127 IContact* DAStorage::readContact(int contactId){ 129 IContact* contact = new BCContact();128 IContact* contact = new SContact(); 130 129 131 130 QSqlQuery query = createQuery(); … … 150 149 151 150 IGroup* DAStorage::readGroup(int groupId){ 152 IGroup* group = new BCGroup();151 IGroup* group = new SGroup(); 153 152 154 153 QSqlQuery query = createQuery(); -
src/ui/VCAddressBook/vcaddressbook.cpp
r55 r71 11 11 #include "../UIHelper.h" 12 12 13 #include <scontact.h> 14 #include <sgroup.h> 13 15 #include <snumber.h> 14 16 #include "../../business/BCContactManager.h" 15 17 #include "../../business/BCGroupManager.h" 16 #include "../../business/BusinessFactory.h"17 18 18 19 #include <typeconvert.h> … … 167 168 /* Contacts */ 168 169 void VCAddressBook::on_btnAddContact_clicked(){ 169 editContact( BusinessFactory::instance()->getContactInstance());170 editContact(new SContact()); 170 171 } 171 172 … … 202 203 203 204 void VCAddressBook::on_btnAddGroup_clicked(){ 204 editGroup( BusinessFactory::instance()->getGroupInstance());205 editGroup(new SGroup()); 205 206 } 206 207 -
src/ui/VCMain/vcmain.cpp
r67 r71 9 9 #include <algorithm> 10 10 11 #include <scontact.h> 11 12 #include <snumber.h> 12 13 #include <typeconvert.h> … … 308 309 addRecipient(recipient); 309 310 } else { 310 IContact* recipient = BusinessFactory::instance()->getContactInstance();311 IContact* recipient = new SContact(); 311 312 recipient->setNumber(number); 312 313
Note: See TracChangeset
for help on using the changeset viewer.