Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 10:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: replace KDE4WORKSPACE_VERSION with KDE_VERSION_STRING and friends where appropariate

Browse source
This commit is contained in:
Ivailo Monev 2015-01-23 20:11:31 +00:00
parent adb8e6b8b3
commit 1c6254d91c
13 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -8,12 +8,6 @@ include(CTestConfig.cmake)
include(CheckIncludeFiles)
include(CheckFunctionExists)
# Used e.g. in KDE4WorkspaceConfig.cmake, Alex
set(KDE4WORKSPACE_VERSION_MAJOR 4)
set(KDE4WORKSPACE_VERSION_MINOR 11)
set(KDE4WORKSPACE_VERSION_PATCH 14)
set(KDE4WORKSPACE_VERSION ${KDE4WORKSPACE_VERSION_MAJOR}.${KDE4WORKSPACE_VERSION_MINOR}.${KDE4WORKSPACE_VERSION_PATCH} )
# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
@ -342,9 +336,6 @@ set(KDE4WORKSPACE_TARGET_PREFIX KDE4Workspace__)
configure_file(KDE4WorkspaceConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake" @ONLY)
# this file will be installed too and will be used by cmake when searching for the Config.cmake file to check the version of kdepimlibs, Alex
macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake
${KDE4WORKSPACE_VERSION_MAJOR} ${KDE4WORKSPACE_VERSION_MINOR} ${KDE4WORKSPACE_VERSION_PATCH})
set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace/cmake)
# places where find_package() looks for FooConfig.cmake files:
@ -356,7 +347,6 @@ if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake
DESTINATION ${_KDE4WorkspaceConfig_INSTALL_DIR})
install(EXPORT kdeworkspaceLibraryTargets

6
KDE4WorkspaceConfig.cmake.in
View file

@ -1,9 +1,9 @@
# KDE4WorkspaceConfig.cmake is generated by CMake from kdebase/workspace/KDE4WorkspaceConfig.cmake.in
# Do we have a version number for kdebase/workspace ? Alex
set(KDE4WORKSPACE_VERSION_MAJOR @KDE4WORKSPACE_VERSION_MAJOR@)
set(KDE4WORKSPACE_VERSION_MINOR @KDE4WORKSPACE_VERSION_MINOR@)
set(KDE4WORKSPACE_VERSION_PATCH @KDE4WORKSPACE_VERSION_PATCH@)
set(KDE4WORKSPACE_VERSION_MAJOR @KDE_VERSION_MAJOR@)
set(KDE4WORKSPACE_VERSION_MINOR @KDE_VERSION_MINOR@)
set(KDE4WORKSPACE_VERSION_PATCH @KDE_VERSION_RELEASE@)
set(KDE4WORKSPACE_VERSION "${KDE4WORKSPACE_VERSION_MAJOR}.${KDE4WORKSPACE_VERSION_MINOR}.${KDE4WORKSPACE_VERSION_PATCH}")
# set the directories

2
config-workspace.h.cmake
View file

@ -155,5 +155,3 @@
/* type to use in place of socklen_t if not defined */
#define kde_socklen_t socklen_t
#define WORKSPACE_VERSION_STRING "${KDE4WORKSPACE_VERSION}"

2
kinfocenter/main.cpp
View file

@ -39,7 +39,7 @@ int main(int argc, char *argv[])
KLocale::setMainCatalog("kinfocenter");
KAboutData aboutKInfoCenter( "kinfocenter", 0, ki18n("KDE Info Center"),
WORKSPACE_VERSION_STRING, ki18n("The KDE Info Center"), KAboutData::License_GPL,
KDE_VERSION_STRING, ki18n("The KDE Info Center"), KAboutData::License_GPL,
ki18n("(c) 2009-2010, The KDE SC KInfocenter Development Team"));
QByteArray argv_0 = argv[0];

2
krunner/main.cpp
View file

@ -46,7 +46,7 @@ KDE_EXPORT int kdemain(int argc, char* argv[])
#endif
KAboutData aboutData( "krunner", 0, ki18n( "Run Command Interface" ),
WORKSPACE_VERSION_STRING, ki18n(description), KAboutData::License_GPL,
KDE_VERSION_STRING, ki18n(description), KAboutData::License_GPL,
ki18n("(c) 2006, Aaron Seigo") );
aboutData.addAuthor( ki18n("Aaron J. Seigo"),
ki18n( "Author and maintainer" ),

2
kstyles/oxygen/config/main.cpp
View file

@ -37,7 +37,7 @@ int main(int argc, char *argv[])
"oxygen-settings",
"kstyle_config",
ki18n( "Oxygen Settings" ),
WORKSPACE_VERSION_STRING,
KDE_VERSION_STRING,
ki18n( "Oxygen expert configuration tool" ),
KAboutData::License_GPL_V2,
ki18n( "(c) 2010, Hugo Pereira Da Costa" ));

2
kstyles/oxygen/demo/main.cpp
View file

@ -39,7 +39,7 @@ int main(int argc, char *argv[])
"oxygen-demo",
"kstyle_config",
ki18n( "Oxygen Demo" ),
WORKSPACE_VERSION_STRING,
KDE_VERSION_STRING,
ki18n( "Oxygen style demonstration" ),
KAboutData::License_GPL_V2,
ki18n( "(c) 2010, Hugo Pereira Da Costa" ));

