lmc/src/lmc.pro | 2 +- lmc/src/lmc_strings.h | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ lmc/src/strings.cpp | 2 +- lmc/src/strings.h | 59 ------------------------------------------------- lmc/src/subcontrols.cpp | 2 +- lmc/src/uidefinitions.h | 2 +- 6 files changed, 63 insertions(+), 63 deletions(-) diff --git a/lmc/src/lmc.pro b/lmc/src/lmc.pro index f9957ce..fe9604a 100644 --- a/lmc/src/lmc.pro +++ b/lmc/src/lmc.pro @@ -67,7 +67,7 @@ HEADERS += \ transferwindow.h \ transferlistview.h \ tcpnetwork.h \ - strings.h \ + lmc_strings.h \ soundplayer.h \ shared.h \ settingsdialog.h \ diff --git a/lmc/src/lmc_strings.h b/lmc/src/lmc_strings.h new file mode 100644 index 0000000..f0c582d --- /dev/null +++ b/lmc/src/lmc_strings.h @@ -0,0 +1,59 @@ +/**************************************************************************** +** +** This file is part of LAN Messenger. +** +** Copyright (c) 2010 - 2012 Qualia Digital Solutions. +** +** Contact: qualiatech@gmail.com +** +** LAN Messenger is free software: you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation, either version 3 of the License, or +** (at your option) any later version. +** +** LAN Messenger is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with LAN Messenger. If not, see . +** +****************************************************************************/ + + +#ifndef STRINGS_H +#define STRINGS_H + +#include +#include + +class lmcStrings { + Q_DECLARE_TR_FUNCTIONS(lmcStrings) + +public: + lmcStrings(void); + ~lmcStrings(void); + + static void retranslate(void); + static const QString appName(void); + static const QString appDesc(void); + static const QString autoConn(void); + static const QStringList fontSize(void); + static const QStringList statusDesc(void); + static const QStringList soundDesc(void); + static const QStringList awayTimeDesc(void); + static const QStringList userListView(void); + +private: + static QString m_appName; + static QString m_appDesc; + static QString m_autoConn; + static QStringList m_fontSize; + static QStringList m_statusDesc; + static QStringList m_soundDesc; + static QStringList m_awayTimeDesc; + static QStringList m_userListView; +}; + +#endif // STRINGS_H diff --git a/lmc/src/strings.cpp b/lmc/src/strings.cpp index 9c74c97..4331b74 100644 --- a/lmc/src/strings.cpp +++ b/lmc/src/strings.cpp @@ -22,7 +22,7 @@ ****************************************************************************/ -#include "strings.h" +#include "lmc_strings.h" QString lmcStrings::m_appName; QString lmcStrings::m_appDesc; diff --git a/lmc/src/strings.h b/lmc/src/strings.h deleted file mode 100644 index f0c582d..0000000 --- a/lmc/src/strings.h +++ /dev/null @@ -1,59 +0,0 @@ -/**************************************************************************** -** -** This file is part of LAN Messenger. -** -** Copyright (c) 2010 - 2012 Qualia Digital Solutions. -** -** Contact: qualiatech@gmail.com -** -** LAN Messenger is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation, either version 3 of the License, or -** (at your option) any later version. -** -** LAN Messenger is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with LAN Messenger. If not, see . -** -****************************************************************************/ - - -#ifndef STRINGS_H -#define STRINGS_H - -#include -#include - -class lmcStrings { - Q_DECLARE_TR_FUNCTIONS(lmcStrings) - -public: - lmcStrings(void); - ~lmcStrings(void); - - static void retranslate(void); - static const QString appName(void); - static const QString appDesc(void); - static const QString autoConn(void); - static const QStringList fontSize(void); - static const QStringList statusDesc(void); - static const QStringList soundDesc(void); - static const QStringList awayTimeDesc(void); - static const QStringList userListView(void); - -private: - static QString m_appName; - static QString m_appDesc; - static QString m_autoConn; - static QStringList m_fontSize; - static QStringList m_statusDesc; - static QStringList m_soundDesc; - static QStringList m_awayTimeDesc; - static QStringList m_userListView; -}; - -#endif // STRINGS_H diff --git a/lmc/src/subcontrols.cpp b/lmc/src/subcontrols.cpp index cb1be7b..bfac0cb 100644 --- a/lmc/src/subcontrols.cpp +++ b/lmc/src/subcontrols.cpp @@ -23,7 +23,7 @@ #include -#include "strings.h" +#include "lmc_strings.h" #include "subcontrols.h" lmcToolButton::lmcToolButton(QWidget* parent) : QToolButton(parent) { diff --git a/lmc/src/uidefinitions.h b/lmc/src/uidefinitions.h index 31808be..e22a996 100644 --- a/lmc/src/uidefinitions.h +++ b/lmc/src/uidefinitions.h @@ -27,7 +27,7 @@ #include #include "definitions.h" -#include "strings.h" +#include "lmc_strings.h" // Resource name definitions #define IDR_APPICON ":/icons/application"