Changeset 319:1ec456878bcb in SMSSender


Ignore:
Timestamp:
Feb 9, 2014 4:28:29 PM (6 years ago)
Author:
Sämy Zehnder <saemy.zehnder@…>
Branch:
separation-frontend-backend
Message:
  • Adjusts header guards to follow common pattern based on the filename.
Files:
134 edited

Legend:

Unmodified
Added
Removed
  • common/business/imanagers.h

    r316 r319  
    1616  along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 #ifndef IMANAGERSFACTORY_H_
    19 #define IMANAGERSFACTORY_H_
     18#ifndef COMMON_IMANAGERS_H
     19#define COMMON_IMANAGERS_H
    2020
    2121// #include <QDir>
     
    283283// Q_DECLARE_INTERFACE(ISettingsManager, "ch.gorrion.smssender.ISettingsManager/1.0")
    284284
    285 #endif /* IMANAGERSFACTORY_H_ */
     285#endif /* COMMON_IMANAGERS_H */
  • common/domain/scontact.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SCONTACT_H_
    19 #define SCONTACT_H_
     18#ifndef COMMON_DOMAIN_SCONTACT_H
     19#define COMMON_DOMAIN_SCONTACT_H
    2020
    2121#include <QMetaType>
     
    6868};
    6969
    70 #endif /* SCONTACT_H_ */
     70#endif /* COMMON_DOMAIN_SCONTACT_H */
  • common/domain/sdatatypes.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SDATATYPES_H_
    19 #define SDATATYPES_H_
     18#ifndef COMMON_DOMAIN_SDATATYPES_H
     19#define COMMON_DOMAIN_SDATATYPES_H
    2020
    2121#include <QObject>
     
    6565Q_DECLARE_INTERFACE(IDialogWrapper, "ch.gorrion.smssender.IDialogWrapper/1.0")
    6666
    67 #endif /* SDATATYPES_H_ */
     67#endif /* COMMON_DOMAIN_SDATATYPES_H */
  • common/domain/sgroup.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SGROUP_H_
    19 #define SGROUP_H_
     18#ifndef COMMON_DOMAIN_SGROUP_H
     19#define COMMON_DOMAIN_SGROUP_H
    2020
    2121#include <QSet>
     
    7676};
    7777
    78 #endif /* SGROUP_H_ */
     78#endif /* COMMON_DOMAIN_SGROUP_H */
  • common/domain/snumber.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SNUMBER_H_
    19 #define SNUMBER_H_
     18#ifndef COMMON_DOMAIN_SNUMBER_H
     19#define COMMON_DOMAIN_SNUMBER_H
    2020
    2121#include <QMetaType>
     
    6767COMMON_EXPORT S_QHASH(SNumber)
    6868
    69 #endif /* SNUMBER_H_ */
     69#endif /* COMMON_DOMAIN_SNUMBER_H */
  • common/domain/snumber_p.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 #ifndef SNUMBER_P_H_
    19 #define SNUMBER_P_H_
     18#ifndef COMMON_DOMAIN_SNUMBER_P_H
     19#define COMMON_DOMAIN_SNUMBER_P_H
    2020
    2121#include <QString>
     
    4343};
    4444
    45 #endif /* SNUMBER_P_H_ */
     45#endif /* COMMON_DOMAIN_SNUMBER_P_H */
  • common/domain/stask.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 
    19 #ifndef STASK_H_
    20 #define STASK_H_
     18#ifndef COMMON_DOMAIN_STASK_H
     19#define COMMON_DOMAIN_STASK_H
    2120
    2221#include <QMutex>
     
    244243};
    245244
    246 
    247 #endif /* STASK_H_ */
     245#endif /* COMMON_DOMAIN_STASK_H */
  • common/domain/stask_p.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 
    19 #ifndef STASK_P_H_
    20 #define STASK_P_H_
     18#ifndef COMMON_DOMAIN_STASK_P_H
     19#define COMMON_DOMAIN_STASK_P_H
    2120
    2221#include <QList>
     
    8079};
    8180
    82 #endif /* STASK_P_H_ */
     81#endif /* COMMON_DOMAIN_STASK_P_H */
  • common/domain/sversion.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SVERSION_H_
    19 #define SVERSION_H_
     18#ifndef COMMON_DOMAIN_SVERSION_H
     19#define COMMON_DOMAIN_SVERSION_H
    2020
    2121#include <QString>
     
    6969};
    7070
    71 #endif /* SVERSION_H_ */
     71#endif /* COMMON_DOMAIN_SVERSION_H */
  • common/exceptions/eexception.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef EEXCEPTION_H_
    19 #define EEXCEPTION_H_
     18#ifndef COMMON_EXCEPTIONS_EEXCEPTION_H
     19#define COMMON_EXCEPTIONS_EEXCEPTION_H
    2020
    2121#include <QList>
     
    6666Q_DECLARE_METATYPE(EException)
    6767
    68 #endif /* EEXCEPTION_H_ */
     68#endif /* COMMON_EXCEPTIONS_EEXCEPTION_H */
  • common/exceptions/elibraryloadexception.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef LIBRARY_ELIBRARYLOADEXCEPTION_H_
    19 #define LIBRARY_ELIBRARYLOADEXCEPTION_H_
     18#ifndef COMMON_EXCEPTIONS_ELIBRARYLOADEXCEPTION_H
     19#define COMMON_EXCEPTIONS_ELIBRARYLOADEXCEPTION_H
    2020
    2121#include <QString>
     
    5454}
    5555
    56 #endif /* LIBRARY_ELIBRARYLOADEXCEPTION_H_ */
     56#endif /* COMMON_EXCEPTIONS_ELIBRARYLOADEXCEPTION_H */
  • common/exceptions/eloginaccountloginexception.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef LOGINACCOUNT_ELOGINACCOUNTLOGINEXCEPTION_H_
    19 #define LOGINACCOUNT_ELOGINACCOUNTLOGINEXCEPTION_H_
     18#ifndef COMMON_EXCEPTIONS_ELOGINACCOUNTLOGINEXCEPTION_H
     19#define COMMON_EXCEPTIONS_ELOGINACCOUNTLOGINEXCEPTION_H
    2020
    2121#include <QString>
     
    5353}
    5454
    55 #endif /* LOGINACCOUNT_ELOGINACCOUNTLOGINEXCEPTION_H_ */
     55#endif /* COMMON_EXCEPTIONS_ELOGINACCOUNTLOGINEXCEPTION_H */
  • common/exceptions/enetworkexception.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef ENETWORKEXCEPTION_H_
    19 #define ENETWORKEXCEPTION_H_
     18#ifndef COMMON_EXCEPTIONS_ENETWORKEXCEPTION_H
     19#define COMMON_EXCEPTIONS_ENETWORKEXCEPTION_H
    2020
    2121#include <QNetworkReply>
     
    3838};
    3939
    40 #endif /* ENETWORKEXCEPTION_H_ */
     40#endif /* COMMON_EXCEPTIONS_ENETWORKEXCEPTION_H */
  • common/exceptions/eparseexception.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef EPARSEEXCEPTION_H_
    19 #define EPARSEEXCEPTION_H_
     18#ifndef COMMON_EXCEPTIONS_EPARSEEXCEPTION_H
     19#define COMMON_EXCEPTIONS_EPARSEEXCEPTION_H
    2020
    2121#include "common/exceptions/eexception.h"
     
    3434};
    3535
    36 #endif /* EPARSEEXCEPTION_H_ */
     36#endif /* COMMON_EXCEPTIONS_EPARSEEXCEPTION_H */
  • common/exceptions/httpexceptions.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef HTTP_EHTTPEXCEPTIONS_H_
    19 #define HTTP_EHTTPEXCEPTIONS_H_
     18#ifndef COMMON_EXCEPTIONS_HTTPEXCEPTIONS_H
     19#define COMMON_EXCEPTIONS_HTTPEXCEPTIONS_H
    2020
    2121#include "eexception.h"
     
    5555}
    5656
    57 #endif // HTTP_EHTTPEXCEPTIONS_H_
     57#endif // COMMON_EXCEPTIONS_HTTPEXCEPTIONS_H
  • common/exceptions/libraryexceptions.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
     18#ifndef COMMON_EXCEPTIONS_LIBRARYEXCEPTIONS_H
     19#define COMMON_EXCEPTIONS_LIBRARYEXCEPTIONS_H
     20
    1821#include "common/exceptions/elibraryloadexception.h"
     22
     23#endif /* COMMON_EXCEPTIONS_LIBRARYEXCEPTIONS_H */
  • common/exceptions/loginaccountexceptions.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
     18#ifndef COMMON_EXCEPTIONS_LOGINACCOUNTEXCEPTIONS_H
     19#define COMMON_EXCEPTIONS_LOGINACCOUNTEXCEPTIONS_H
     20
    1821#include "common/exceptions/eloginaccountloginexception.h"
     22
     23#endif /* COMMON_EXCEPTIONS_LOGINACCOUNTEXCEPTIONS_H */
  • common/exceptions/persistence/estoragereadexception.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef ESTORAGEREADEXCEPTION_H_
    19 #define ESTORAGEREADEXCEPTION_H_
     18#ifndef COMMON_EXCEPTIONS_PERSISTENCE_ESTORAGEREADEXCEPTION_H
     19#define COMMON_EXCEPTIONS_PERSISTENCE_ESTORAGEREADEXCEPTION_H
    2020
    2121#include <QString>
     
    3737}
    3838
    39 #endif /* ESTORAGEREADEXCEPTION_H_ */
     39#endif /* COMMON_EXCEPTIONS_PERSISTENCE_ESTORAGEREADEXCEPTION_H */
  • common/exceptions/persistence/estoragewriteexception.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef ESTORAGEWRITEEXCEPTION_H_
    19 #define ESTORAGEWRITEEXCEPTION_H_
     18#ifndef COMMON_EXCEPTIONS_PERSISTENCE_ESTORAGEWRITEEXCEPTION_H
     19#define COMMON_EXCEPTIONS_PERSISTENCE_ESTORAGEWRITEEXCEPTION_H
    2020
    2121#include <QString>
     
    3737}
    3838
    39 #endif /* ESTORAGEWRITEEXCEPTION_H_ */
     39#endif /* COMMON_EXCEPTIONS_STORAGE_ESTORAGEWRITEEXCEPTION_H */
  • common/exceptions/persistence/storageexceptions.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
     18#ifndef COMMON_EXCEPTIONS_PERSISTENCE_STORAGEEXCEPTIONS_H
     19#define COMMON_EXCEPTIONS_PERSISTENCE_STORAGEEXCEPTIONS_H
     20
    1821#include "common/exceptions/persistence/estoragereadexception.h"
    1922#include "common/exceptions/persistence/estoragewriteexception.h"
     23
     24#endif // COMMON_EXCEPTIONS_PERSISTENCE_STORAGEEXCEPTIONS_H
  • common/exceptions/stdexceptions.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
     18#ifndef COMMON_EXCEPTIONS_STDEXCEPTIONS_H
     19#define COMMON_EXCEPTIONS_STDEXCEPTIONS_H
     20
    1821#include "common/exceptions/eexception.h"
    1922#include "common/exceptions/eparseexception.h"
     23
     24#endif /* COMMON_EXCEPTIONS_STDEXCEPTIONS_H */
  • common/gui/business/igateway.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef IGATEWAY_GUI_H
    19 #define IGATEWAY_GUI_H
     18#ifndef COMMON_GUI_IGATEWAY_H
     19#define COMMON_GUI_IGATEWAY_H
    2020
    2121#include <QtGui/QIcon>
     
    3434Q_DECLARE_INTERFACE(IGateway, "ch.gorrion.smssender.IGateway/1.0")
    3535
    36 #endif // IGATEWAY_GUI_H
     36#endif // COMMON_GUI_IGATEWAY_H
  • common/gui/persistence/encryptedstoragehelper.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef COMMON_GUI_ENCRYPTEDSTORAGEHELPER_H
    19 #define COMMON_GUI_ENCRYPTEDSTORAGEHELPER_H
     18#ifndef COMMON_GUI_PERSISTENCE_ENCRYPTEDSTORAGEHELPER_H
     19#define COMMON_GUI_PERSISTENCE_ENCRYPTEDSTORAGEHELPER_H
    2020
    2121#include "common/gui/global.h"
     
    4141} // namespace Persistence
    4242
    43 #endif // COMMON_GUI_ENCRYPTEDSTORAGEHELPER_H
     43#endif // COMMON_GUI_PERSISTENCE_ENCRYPTEDSTORAGEHELPER_H
  • common/gui/persistence/imainstorage.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef COMMON_GUI_IMAINSTORAGE_H
    19 #define COMMON_GUI_IMAINSTORAGE_H
     18#ifndef COMMON_GUI_PERSISTENCE_IMAINSTORAGE_H
     19#define COMMON_GUI_PERSISTENCE_IMAINSTORAGE_H
    2020
    2121#include <QtGui/QImage>
     
    3939Q_DECLARE_INTERFACE(Persistence::IMainStorage, "ch.gorrion.smssender.IMainStorage/1.0")
    4040
    41 #endif // COMMON_GUI_IMAINSTORAGE_H
     41#endif // COMMON_GUI_PERSISTENCE_IMAINSTORAGE_H
  • common/gui/ui/iaccountsettingswidget.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef COMMON_GUI_IACCOUNTSETTINGSWIDGET_H_
    19 #define COMMON_GUI_IACCOUNTSETTINGSWIDGET_H_
     18#ifndef COMMON_GUI_UI_IACCOUNTSETTINGSWIDGET_H
     19#define COMMON_GUI_UI_IACCOUNTSETTINGSWIDGET_H
    2020
    2121#include <QtGui/QWidget>
     
    4040Q_DECLARE_INTERFACE(IAccountSettingsWidget, "ch.gorrion.smssender.IAccountSettingsWidget/1.0")
    4141
    42 #endif /* COMMON_GUI_IACCOUNTSETTINGSWIDGET_H_ */
     42#endif /* COMMON_GUI_UI_IACCOUNTSETTINGSWIDGET_H */
  • common/gui/ui/iclosepreventabledialog.h

    r316 r319  
    1616  along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 #ifndef COMMON_GUI_ICLOSEPREVENTABLEDIALOG_H
    19 #define COMMON_GUI_ICLOSEPREVENTABLEDIALOG_H
     18#ifndef COMMON_GUI_UI_ICLOSEPREVENTABLEDIALOG_H
     19#define COMMON_GUI_UI_ICLOSEPREVENTABLEDIALOG_H
    2020
    2121#include <QtGui/QDialog>
     
    4949
    5050
    51 #endif /* COMMON_GUI_ICLOSEPREVENTABLEDIALOG_H */
     51#endif /* COMMON_GUI_UI_ICLOSEPREVENTABLEDIALOG_H */
  • common/gui/ui/isendingdialog.h

    r316 r319  
    1616  along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 #ifndef COMMON_GUI_ISENDINGDIALOG_H
    19 #define COMMON_GUI_ISENDINGDIALOG_H
     18#ifndef COMMON_GUI_UI_ISENDINGDIALOG_H
     19#define COMMON_GUI_UI_ISENDINGDIALOG_H
    2020
    2121#include <QtGui/QWidget>
     
    4040Q_DECLARE_INTERFACE(ISendingDialog, "ch.gorrion.smssender.ISendingDialog/1.0")
    4141
    42 #endif /* COMMON_GUI_ISENDINGDIALOG_H */
     42#endif /* COMMON_GUI_UI_ISENDINGDIALOG_H */
  • common/network/snetworkhelper.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 
    19 #ifndef SNETWORKHELPER_H_
    20 #define SNETWORKHELPER_H_
     18#ifndef COMMON_NETWORK_SNETWORKHELPER_H
     19#define COMMON_NETWORK_SNETWORKHELPER_H
    2120
    2221#include <QList>
     
    168167};
    169168
    170 #endif /* SNETWORKHELPER_H_ */
     169#endif /* COMMON_NETWORK_SNETWORKHELPER_H */
  • common/network/snetworkreply.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 #ifndef SNETWORKREPLY_H_
    19 #define SNETWORKREPLY_H_
     18#ifndef COMMON_NETWORK_SNETWORKREPLY_H
     19#define COMMON_NETWORK_SNETWORKREPLY_H
    2020
    2121#include <QExplicitlySharedDataPointer>
     
    4848COMMON_EXPORT S_QHASH(SNetworkReply)
    4949
    50 #endif /* SNETWORKREPLY_H_ */
     50#endif /* COMMON_NETWORK_SNETWORKREPLY_H */
  • common/network/snetworkreply_p.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 
    19 #ifndef SNETWORKREPLY_P_H_
    20 #define SNETWORKREPLY_P_H_
     18#ifndef COMMON_NETWORK_SNETWORKREPLY_P_H
     19#define COMMON_NETWORK_SNETWORKREPLY_P_H
    2120
    2221#include <QNetworkReply>
     
    6160};
    6261
    63 #endif /* SNETWORKREPLY_P_H_ */
     62#endif /* COMMON_NETWORK_SNETWORKREPLY_P_H */
  • common/persistence/iaccountmanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef IACCOUNTMANAGER_H_
    19 #define IACCOUNTMANAGER_H_
     18#ifndef COMMON_PERSISTENCE_IACCOUNTMANAGER_H
     19#define COMMON_PERSISTENCE_IACCOUNTMANAGER_H
    2020
    2121#include <QHash>
     
    5656Q_DECLARE_INTERFACE(Persistence::IAccountManager, "ch.gorrion.smssender.persistence.IAccountManager/1.0") */
    5757
    58 #endif /* IACCOUNTMANAGER_H_ */
     58#endif /* COMMON_PERSISTENCE_IACCOUNTMANAGER_H */
  • common/persistence/icontactmanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef ICONTACTMANAGER_H_
    19 #define ICONTACTMANAGER_H_
     18#ifndef COMMON_PERSISTENCE_ICONTACTMANAGER_H
     19#define COMMON_PERSISTENCE_ICONTACTMANAGER_H
    2020
    2121/*
     
    4848*/
    4949
    50 #endif /* ICONTACTMANAGER_H_ */
     50#endif /* COMMON_PERSISTENCE_ICONTACTMANAGER_H */
  • common/persistence/idatabase.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef IDATABASE_H
    19 #define IDATABASE_H
     18#ifndef COMMON_PERSISTENCE_IDATABASE_H
     19#define COMMON_PERSISTENCE_IDATABASE_H
    2020
    2121#include <QObject>
     
    5353Q_DECLARE_INTERFACE(Persistence::IDatabase, "ch.gorrion.smssender.persistence.IDatabase/1.0")
    5454
    55 #endif // IDATABASE_H
     55#endif // COMMON_PERSISTENCE_IDATABASE_H
  • common/persistence/igroupmanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef IGROUPMANAGER_H_
    19 #define IGROUPMANAGER_H_
     18#ifndef COMMON_PERSISTENCE_IGROUPMANAGER_H
     19#define COMMON_PERSISTENCE_IGROUPMANAGER_H
    2020
    2121#ifdef false
     
    4949#endif
    5050
    51 #endif /* IGROUPMANAGER_H_ */
     51#endif /* COMMON_PERSISTENCE_IGROUPMANAGER_H */
  • common/persistence/imainstorage.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef IMAINSTORAGE_H
    19 #define IMAINSTORAGE_H
     18#ifndef COMMON_PERSISTENCE_IMAINSTORAGE_H
     19#define COMMON_PERSISTENCE_IMAINSTORAGE_H
    2020
    2121#ifdef FRONTEND_GUI
     
    2323#endif
    2424
    25 #endif // IMAINSTORAGE_H
     25#endif // COMMON_PERSISTENCE_IMAINSTORAGE_H
  • common/persistence/imainstorage_base.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef IMAINSTORAGE_BASE_H_
    19 #define IMAINSTORAGE_BASE_H_
     18#ifndef COMMON_PERSISTENCE_IMAINSTORAGE_BASE_H
     19#define COMMON_PERSISTENCE_IMAINSTORAGE_BASE_H
    2020
    2121#include <QSet>
     
    4949}
    5050
    51 #endif /* IMAINSTORAGE_BASE_H_ */
     51#endif /* COMMON_PERSISTENCE_IMAINSTORAGE_BASE_H */
  • common/persistence/impl/encryptedstoragehelper.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef ENCRYPTEDSTORAGEHELPER_H
    19 #define ENCRYPTEDSTORAGEHELPER_H
     18#ifndef COMMON_PERSISTENCE_IMPL_ENCRYPTEDSTORAGEHELPER_H
     19#define COMMON_PERSISTENCE_IMPL_ENCRYPTEDSTORAGEHELPER_H
    2020
    2121#ifdef FRONTEND_GUI
     
    2323#endif
    2424
    25 #endif // ENCRYPTEDSTORAGEHELPER_H
     25#endif // COMMON_PERSISTENCE_IMPL_ENCRYPTEDSTORAGEHELPER_H
  • common/persistence/impl/encryptedstoragehelper_base.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef ENCRYPTEDSTORAGEHELPER_BASE_H
    19 #define ENCRYPTEDSTORAGEHELPER_BASE_H
     18#ifndef COMMON_PERSISTENCE_IMPL_ENCRYPTEDSTORAGEHELPER_BASE_H
     19#define COMMON_PERSISTENCE_IMPL_ENCRYPTEDSTORAGEHELPER_BASE_H
    2020
    2121#include <QScopedPointer>
     
    7373}
    7474
    75 #endif // ENCRYPTEDSTORAGEHELPER_BASE_H
     75#endif // COMMON_PERSISTENCE_IMPL_ENCRYPTEDSTORAGEHELPER_BASE_H
  • common/persistence/impl/storageconnectionhelper.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef COMMON_PERSISTENCE_IMPL_CONNECTIONHELPER_H
    19 #define COMMON_PERSISTENCE_IMPL_CONNECTIONHELPER_H
     18#ifndef COMMON_PERSISTENCE_IMPL_STORAGECONNECTIONHELPER_H
     19#define COMMON_PERSISTENCE_IMPL_STORAGECONNECTIONHELPER_H
    2020
    2121#include <QAtomicInt>
     
    5555} // namespace Persistence
    5656
    57 #endif // COMMON_PERSISTENCE_IMPL_CONNECTIONHELPER_H
     57#endif // COMMON_PERSISTENCE_IMPL_STORAGECONNECTIONHELPER_H
  • common/persistence/impl/storageconnectionhelper_p.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef COMMON_PERSISTENCE_IMPL_CONNECTIONHELPER_P_H
    19 #define COMMON_PERSISTENCE_IMPL_CONNECTIONHELPER_P_H
     18#ifndef COMMON_PERSISTENCE_IMPL_STORAGECONNECTIONHELPER_P_H
     19#define COMMON_PERSISTENCE_IMPL_STORAGECONNECTIONHELPER_P_H
    2020
    2121#include <QMap>
     
    5454} // namespace Persistence
    5555
    56 #endif // COMMON_PERSISTENCE_IMPL_CONNECTIONHELPER_P_H
     56#endif // COMMON_PERSISTENCE_IMPL_STORAGECONNECTIONHELPER_P_H
  • common/persistence/impl/versionedstorage.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef PERS_VERSIONEDSTORAGE_H_
    19 #define PERS_VERSIONEDSTORAGE_H_
     18#ifndef COMMON_PERSISTENCE_IMPL_VERSIONEDSTORAGE_H
     19#define COMMON_PERSISTENCE_IMPL_VERSIONEDSTORAGE_H
    2020
    2121#include <QString>
     
    5353}
    5454
    55 #endif /* PERS_VERSIONEDSTORAGE_H_ */
     55#endif /* COMMON_PERSISTENCE_IMPL_VERSIONEDSTORAGE_H */
  • common/persistence/istoragehelper.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef ISTORAGEHELPER_H
    19 #define ISTORAGEHELPER_H
     18#ifndef COMMON_PERSISTENCE_ISTORAGEHELPER_H
     19#define COMMON_PERSISTENCE_ISTORAGEHELPER_H
    2020
    2121#include "common/global.h"
     
    3737Q_DECLARE_INTERFACE(Persistence::IStorageHelper, "ch.gorrion.smssender.IStorageHelper/1.0")
    3838
    39 #endif // ISTORAGEHELPER_H
     39#endif // COMMON_PERSISTENCE_ISTORAGEHELPER_H
  • common/utils/smacros.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 
    19 #ifndef SMACROS_H_
    20 #define SMACROS_H_
     18#ifndef COMMON_UTILS_SMACROS_H
     19#define COMMON_UTILS_SMACROS_H
    2120
    2221#include <QHash>
     
    110109#define S_SINGLETON_IMPL(Class)
    111110
    112 #endif /* SMACROS_H_ */
     111#endif /* COMMON_UTILS_SMACROS_H */
  • common/utils/sshared.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 
    19 #ifndef SSHARED_H_
    20 #define SSHARED_H_
     18#ifndef COMMON_UTILS_SSHARED_H
     19#define COMMON_UTILS_SSHARED_H
    2120
    2221#include <QExplicitlySharedDataPointer>
     
    8887bool Class::operator ==(const Class& other) const { return d == other.d; }
    8988
    90 #endif /* SSHARED_H_ */
     89#endif /* COMMON_UTILS_SSHARED_H */
  • common/utils/staskmanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 
    19 #ifndef STASKMANAGER_H_
    20 #define STASKMANAGER_H_
     18#ifndef COMMON_UTILS_STASKMANAGER_H
     19#define COMMON_UTILS_STASKMANAGER_H
    2120
    2221#include <QObject>
     
    6867};
    6968
    70 #endif /* STASKMANAGER_H_ */
     69#endif /* COMMON_UTILS_STASKMANAGER_H */
  • common/utils/sutils.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SUTILS_H
    19 #define SUTILS_H
     18#ifndef COMMON_UTILS_SUTILS_H
     19#define COMMON_UTILS_SUTILS_H
    2020
    2121#include <QString>
     
    2828};
    2929
    30 #endif // SUTILS_H
     30#endif // COMMON_UTILS_SUTILS_H
  • common/validation/defaultaccountvalidator.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef DEFAULTACCOUNTVALIDATOR_H_
    19 #define DEFAULTACCOUNTVALIDATOR_H_
     18#ifndef COMMON_VALIDATION_DEFAULTACCOUNTVALIDATOR_H
     19#define COMMON_VALIDATION_DEFAULTACCOUNTVALIDATOR_H
    2020
    2121#include "common/business/iaccount.h"
     
    3737};
    3838
    39 #endif /* DEFAULTACCOUNTVALIDATOR_H_ */
     39#endif /* COMMON_VALIDATION_DEFAULTACCOUNTVALIDATOR_H */
  • common/validation/svalidationresult.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SVALIDATIONRESULT_H_
    19 #define SVALIDATIONRESULT_H_
     18#ifndef COMMON_VALIDATION_SVALIDATIONRESULT_H
     19#define COMMON_VALIDATION_SVALIDATIONRESULT_H
    2020
    2121#include <QString>
     
    5757};
    5858
    59 #endif /* SVALIDATIONRESULT_H_ */
     59#endif /* COMMON_VALIDATION_SVALIDATIONRESULT_H */
  • frontend/business/accountinitmanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef ACCOUNTINITMANAGER_H_
    19 #define ACCOUNTINITMANAGER_H_
     18#ifndef FRONTEND_ACCOUNTINITMANAGER_H
     19#define FRONTEND_ACCOUNTINITMANAGER_H
    2020
    2121#include <QList>
     
    5858};
    5959
    60 #endif /* ACCOUNTINITMANAGER_H_ */
     60#endif /* FRONTEND_ACCOUNTINITMANAGER_H */
  • frontend/business/accountintegrationhelper.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef ACCOUNTINTEGRATIONHELPER_H
    19 #define ACCOUNTINTEGRATIONHELPER_H
     18#ifndef FRONTEND_ACCOUNTINTEGRATIONHELPER_H
     19#define FRONTEND_ACCOUNTINTEGRATIONHELPER_H
    2020
    2121#include "common/business/iintegration.h"
     
    4545};
    4646
    47 #endif // ACCOUNTINTEGRATIONHELPER_H
     47#endif // FRONTEND_ACCOUNTINTEGRATIONHELPER_H
  • frontend/business/accountmanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef ACCOUNTMANAGER_H_
    19 #define ACCOUNTMANAGER_H_
     18#ifndef FRONTEND_ACCOUNTMANAGER_H
     19#define FRONTEND_ACCOUNTMANAGER_H
    2020
    2121#include <QScopedPointer>
     
    7070};
    7171
    72 #endif /* ACCOUNTMANAGER_H_ */
     72#endif /* FRONTEND_ACCOUNTMANAGER_H */
  • frontend/business/contactimporter/abstractgooglecontactimporter.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef ABSTRACTGOOGLECONTACTIMPORTER_H_
    19 #define ABSTRACTGOOGLECONTACTIMPORTER_H_
     18#ifndef FRONTEND_CONTACTIMPORTER_ABSTRACTGOOGLECONTACTIMPORTER_H
     19#define FRONTEND_CONTACTIMPORTER_ABSTRACTGOOGLECONTACTIMPORTER_H
    2020
    2121#include <QScopedPointer>
     
    5353};
    5454
    55 #endif /* ABSTRACTGOOGLECONTACTIMPORTER_H_ */
     55#endif /* FRONTEND_CONTACTIMPORTER_ABSTRACTGOOGLECONTACTIMPORTER_H */
  • frontend/business/contactimporter/contactfilesimporter.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef CONTACTFILESIMPORTER_H_
    19 #define CONTACTFILESIMPORTER_H_
     18#ifndef FRONTEND_CONTACTIMPORTER_CONTACTFILESIMPORTER_H
     19#define FRONTEND_CONTACTIMPORTER_CONTACTFILESIMPORTER_H
    2020
    2121#include <QMap>
     
    8181};
    8282
    83 #endif /* ABSTRACTCONTACTFILESIMPORTER_H_ */
     83#endif /* FRONTEND_CONTACTIMPORTER_CONTACTFILESIMPORTER_H */
  • frontend/business/contactimportermanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 
    19 #ifndef CONTACTIMPORTERMANAGER_H_
    20 #define CONTACTIMPORTERMANAGER_H_
     18#ifndef FRONTEND_CONTACTIMPORTERMANAGER_H
     19#define FRONTEND_CONTACTIMPORTERMANAGER_H
    2120
    2221#include <QObject>
     
    5655};
    5756
    58 #endif /* CONTACTIMPORTERMANAGER_H_ */
     57#endif /* FRONTEND_CONTACTIMPORTERMANAGER_H */
  • frontend/business/contactmanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef CONTACTMANAGER_H_
    19 #define CONTACTMANAGER_H_
     18#ifndef FRONTEND_CONTACTMANAGER_H
     19#define FRONTEND_CONTACTMANAGER_H
    2020
    2121#include <QMap>
     
    7272};
    7373
    74 #endif /* CONTACTMANAGER_H_ */
     74#endif /* FRONTEND_CONTACTMANAGER_H */
  • frontend/business/erroraccount.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef ERRORACCOUNT_H_
    19 #define ERRORACCOUNT_H_
     18#ifndef FRONTEND_ERRORACCOUNT_H
     19#define FRONTEND_ERRORACCOUNT_H
    2020
    2121#include "common/business/iaccount.h"
     
    132132};
    133133
    134 
    135 #endif /* ERRORACCOUNT_H_ */
     134#endif /* FRONTEND_ERRORACCOUNT_H */
  • frontend/business/gatewaymanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef GATEWAYMANAGER_H_
    19 #define GATEWAYMANAGER_H_
     18#ifndef FRONTEND_GATEWAYMANAGER_H
     19#define FRONTEND_GATEWAYMANAGER_H
    2020
    2121#include <QMap>
     
    4040};
    4141
    42 #endif /* GATEWAYMANAGER_H_ */
     42#endif /* FRONTEND_GATEWAYMANAGER_H */
  • frontend/business/groupmanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef GROUPMANAGER_H_
    19 #define GROUPMANAGER_H_
     18#ifndef FRONTEND_GROUPMANAGER_H
     19#define FRONTEND_GROUPMANAGER_H
    2020
    2121#include <QMap>
     
    6868};
    6969
    70 #endif /* GROUPMANAGER_H_ */
     70#endif /* FRONTEND_GROUPMANAGER_H */
  • frontend/business/libraryloader_base.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef LIBRARYLOADER_BASE_H_
    19 #define LIBRARYLOADER_BASE_H_
     18#ifndef FRONTEND_LIBRARYLOADER_BASE_H
     19#define FRONTEND_LIBRARYLOADER_BASE_H
    2020
    2121#include <QDir>
     
    5151};
    5252
    53 #endif /* LIBRARYLOADER_BASE_H_ */
     53#endif /* FRONTEND_LIBRARYLOADER_BASE_H */
  • frontend/business/settings.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SETTINGS_H
    19 #define SETTINGS_H
     18#ifndef FRONTEND_SETTINGS_H
     19#define FRONTEND_SETTINGS_H
    2020
    2121#ifdef FRONTEND_GUI
     
    2323#endif
    2424
    25 #endif // SETTINGS_H
     25#endif // FRONTEND_SETTINGS_H
  • frontend/business/settings_base.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SETTINGS_BASE_H_
    19 #define SETTINGS_BASE_H_
     18#ifndef FRONTEND_SETTINGS_BASE_H
     19#define FRONTEND_SETTINGS_BASE_H
    2020
    2121#include <QDir>
     
    102102};
    103103
    104 #endif /* SETTINGS_BASE_H_ */
     104#endif /* FRONTEND_SETTINGS_BASE_H */
  • frontend/business/suffixmanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SUFFIXMANAGER_H_
    19 #define SUFFIXMANAGER_H_
     18#ifndef FRONTEND_SUFFIXMANAGER_H
     19#define FRONTEND_SUFFIXMANAGER_H
    2020
    2121#include <QObject>
     
    6565};
    6666
    67 #endif /* SUFFIXMANAGER_H_ */
     67#endif /* FRONTEND_SUFFIXMANAGER_H */
  • frontend/business/updatemanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 
    19 #ifndef UPDATEMANAGER_H_
    20 #define UPDATEMANAGER_H_
     18#ifndef FRONTEND_UPDATEMANAGER_H
     19#define FRONTEND_UPDATEMANAGER_H
    2120
    2221#include <QObject>
     
    5857};
    5958
    60 #endif /* UPDATEMANAGER_H_ */
     59#endif /* FRONTEND_UPDATEMANAGER_H */
  • frontend/business/updatemanager_p.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 #ifndef UPDATEMANAGER_P_H_
    19 #define UPDATEMANAGER_P_H_
     18#ifndef FRONTEND_UPDATEMANAGER_P_H
     19#define FRONTEND_UPDATEMANAGER_P_H
    2020
    2121#include "common/domain/stask.h"
     
    4646};
    4747
    48 #endif /* UPDATEMANAGER_P_H_ */
     48#endif /* FRONTEND_UPDATEMANAGER_P_H */
  • frontend/gui/persistence/mainstorage.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef FRONTEND_GUI_MAINSTORAGE_H
    19 #define FRONTEND_GUI_MAINSTORAGE_H
     18#ifndef FRONTEND_GUI_PERSISTENCE_MAINSTORAGE_H
     19#define FRONTEND_GUI_PERSISTENCE_MAINSTORAGE_H
    2020
    2121#include "frontend/persistence/mainstorage_base.h"
     
    3636} // namespace Persistence
    3737
    38 #endif // FRONTEND_GUI_MAINSTORAGE_H
     38#endif // FRONTEND_GUI_PERSISTENCE_MAINSTORAGE_H
  • frontend/gui/persistence/persistencefactory.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef FRONTEND_GUI_PERSISTENCEFACTORY_H
    19 #define FRONTEND_GUI_PERSISTENCEFACTORY_H
     18#ifndef FRONTEND_GUI_PERSISTENCE_PERSISTENCEFACTORY_H
     19#define FRONTEND_GUI_PERSISTENCE_PERSISTENCEFACTORY_H
    2020
    2121#include <QDir>
     
    6868}
    6969
    70 #endif /* FRONTEND_GUI_PERSISTENCEFACTORY_H */
     70#endif /* FRONTEND_GUI_PERSISTENCE_PERSISTENCEFACTORY_H */
  • frontend/gui/ui/about.h

    r317 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_ABOUT_H
    19 #define UI_ABOUT_H
     18#ifndef FRONTEND_GUI_UI_ABOUT_H
     19#define FRONTEND_GUI_UI_ABOUT_H
    2020
    2121#include "ui_about.h"
     
    4040} // namespace UI
    4141
    42 #endif // UI_ABOUT_H
     42#endif // FRONTEND_GUI_UI_ABOUT_H
  • frontend/gui/ui/accountlist.h

    r317 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_ACCOUNTLIST_H
    19 #define UI_ACCOUNTLIST_H
     18#ifndef FRONTEND_GUI_UI_ACCOUNTLIST_H
     19#define FRONTEND_GUI_UI_ACCOUNTLIST_H
    2020
    2121#include <QtGui/QDialog>
     
    6262} // namespace UI
    6363
    64 #endif // UI_ACCOUNTLIST_H
     64#endif // FRONTEND_GUI_UI_ACCOUNTLIST_H
  • frontend/gui/ui/addressbook.h

    r317 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_ADDRESSBOOK_H
    19 #define UI_ADDRESSBOOK_H
     18#ifndef FRONTEND_GUI_UI_ADDRESSBOOK_H
     19#define FRONTEND_GUI_UI_ADDRESSBOOK_H
    2020
    2121#include "ui_addressbook.h"
     
    8585} // namespace UI
    8686
    87 #endif // UI_ADDRESSBOOK_H
     87#endif // FRONTEND_GUI_UI_ADDRESSBOOK_H
  • frontend/gui/ui/completers/bettercompleter.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_BETTERCOMPLETER_H_
    19 #define UI_BETTERCOMPLETER_H_
     18#ifndef FRONTEND_GUI_UI_COMPLETERS_BETTERCOMPLETER_H
     19#define FRONTEND_GUI_UI_COMPLETERS_BETTERCOMPLETER_H
    2020
    2121#include <QCompleter>
     
    8282} // namespace UI
    8383
    84 #endif /* UI_BETTERCOMPLETER_H_ */
     84#endif /* FRONTEND_GUI_UI_COMPLETERS_BETTERCOMPLETER_H */
  • frontend/gui/ui/components/clearbutton.h

    r315 r319  
    6161****************************************************************************/
    6262
    63 #ifndef UI_CLEARBUTTON_H
    64 #define UI_CLEARBUTTON_H
     63#ifndef FRONTEND_GUI_UI_COMPONENTS_CLEARBUTTON_H
     64#define FRONTEND_GUI_UI_COMPONENTS_CLEARBUTTON_H
    6565
    6666#include <qabstractbutton.h>
     
    8787} // namespace UI
    8888
    89 #endif // UI_CLEARBUTTON_H
    90 
     89#endif // FRONTEND_GUI_UI_COMPONENTS_CLEARBUTTON_H
  • frontend/gui/ui/components/lineedit.h

    r315 r319  
    2626 * SUCH DAMAGE.
    2727 */
    28 #ifndef UI_LINEEDIT_H
    29 #define UI_LINEEDIT_H
     28#ifndef FRONTEND_GUI_UI_COMPONENTS_LINEEDIT_H
     29#define FRONTEND_GUI_UI_COMPONENTS_LINEEDIT_H
    3030
    3131#include <QLineEdit>
     
    8989} // namespace UI
    9090
    91 #endif // UI_LINEEDIT_H
     91#endif // FRONTEND_GUI_UI_COMPONENTS_LINEEDIT_H
    9292
  • frontend/gui/ui/components/lineedit_p.h

    r315 r319  
    2626 * SUCH DAMAGE.
    2727 */
    28 #ifndef UI_LINEEDIT_P_H
    29 #define UI_LINEEDIT_P_H
     28#ifndef FRONTEND_GUI_UI_COMPONENTS_LINEEDIT_P_H
     29#define FRONTEND_GUI_UI_COMPONENTS_LINEEDIT_P_H
    3030
    3131#include <QWidget>
     
    5050} // namespace UI
    5151
    52 #endif // UI_LINEEDIT_P_H
    53 
     52#endif // FRONTEND_GUI_UI_COMPONENTS_LINEEDIT_P_H
  • frontend/gui/ui/components/searchbutton.h

    r315 r319  
    1717 * Boston, MA  02110-1301  USA
    1818 */
    19 #ifndef UI_SEARCHBUTTON_H
    20 #define UI_SEARCHBUTTON_H
     19#ifndef FRONTEND_GUI_UI_COMPONENTS_SEARCHBUTTON_H
     20#define FRONTEND_GUI_UI_COMPONENTS_SEARCHBUTTON_H
    2121
    2222#include <qabstractbutton.h>
     
    4545} // namespace UI
    4646
    47 #endif // UI_SEARCHBUTTON_H
     47#endif // FRONTEND_GUI_UI_COMPONENTS_SEARCHBUTTON_H
    4848
  • frontend/gui/ui/components/searchlineedit.h

    r315 r319  
    2626 * SUCH DAMAGE.
    2727 */
    28 #ifndef UI_SEARCHLINEEDIT_H
    29 #define UI_SEARCHLINEEDIT_H
     28#ifndef FRONTEND_GUI_UI_COMPONENTS_SEARCHLINEEDIT_H
     29#define FRONTEND_GUI_UI_COMPONENTS_SEARCHLINEEDIT_H
    3030
    3131#include "lineedit.h"
     
    5454} // namespace UI
    5555
    56 #endif // UI_SEARCHLINEEDIT_H
     56#endif // FRONTEND_GUI_UI_COMPONENTS_SEARCHLINEEDIT_H
    5757
  • frontend/gui/ui/components/taskstatusbar.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_STATUSBARBUTTON_H_
    19 #define UI_STATUSBARBUTTON_H_
     18#ifndef FRONTEND_GUI_UI_COMPONENTS_TASKSTATUSBAR_H
     19#define FRONTEND_GUI_UI_COMPONENTS_TASKSTATUSBAR_H
    2020
    2121#include <QLabel>
     
    7070} // namespace UI
    7171
    72 #endif /* UI_STATUSBARBUTTON_H_ */
     72#endif /* FRONTEND_GUI_UI_COMPONENTS_TASKSTATUSBAR_H */
  • frontend/gui/ui/editaccount.h

    r317 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_EDITACCOUNT_H
    19 #define UI_EDITACCOUNT_H
     18#ifndef FRONTEND_GUI_UI_EDITACCOUNT_H
     19#define FRONTEND_GUI_UI_EDITACCOUNT_H
    2020
    2121#include <QDialog>
     
    6666} // namespace UI
    6767
    68 #endif // UI_EDITACCOUNT_H
     68#endif // FRONTEND_GUI_UI_EDITACCOUNT_H
  • frontend/gui/ui/editcontact.h

    r317 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_EDITCONTACT_H
    19 #define UI_EDITCONTACT_H
     18#ifndef FRONTEND_GUI_UI_EDITCONTACT_H
     19#define FRONTEND_GUI_UI_EDITCONTACT_H
    2020
    2121#include "ui_editcontact.h"
     
    7474} // namespace UI
    7575
    76 #endif // UI_EDITCONTACT_H
     76#endif // FRONTEND_GUI_UI_EDITCONTACT_H
  • frontend/gui/ui/editgroup.h

    r317 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_EDITGROUP_H
    19 #define UI_EDITGROUP_H
     18#ifndef FRONTEND_GUI_UI_EDITGROUP_H
     19#define FRONTEND_GUI_UI_EDITGROUP_H
    2020
    2121#include <QtGui/QDialog>
     
    7777} // namespace UI
    7878
    79 #endif // UI_EDITGROUP_H
     79#endif // FRONTEND_GUI_UI_EDITGROUP_H
  • frontend/gui/ui/guiintegrationhelper.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef GUIINTEGRATIONHELPER_H_
    19 #define GUIINTEGRATIONHELPER_H_
     18#ifndef FRONTEND_GUI_UI_GUIINTEGRATIONHELPER_H
     19#define FRONTEND_GUI_UI_GUIINTEGRATIONHELPER_H
    2020
    2121#include <QMenu>
     
    5353} // namespace UI
    5454
    55 #endif /* GUIINTEGRATIONHELPER_H_ */
     55#endif /* FRONTEND_GUI_UI_GUIINTEGRATIONHELPER_H */
  • frontend/gui/ui/guimanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef GUIMANAGER_H
    19 #define GUIMANAGER_H
     18#ifndef FRONTEND_GUI_UI_GUIMANAGER_H
     19#define FRONTEND_GUI_UI_GUIMANAGER_H
    2020
    2121#include <QMenu>
     
    7676} // namespace UI
    7777
    78 #endif // GUIMANAGER_H
     78#endif // FRONTEND_GUI_UI_GUIMANAGER_H
  • frontend/gui/ui/guimanager_p.h

    r316 r319  
    1616  along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 #ifndef GUIMANAGER_P_H_
    19 #define GUIMANAGER_P_H_
     18#ifndef FRONTEND_GUI_UI_GUIMANAGER_P_H
     19#define FRONTEND_GUI_UI_GUIMANAGER_P_H
    2020
    2121#include "common/domain/sdatatypes.h"
     
    4242}
    4343
    44 #endif /* GUIMANAGER_P_H_ */
     44#endif /* FRONTEND_GUI_UI_GUIMANAGER_P_H */
  • frontend/gui/ui/importcontacts/importcontacts_datamanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_IMPORTCONTACTS_DATAMANAGER_H_
    19 #define UI_IMPORTCONTACTS_DATAMANAGER_H_
     18#ifndef FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_DATAMANAGER_H
     19#define FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_DATAMANAGER_H
    2020
    2121#include <QSet>
     
    5757} // namespace UI
    5858
    59 #endif /* UI_IMPORTCONTACTS_DATAMANAGER_H_ */
     59#endif /* FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_DATAMANAGER_H */
  • frontend/gui/ui/importcontacts/importcontacts_importedcontacttablemodel.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_IMPORTCONTACTS_IMPORTEDCONTACTTABLEMODEL_H
    19 #define UI_IMPORTCONTACTS_IMPORTEDCONTACTTABLEMODEL_H
     18#ifndef FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_IMPORTEDCONTACTTABLEMODEL_H
     19#define FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_IMPORTEDCONTACTTABLEMODEL_H
    2020
    2121#include <QAbstractTableModel>
     
    6868} // namespace UI
    6969
    70 #endif // UI_IMPORTCONTACTS_IMPORTEDCONTACTTABLEMODEL_H
     70#endif // FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_IMPORTEDCONTACTTABLEMODEL_H
    7171
  • frontend/gui/ui/importcontacts/importcontacts_page_conclusion.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_IMPORTCONTACTS_PAGE_CONCLUSION_H
    19 #define UI_IMPORTCONTACTS_PAGE_CONCLUSION_H
     18#ifndef FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_PAGE_CONCLUSION_H
     19#define FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_PAGE_CONCLUSION_H
    2020
    2121#include "ui_importcontacts_page_conclusion.h"
     
    7575} // namespace UI
    7676
    77 #endif // UI_IMPORTCONTACTS_PAGE_CONCLUSION_H
     77#endif // FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_PAGE_CONCLUSION_H
  • frontend/gui/ui/importcontacts/importcontacts_page_editcontacts.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_IMPORTCONTACTS_PAGE_EDITCONTACTS_H
    19 #define UI_IMPORTCONTACTS_PAGE_EDITCONTACTS_H
     18#ifndef FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_PAGE_EDITCONTACTS_H
     19#define FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_PAGE_EDITCONTACTS_H
    2020
    2121#include "ui_importcontacts_page_editcontacts.h"
     
    6565} // namespace UI
    6666
    67 #endif // UI_IMPORTCONTACTS_PAGE_EDITCONTACTS_H
     67#endif // FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_PAGE_EDITCONTACTS_H
  • frontend/gui/ui/importcontacts/importcontacts_page_import.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_IMPORTCONTACTS_PAGE_IMPORT_H
    19 #define UI_IMPORTCONTACTS_PAGE_IMPORT_H
     18#ifndef FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_PAGE_IMPORT_H
     19#define FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_PAGE_IMPORT_H
    2020
    2121#include "ui_importcontacts_page_import.h"
     
    9999} // namespace UI
    100100
    101 #endif // UI_IMPORTCONTACTS_PAGE_IMPORT_H
     101#endif // FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_PAGE_IMPORT_H
  • frontend/gui/ui/importcontacts/importcontacts_page_intro.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_IMPORTCONTACTS_PAGE_INTRO_H
    19 #define UI_IMPORTCONTACTS_PAGE_INTRO_H
     18#ifndef FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_PAGE_INTRO_H
     19#define FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_PAGE_INTRO_H
    2020
    2121#include "ui_importcontacts_page_intro.h"
     
    5353} // namespace UI
    5454
    55 #endif // UI_IMPORTCONTACTS_PAGE_INTRO_H
     55#endif // FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTS_PAGE_INTRO_H
  • frontend/gui/ui/importcontacts/importcontactswizard.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_IMPORTCONTACTSWIZARD_H_
    19 #define UI_IMPORTCONTACTSWIZARD_H_
     18#ifndef FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTSWIZARD_H
     19#define FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTCONTACTSWIZARD_H
    2020
    2121#include <QMap>
     
    5252} // namespace UI
    5353
    54 #endif /* IMPORTCONTACTSWIZARD_H_ */
     54#endif /* FRONTEND_GUI_IMPORTCONTACTS_IMPORTCONTACTSWIZARD_H */
  • frontend/gui/ui/importcontacts/importerpages/contactfilesmodel.h

    r317 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_CFI_CONTACTFILESMODEL_H
    19 #define UI_CFI_CONTACTFILESMODEL_H
     18#ifndef FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTERPAGES_CONTACTFILESMODEL_H
     19#define FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTERPAGES_CONTACTFILESMODEL_H
    2020
    2121#include <QAbstractTableModel>
     
    6161} // namespace UI
    6262
    63 #endif /* UI_CFI_CONTACTFILESMODEL_H */
     63#endif /* FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTERPAGES_CONTACTFILESMODEL_H */
  • frontend/gui/ui/importcontacts/importerpages/file_page_config.h

    r317 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_CFI_PAGE_CONFIG_H
    19 #define UI_CFI_PAGE_CONFIG_H
     18#ifndef FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTERPAGES_FILE_PAGE_CONFIG_H
     19#define FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTERPAGES_FILE_PAGE_CONFIG_H
    2020
    2121#include "ui_file_page_config.h"
     
    4949} // namespace UI
    5050
    51 #endif // UI_CFI_PAGE_CONFIG_H
     51#endif // FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTERPAGES_FILE_PAGE_CONFIG_H
  • frontend/gui/ui/importcontacts/importerpages/google_page_config.h

    r317 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_GCI_PAGE_CONFIG_H
    19 #define UI_GCI_PAGE_CONFIG_H
     18#ifndef FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTERPAGES_GOOGLE_PAGE_CONFIG_H
     19#define FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTERPAGES_GOOGLE_PAGE_CONFIG_H
    2020
    2121#include "ui_google_page_config.h"
     
    4545} // namespace UI
    4646
    47 #endif // UI_GCI_PAGE_CONFIG_H
     47#endif // FRONTEND_GUI_UI_IMPORTCONTACTS_IMPORTERPAGES_GOOGLE_PAGE_CONFIG_H
  • frontend/gui/ui/main.h

    r317 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_MAIN_H
    19 #define UI_MAIN_H
     18#ifndef FRONTEND_GUI_UI_MAIN_H
     19#define FRONTEND_GUI_UI_MAIN_H
    2020
    2121#include "ui_main.h"
     
    162162} // namespace UI
    163163
    164 #endif // UI_MAIN_H
     164#endif // FRONTEND_GUI_UI_MAIN_H
  • frontend/gui/ui/models/accounttreemodel.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_ACCOUNTTREEMODEL_H
    19 #define UI_ACCOUNTTREEMODEL_H
     18#ifndef FRONTEND_GUI_UI_MODELS_ACCOUNTTREEMODEL_H
     19#define FRONTEND_GUI_UI_MODELS_ACCOUNTTREEMODEL_H
    2020
    2121#include <QObject>
     
    7272} // namespace UI
    7373
    74 #endif // UI_ACCOUNTTREEMODEL_H
     74#endif // FRONTEND_GUI_UI_MODELS_ACCOUNTTREEMODEL_H
    7575
  • frontend/gui/ui/models/aliascompletionmodel.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_ALIASCOMPLETIONMODEL_H
    19 #define UI_ALIASCOMPLETIONMODEL_H
     18#ifndef FRONTEND_GUI_UI_MODELS_ALIASCOMPLETIONMODEL_H
     19#define FRONTEND_GUI_UI_MODELS_ALIASCOMPLETIONMODEL_H
    2020
    2121#include "frontend/gui/ui/completers/bettercompleter.h"
     
    4444} // namespace UI
    4545
    46 #endif // UI_ALIASCOMPLETIONMODEL_H
     46#endif // FRONTEND_GUI_UI_MODELS_ALIASCOMPLETIONMODEL_H
  • frontend/gui/ui/models/contactgroupmodel.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_CONTACTGROUPMODEL_H
    19 #define UI_CONTACTGROUPMODEL_H
     18#ifndef FRONTEND_GUI_UI_MODELS_CONTACTGROUPMODEL_H
     19#define FRONTEND_GUI_UI_MODELS_CONTACTGROUPMODEL_H
    2020
    2121#include <QAbstractListModel>
     
    9292} // namespace UI
    9393
    94 #endif // UI_CONTACTGROUPMODEL_H
    95 
     94#endif // FRONTEND_GUI_UI_MODELS_CONTACTGROUPMODEL_H
  • frontend/gui/ui/models/contacttablemodel.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_CONTACTTABLEMODEL_H
    19 #define UI_CONTACTTABLEMODEL_H
     18#ifndef FRONTEND_GUI_UI_MODELS_CONTACTTABLEMODEL_H
     19#define FRONTEND_GUI_UI_MODELS_CONTACTTABLEMODEL_H
    2020
    2121#include <QAbstractTableModel>
     
    6565} // namespace UI
    6666
    67 #endif // UI_CONTACTTABLEMODEL_H
    68 
     67#endif // FRONTEND_GUI_UI_MODELS_CONTACTTABLEMODEL_H
  • frontend/gui/ui/models/grouptablemodel.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_GROUPTABLEMODEL_H
    19 #define UI_GROUPTABLEMODEL_H
     18#ifndef FRONTEND_GUI_UI_MODELS_GROUPTABLEMODEL_H
     19#define FRONTEND_GUI_UI_MODELS_GROUPTABLEMODEL_H
    2020
    2121#include <QAbstractTableModel>
     
    6565} // namespace UI
    6666
    67 #endif // UI_GROUPTABLEMODEL_H
     67#endif // FRONTEND_GUI_UI_MODELS_GROUPTABLEMODEL_H
  • frontend/gui/ui/models/loadedaccountmodel.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_LOADEDACCOUNTMODEL_H_
    19 #define UI_LOADEDACCOUNTMODEL_H_
     18#ifndef FRONTEND_GUI_UI_MODELS_LOADEDACCOUNTMODEL_H
     19#define FRONTEND_GUI_UI_MODELS_LOADEDACCOUNTMODEL_H
    2020
    2121#include <QSortFilterProxyModel>
     
    4747} // namespace UI
    4848
    49 #endif /* UI_LOADEDACCOUNTMODEL_H_ */
     49#endif /* FRONTEND_GUI_UI_MODELS_LOADEDACCOUNTMODEL_H */
  • frontend/gui/ui/sendingdialog.h

    r317 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_SENDINGDIALOG_H
    19 #define UI_SENDINGDIALOG_H
     18#ifndef FRONTEND_GUI_UI_SENDINGDIALOG_H
     19#define FRONTEND_GUI_UI_SENDINGDIALOG_H
    2020
    2121#include "ui_sendingdialog.h"
     
    5252} // namespace UI
    5353
    54 #endif // UI_SENDINGDIALOG_H
     54#endif // FRONTEND_GUI_UI_SENDINGDIALOG_H
  • frontend/gui/ui/settingsdialog.h

    r317 r319  
    1616  along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 #ifndef UI_SETTINGS_H
    19 #define UI_SETTINGS_H
     18#ifndef FRONTEND_GUI_UI_SETTINGSDIALOG_H
     19#define FRONTEND_GUI_UI_SETTINGSDIALOG_H
    2020
    2121#include "ui_settingsdialog.h"
     
    9191} // namespace UI
    9292
    93 #endif // UI_SETTINGS_H
     93#endif // FRONTEND_GUI_UI_SETTINGSDIALOG_H
  • frontend/gui/ui/updatedialog.h

    r317 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef UI_UPDATEDIALOG_H
    19 #define UI_UPDATEDIALOG_H
     18#ifndef FRONTEND_GUI_UI_UPDATEDIALOG_H
     19#define FRONTEND_GUI_UI_UPDATEDIALOG_H
    2020
    2121#include <QtGui/QDialog>
     
    4141} // namespace UI
    4242
    43 #endif // UI_UPDATEDIALOG_H
     43#endif // FRONTEND_GUI_UI_UPDATEDIALOG_H
  • frontend/persistence/accountmanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef PERS_ACCOUNTMANAGER_H_
    19 #define PERS_ACCOUNTMANAGER_H_
     18#ifndef FRONTEND_PERSISTENCE_ACCOUNTMANAGER_H
     19#define FRONTEND_PERSISTENCE_ACCOUNTMANAGER_H
    2020
    2121#include <QScopedPointer>
     
    7575} // namespace Persistence
    7676
    77 #endif /* PERS_ACCOUNTMANAGER_H_ */
     77#endif /* FRONTEND_PERSISTENCE_ACCOUNTMANAGER_H */
  • frontend/persistence/contactmanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef PERS_CONTACTMANAGER_H_
    19 #define PERS_CONTACTMANAGER_H_
     18#ifndef FRONTEND_PERSISTENCE_CONTACTMANAGER_H
     19#define FRONTEND_PERSISTENCE_CONTACTMANAGER_H
    2020
    2121#include <QScopedPointer>
     
    6464}
    6565
    66 #endif /* PERS_CONTACTMANAGER_H_ */
     66#endif /* FRONTEND_PERSISTENCE_CONTACTMANAGER_H */
  • frontend/persistence/database.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef DATABASE_H
    19 #define DATABASE_H
     18#ifndef FRONTEND_PERSISTENCE_DATABASE_H
     19#define FRONTEND_PERSISTENCE_DATABASE_H
    2020
    2121#include <QMutex>
     
    5353} // namespace Persistence
    5454
    55 #endif // DATABASE_H
     55#endif // FRONTEND_PERSISTENCE_DATABASE_H
  • frontend/persistence/groupmanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef PERS_GROUPMANAGER_H_
    19 #define PERS_GROUPMANAGER_H_
     18#ifndef FRONTEND_PERSISTENCE_GROUPMANAGER_H
     19#define FRONTEND_PERSISTENCE_GROUPMANAGER_H
    2020
    2121#include <QScopedPointer>
     
    6666}
    6767
    68 #endif /* PERS_GROUPMANAGER_H_ */
     68#endif /* FRONTEND_PERSISTENCE_GROUPMANAGER_H */
  • frontend/persistence/mainstorage_base.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef PERS_MAINSTORAGE_BASE_H_
    19 #define PERS_MAINSTORAGE_BASE_H_
     18#ifndef FRONTEND_PERSISTENCE_MAINSTORAGE_BASE_H
     19#define FRONTEND_PERSISTENCE_MAINSTORAGE_BASE_H
    2020
    2121#include <QScopedPointer>
     
    7171}
    7272
    73 #endif /* PERS_MAINSTORAGE_BASE_H_ */
     73#endif /* FRONTEND_PERSISTENCE_MAINSTORAGE_BASE_H */
  • frontend/persistence/persistenceintegrationhelper.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef PERSISTENCEINTEGRATIONHELPER_H
    19 #define PERSISTENCEINTEGRATIONHELPER_H
     18#ifndef FRONTEND_PERSISTENCE_PERSISTENCEINTEGRATIONHELPER_H
     19#define FRONTEND_PERSISTENCE_PERSISTENCEINTEGRATIONHELPER_H
    2020
    2121#include <QScopedPointer>
     
    3939} // namespace Persistence
    4040
    41 #endif // PERSISTENCEINTEGRATIONHELPER_H
     41#endif // FRONTEND_PERSISTENCE_PERSISTENCEINTEGRATIONHELPER_H
  • frontend/persistence/restrictedmainstorage.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef RESTRICTEDMAINSTORAGE_H
    19 #define RESTRICTEDMAINSTORAGE_H
     18#ifndef FRONTEND_PERSISTENCE_RESTRICTEDMAINSTORAGE_H
     19#define FRONTEND_PERSISTENCE_RESTRICTEDMAINSTORAGE_H
    2020
    2121#include <QSharedPointer>
     
    7676} // namespace Persistence
    7777
    78 #endif // RESTRICTEDMAINSTORAGE_H
     78#endif // FRONTEND_PERSISTENCE_RESTRICTEDMAINSTORAGE_H
  • gateways/Schoolnet/business/account.h

    r316 r319  
    1616  along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SCHOOLNET_ACCOUNT_H_
    19 #define SCHOOLNET_ACCOUNT_H_
     18#ifndef SCHOOLNET_ACCOUNT_H
     19#define SCHOOLNET_ACCOUNT_H
    2020
    2121#include <QScopedPointer>
     
    106106} // namespace Schoolnet
    107107
    108 #endif /* SCHOOLNET_ACCOUNT_H_ */
     108#endif /* SCHOOLNET_ACCOUNT_H */
  • gateways/Schoolnet/business/account_tasks.h

    r316 r319  
    1616  along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 #ifndef SCHOOLNET_ACCOUNT_TASKS_H_
    19 #define SCHOOLNET_ACCOUNT_TASKS_H_
     18#ifndef SCHOOLNET_ACCOUNT_TASKS_H
     19#define SCHOOLNET_ACCOUNT_TASKS_H
    2020
    2121#include "gateways/common/business/baseaccount_tasks.h"
     
    6060} // namespace Schoolnet
    6161
    62 #endif /* SCHOOLNET_ACCOUNT_TASKS_H_ */
     62#endif /* SCHOOLNET_ACCOUNT_TASKS_H */
  • gateways/Schoolnet/business/contactimporter/contactimporter_base.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SCHOOLNET_BCCONTACTIMPORTER_H_
    19 #define SCHOOLNET_BCCONTACTIMPORTER_H_
     18#ifndef SCHOOLNET_CONTACTIMPORTER_CONTACTIMPORTER_BASE_H
     19#define SCHOOLNET_CONTACTIMPORTER_CONTACTIMPORTER_BASE_H
    2020
    2121#include <QScopedPointer>
     
    5151}
    5252
    53 #endif /* SCHOOLNET_BCCONTACTIMPORTER_H_ */
     53#endif /* SCHOOLNET_CONTACTIMPORTER_CONTACTIMPORTER_BASE_H */
  • gateways/Schoolnet/business/contactimporter/contactimporter_p.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef CONTACTIMPORTER_P_H
    19 #define CONTACTIMPORTER_P_H
     18#ifndef SCHOOLNET_CONTACTIMPORTER_CONTACTIMPORTER_P_H
     19#define SCHOOLNET_CONTACTIMPORTER_CONTACTIMPORTER_P_H
    2020
    2121#include <QObject>
     
    4848} // namespace Schoolnet
    4949
    50 #endif // CONTACTIMPORTER_P_H
     50#endif // SCHOOLNET_CONTACTIMPORTER_CONTACTIMPORTER_P_H
  • gateways/Schoolnet/business/deepthought/datatypes.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SCHOOLNET_DATATYPES_H_
    19 #define SCHOOLNET_DATATYPES_H_
     18#ifndef SCHOOLNET_DEEPTHOUGHT_DATATYPES_H
     19#define SCHOOLNET_DEEPTHOUGHT_DATATYPES_H
    2020
    2121#include <QList>
     
    193193} // namespace Schoolnet
    194194
    195 #endif /* SCHOOLNET_DATATYPES_H_ */
     195#endif /* SCHOOLNET_DEEPTHOUGHT_DATATYPES_H */
  • gateways/Schoolnet/business/deepthought/deepthoughthelper.h

    r318 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SCHOOLNET_DEEPTHOUGHTHELPER_H_
    19 #define SCHOOLNET_DEEPTHOUGHTHELPER_H_
     18#ifndef SCHOOLNET_DEEPTHOUGHT_DEEPTHOUGHTHELPER_H
     19#define SCHOOLNET_DEEPTHOUGHT_DEEPTHOUGHTHELPER_H
    2020
    2121#include <QObject>
     
    8181} // namespace Schoolnet
    8282
    83 #endif /* SCHOOLNET_DEEPTHOUGHTHELPER_H_ */
     83#endif /* SCHOOLNET_DEEPTHOUGHT_DEEPTHOUGHTHELPER_H */
  • gateways/Schoolnet/business/deepthought/questionmanager.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 
    19 #ifndef QUESTIONMANAGER_H_
    20 #define QUESTIONMANAGER_H_
     18#ifndef SCHOOLNET_DEEPTHOUGHT_QUESTIONMANAGER_H
     19#define SCHOOLNET_DEEPTHOUGHT_QUESTIONMANAGER_H
    2120
    2221#include <QObject>
     
    130129} // namespace Schoolnet
    131130
    132 #endif /* QUESTIONMANAGER_H_ */
     131#endif /* SCHOOLNET_DEEPTHOUGHT_QUESTIONMANAGER_H */
  • gateways/Schoolnet/business/gateway.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SCHOOLNET_BCGATEWAY_H_
    19 #define SCHOOLNET_BCGATEWAY_H_
     18#ifndef SCHOOLNET_GATEWAY_H
     19#define SCHOOLNET_GATEWAY_H
    2020
    2121#include <QObject>
     
    6666}
    6767
    68 #endif /* SCHOOLNET_BCGATEWAY_H_ */
     68#endif /* SCHOOLNET_GATEWAY_H */
  • gateways/Schoolnet/gui/business/contactimporter.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef CONTACTIMPORTER_H
    19 #define CONTACTIMPORTER_H
     18#ifndef SCHOOLNET_GUI_CONTACTIMPORTER_H
     19#define SCHOOLNET_GUI_CONTACTIMPORTER_H
    2020
    2121#include "gateways/Schoolnet/business/contactimporter/contactimporter_base.h"
     
    3535} // namespace Schoolnet
    3636
    37 #endif // CONTACTIMPORTER_H
     37#endif // SCHOOLNET_GUI_CONTACTIMPORTER_H
  • gateways/Schoolnet/gui/schoolnet.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SCHOOLNET_MAIN_H_
    19 #define SCHOOLNET_MAIN_H_
     18#ifndef SCHOOLNET_GUI_SCHOOLNET_H
     19#define SCHOOLNET_GUI_SCHOOLNET_H
    2020
    2121#include <QScopedPointer>
     
    5252} // namespace Schoolnet
    5353
    54 #endif /* SCHOOLNET_MAIN_H_ */
     54#endif /* SCHOOLNET_GUI_SCHOOLNET_H */
  • gateways/Schoolnet/gui/ui/models/questionitemmodel.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SCHOOLNET_QUESTIONITEMMODEL_H_
    19 #define SCHOOLNET_QUESTIONITEMMODEL_H_
     18#ifndef SCHOOLNET_GUI_UI_MODELS_QUESTIONITEMMODEL_H
     19#define SCHOOLNET_GUI_UI_MODELS_QUESTIONITEMMODEL_H
    2020
    2121#include <QStandardItemModel>
     
    3333} // namespace Schoolnet
    3434
    35 #endif /* SCHOOLNET_QUESTIONITEMMODEL_H_ */
     35#endif /* SCHOOLNET_GUI_UI_MODELS_QUESTIONITEMMODEL_H */
  • gateways/Schoolnet/gui/ui/models/questionsortmodel.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef QUESTIONSORTMODEL_H
    19 #define QUESTIONSORTMODEL_H
     18#ifndef SCHOOLNET_GUI_UI_MODELS_QUESTIONSORTMODEL_H
     19#define SCHOOLNET_GUI_UI_MODELS_QUESTIONSORTMODEL_H
    2020
    2121#include <QSortFilterProxyModel>
     
    4949} // namespace Schoolnet
    5050
    51 #endif // QUESTIONSORTMODEL_H
     51#endif // SCHOOLNET_GUI_UI_MODELS_QUESTIONSORTMODEL_H
  • gateways/Schoolnet/gui/ui/models/questiontreemodel.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SCHOOLNET_QUESTIONTREEMODEL_H
    19 #define SCHOOLNET_QUESTIONTREEMODEL_H
     18#ifndef SCHOOLNET_GUI_UI_MODELS_QUESTIONTREEMODEL_H
     19#define SCHOOLNET_GUI_UI_MODELS_QUESTIONTREEMODEL_H
    2020
    2121#include <QMap>
     
    128128} // namespace Schoolnet
    129129
    130 #endif // SCHOOLNET_QUESTIONTREEMODEL_H
    131 
     130#endif // SCHOOLNET_GUI_UI_MODELS_QUESTIONTREEMODEL_H
  • gateways/Schoolnet/gui/ui/questionlistintegration.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef QUESTIONLISTINTEGRATION_H
    19 #define QUESTIONLISTINTEGRATION_H
     18#ifndef SCHOOLNET_GUI_UI_QUESTIONLISTINTEGRATION_H
     19#define SCHOOLNET_GUI_UI_QUESTIONLISTINTEGRATION_H
    2020
    2121#include <QAction>
     
    5353} // namespace Schoolnet
    5454
    55 #endif // QUESTIONLISTINTEGRATION_H
     55#endif // SCHOOLNET_GUI_UI_QUESTIONLISTINTEGRATION_H
  • gateways/Schoolnet/gui/ui/senddialogintegration.h

    r318 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SENDDIALOGINTEGRATION_H
    19 #define SENDDIALOGINTEGRATION_H
     18#ifndef SCHOOLNET_GUI_UI_SENDDIALOGINTEGRATION_H
     19#define SCHOOLNET_GUI_UI_SENDDIALOGINTEGRATION_H
    2020
    2121#include <QObject>
     
    4646} // namespace Schoolnet
    4747
    48 #endif // SENDDIALOGINTEGRATION_H
     48#endif // SCHOOLNET_GUI_UI_SENDDIALOGINTEGRATION_H
  • gateways/Schoolnet/gui/ui/senddialogintegration_p.h

    r318 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SENDDIALOGINTEGRATION_P_H
    19 #define SENDDIALOGINTEGRATION_P_H
     18#ifndef SCHOOLNET_GUI_UI_SENDDIALOGINTEGRATION_P_H
     19#define SCHOOLNET_GUI_UI_SENDDIALOGINTEGRATION_P_H
    2020
    2121#include <QObject>
     
    5555} // namespace Schoolnet
    5656
    57 #endif // SENDDIALOGINTEGRATION_P_H
     57#endif // SCHOOLNET_GUI_UI_SENDDIALOGINTEGRATION_P_H
  • gateways/Schoolnet/network/httphelper.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef HTTPHELPER_H_
    19 #define HTTPHELPER_H_
     18#ifndef SCHOOLNET_NETWORK_HTTPHELPER_H
     19#define SCHOOLNET_NETWORK_HTTPHELPER_H
    2020
    2121#include <QMutex>
     
    5353} // Schoolnet
    5454
    55 #endif /* HTTPHELPER_H_ */
     55#endif /* SCHOOLNET_NETWORK_HTTPHELPER_H */
  • gateways/Schoolnet/persistence/accountstoragehelper.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SCHOOLNET_DAACCOUNTSTORAGEHELPER_H_
    19 #define SCHOOLNET_DAACCOUNTSTORAGEHELPER_H_
     18#ifndef SCHOOLNET_PERSISTENCE_ACCOUNTSTORAGEHELPER_H
     19#define SCHOOLNET_PERSISTENCE_ACCOUNTSTORAGEHELPER_H
    2020
    2121#include "gateways/common/persistence/defaultaccountstoragehelper.h"
     
    3737} // namespace Schoolnet
    3838
    39 #endif /* SCHOOLNET_DAACCOUNTSTORAGEHELPER_H_ */
     39#endif /* SCHOOLNET_PERSISTENCE_ACCOUNTSTORAGEHELPER_H */
  • gateways/Schoolnet/persistence/deepthought/deepthoughtstorage.h

    r316 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SCHOOLNET_DADEEPTHOUGHTSTORAGE_H_
    19 #define SCHOOLNET_DADEEPTHOUGHTSTORAGE_H_
     18#ifndef SCHOOLNET_PERSISTENCE_DEEPTHOUGHT_DEEPTHOUGHTSTORAGE_H
     19#define SCHOOLNET_PERSISTENCE_DEEPTHOUGHT_DEEPTHOUGHTSTORAGE_H
    2020
    2121#include <QDateTime>
     
    8585} // namespace Schoolnet
    8686
    87 #endif /* SCHOOLNET_DADEEPTHOUGHTSTORAGE_H_ */
     87#endif /* SCHOOLNET_PERSISTENCE_DEEPTHOUGHT_DEEPTHOUGHTSTORAGE_H */
  • gateways/common/business/baseaccount.h

    r315 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef BASEACCOUNT_H_
    19 #define BASEACCOUNT_H_
     18#ifndef GATEWAYS_COMMON_BASEACCOUNT_H
     19#define GATEWAYS_COMMON_BASEACCOUNT_H
    2020
    2121#include <QObject>
     
    122122};
    123123
    124 #endif /* BASEACCOUNT_H_ */
     124#endif /* GATEWAYS_COMMON_BASEACCOUNT_H */
  • gateways/common/business/baseaccount_tasks.h

    r315 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef BASEACCOUNT_TASKS_H_
    19 #define BASEACCOUNT_TASKS_H_
     18#ifndef GATEWAYS_COMMON_BASEACCOUNT_TASKS_H
     19#define GATEWAYS_COMMON_BASEACCOUNT_TASKS_H
    2020
    2121#include <QSet>
     
    9494};
    9595
    96 #endif // BASEACCOUNT_TASKS_H_
     96#endif // GATEWAYS_COMMON_BASEACCOUNT_TASKS_H
  • gateways/common/business/baseaccount_utils.h

    r315 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef BASEACCOUNT_UTILS_H
    19 #define BASEACCOUNT_UTILS_H
     18#ifndef GATEWAYS_COMMON_BASEACCOUNT_UTILS_H
     19#define GATEWAYS_COMMON_BASEACCOUNT_UTILS_H
    2020
    2121#define CHECK_FREE_SMS_COUNT() \
     
    2828
    2929
    30 #endif // BASEACCOUNT_UTILS_H
     30#endif // GATEWAYS_COMMON_BASEACCOUNT_UTILS_H
  • gateways/common/business/baselibrary.h

    r315 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef BASELIBRARY_H
    19 #define BASELIBRARY_H
     18#ifndef GATEWAYS_COMMON_BASELIBRARY_H
     19#define GATEWAYS_COMMON_BASELIBRARY_H
    2020
    2121#include <QScopedPointer>
     
    7575};
    7676
    77 #endif // BASELIBRARY_H
     77#endif // GATEWAYS_COMMON_BASELIBRARY_H
  • gateways/common/business/defaultlogininittask.h

    r315 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 #ifndef DEFAULTLOGININITTASK_H_
    19 #define DEFAULTLOGININITTASK_H_
     18#ifndef GATEWAYS_COMMON_DEFAULTLOGININITTASK_H
     19#define GATEWAYS_COMMON_DEFAULTLOGININITTASK_H
    2020
    2121#include "gateways/common/business/baseaccount_tasks.h"
     
    3333};
    3434
    35 #endif /* DEFAULTLOGININITTASK_H_ */
     35#endif /* GATEWAYS_COMMON_DEFAULTLOGININITTASK_H */
  • gateways/common/persistence/defaultaccountstoragehelper.h

    r315 r319  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef DEFAULTACCOUNTSTORAGEHELPER_H
    19 #define DEFAULTACCOUNTSTORAGEHELPER_H
     18#ifndef GATEWAYS_COMMON_PERSISTENCE_DEFAULTACCOUNTSTORAGEHELPER_H
     19#define GATEWAYS_COMMON_PERSISTENCE_DEFAULTACCOUNTSTORAGEHELPER_H
    2020
    2121#include "common/persistence/impl/encryptedstoragehelper.h"
     
    4848}
    4949
    50 #endif // DEFAULTACCOUNTSTORAGEHELPER_H
     50#endif // GATEWAYS_COMMON_PERSISTENCE_DEFAULTACCOUNTSTORAGEHELPER_H
Note: See TracChangeset for help on using the changeset viewer.