2
ksysguard/gui/ksysguard.cpp
View file

@ -512,7 +512,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char** argv )
#endif
KAboutData aboutData( "ksysguard", 0, ki18n( "System Monitor" ),
WORKSPACE_VERSION_STRING, ki18n(Description), KAboutData::License_GPL,
KDE_VERSION_STRING, ki18n(Description), KAboutData::License_GPL,
ki18n( "(c) 1996-2008 The KDE System Monitor Developers" ) );
aboutData.addAuthor( ki18n("John Tapsell"), ki18n("Current Maintainer"), "john.tapsell@kde.org" );
aboutData.addAuthor( ki18n("Chris Schlaeger"), ki18n("Previous Maintainer"), "cs@kde.org" );

3
kwin/clients/oxygen/demo/main.cpp
View file

@ -30,6 +30,7 @@
#include <KApplication>
#include <KIcon>
#include <KAboutData>
#include <kdeversion.h>
#include <config-workspace.h>
#include <cassert>
@ -40,7 +41,7 @@ int main(int argc, char *argv[])
"oxygen-shadow-demo",
"kstyle_config",
ki18n( "Oxygen Shadow Demo" ),
WORKSPACE_VERSION_STRING,
KDE_VERSION_STRING,
ki18n( "Oxygen decoration shadows demonstration" ),
KAboutData::License_GPL_V2,
ki18n( "(c) 2011, Hugo Pereira Da Costa" ));

2
kwin/config-kwin.h.cmake
View file

@ -6,4 +6,4 @@
#cmakedefine KWIN_BUILD_OXYGEN 1
#define KWIN_NAME "${KWIN_NAME}"
#define KWIN_CONFIG "${KWIN_NAME}rc"
#define KWIN_VERSION_STRING "${KDE4WORKSPACE_VERSION}"
#define KWIN_VERSION_STRING "${KDE_VERSION_STRING}"

3
kwrited/kwrited.cpp
View file

@ -28,6 +28,7 @@
#include <knotification.h>
#include <klocalizedstring.h>
#include <kaboutdata.h>
#include <kdeversion.h>
#include <config-workspace.h>
#if defined(BUILD_AS_EXECUTABLE)
@ -43,7 +44,7 @@
static inline KAboutData aboutData()
{
return KAboutData("kwrited", 0, ki18n("kwrited"), WORKSPACE_VERSION_STRING);
return KAboutData("kwrited", 0, ki18n("kwrited"), KDE_VERSION_STRING);
}
#if defined(BUILD_AS_EXECUTABLE)

4
plasma/desktop/shell/main.cpp
View file

@ -49,7 +49,7 @@ extern "C"
KDE_EXPORT int kdemain(int argc, char **argv)
{
kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "START" << "(line:" << __LINE__ << ")";
plasmaLocale = KLocale("libplasma").language();
// dual head support
int associatedScreen = 0;
@ -104,7 +104,7 @@ KDE_EXPORT int kdemain(int argc, char **argv)
}
KAboutData aboutData(appName, 0, ki18n("Plasma Desktop Shell"),
WORKSPACE_VERSION_STRING, ki18n(description), KAboutData::License_GPL,
KDE_VERSION_STRING, ki18n(description), KAboutData::License_GPL,
ki18n("Copyright 2006-2009, The KDE Team"));
aboutData.addAuthor(ki18n("Aaron J. Seigo"),
ki18n("Author and maintainer"),

2
startkde.cmake
View file

@ -1,6 +1,6 @@
#!/bin/sh
#
# DEFAULT KDE STARTUP SCRIPT ( @KDE4WORKSPACE_VERSION@ )
# DEFAULT KDE STARTUP SCRIPT ( @KDE_VERSION_STRING@ )
#
if test "x$1" = x--failsafe; then