yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[kwin] Remove usage of KDE_VERSION_STRING

Browse source 
Replaced by KWIN_VERSION_STRING where useful. Support information
no longer contains the SC version number. We have to see whether
there will be a useful framework based platform information.
This commit is contained in:
Martin Gräßlin 2013-12-05 17:18:50 +01:00
parent acc0498102
commit f7ff03f30b
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
main.cpp
View file

@ -32,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <ksmserver_interface.h>
// KDE
#include <kdeversion.h>
#include <KDE/KAboutData>
#include <KDE/KConfig>
#include <KDE/KConfigGroup>
@ -373,7 +372,7 @@ bool XcbEventFilter::nativeEventFilter(const QByteArray &eventType, void *messag
} // namespace
static const char version[] = KDE_VERSION_STRING;
static const char version[] = KWIN_VERSION_STRING;
static const char description[] = I18N_NOOP("KDE window manager");
extern "C"
@ -463,13 +462,13 @@ KDE_EXPORT int kdemain(int argc, char * argv[])
KWin::Application a(argc, argv);
a.setApplicationName(QStringLiteral(KWIN_NAME));
a.setApplicationVersion(QStringLiteral(KDE_VERSION_STRING));
a.setApplicationVersion(QStringLiteral(KWIN_VERSION_STRING));
a.setApplicationDisplayName(i18n("KWin"));
KAboutData aboutData(QStringLiteral(KWIN_NAME), // The program name used internally
QString(), // The message catalog name. If null, program name is used instead
i18n("KWin"), // A displayable program name string
QStringLiteral(KDE_VERSION_STRING), // The program version string
QStringLiteral(KWIN_VERSION_STRING), // The program version string
i18n(description), // Short description of what the app does
KAboutData::License_GPL, // The license this code is released under
i18n("(c) 1999-2013, The KDE Developers")); // Copyright Statement

7
workspace.cpp
View file

@ -61,7 +61,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "xcbutils.h"
#include "main.h"
// KDE
#include <kdeversion.h>
#include <KDE/KActionCollection>
#include <KDE/KConfig>
#include <KDE/KConfigGroup>
@ -1423,12 +1422,6 @@ QString Workspace::supportInformation() const
support.append(QStringLiteral("KWin version: "));
support.append(QStringLiteral(KWIN_VERSION_STRING));
support.append(QStringLiteral("\n"));
support.append(QStringLiteral("KDE SC version (runtime): "));
support.append(QString::fromUtf8(KDE::versionString()));
support.append(QStringLiteral("\n"));
support.append(QStringLiteral("KDE SC version (compile): "));
support.append(QStringLiteral(KDE_VERSION_STRING));
support.append(QStringLiteral("\n"));
support.append(QStringLiteral("Qt Version: "));
support.append(QString::fromUtf8(qVersion()));
support.append(QStringLiteral("\n\n"));