diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /kcontrol/screensaver | |
parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/screensaver')
-rw-r--r-- | kcontrol/screensaver/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kcontrol/screensaver/advanceddialog.h | 2 | ||||
-rw-r--r-- | kcontrol/screensaver/screensaver.desktop | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/screensaver/CMakeLists.txt b/kcontrol/screensaver/CMakeLists.txt index 825418e4f..e57bc1eca 100644 --- a/kcontrol/screensaver/CMakeLists.txt +++ b/kcontrol/screensaver/CMakeLists.txt @@ -32,6 +32,6 @@ tde_add_kpart( kcm_screensaver AUTOMOC advanceddialogimpl.ui scrnsave.cpp testwin.cpp saverlist.cpp saverconfig.cpp advanceddialog.cpp kswidget.cpp - LINK kio-shared ${GL_LIBRARY} + LINK tdeio-shared ${GL_LIBRARY} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/screensaver/advanceddialog.h b/kcontrol/screensaver/advanceddialog.h index 8322dd3e2..87ee03a31 100644 --- a/kcontrol/screensaver/advanceddialog.h +++ b/kcontrol/screensaver/advanceddialog.h @@ -3,7 +3,7 @@ #include <kdialogbase.h> #include <tqwidget.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqlabel.h> #include <tqlayout.h> #include <tqwhatsthis.h> diff --git a/kcontrol/screensaver/screensaver.desktop b/kcontrol/screensaver/screensaver.desktop index 566a8c506..821a445b5 100644 --- a/kcontrol/screensaver/screensaver.desktop +++ b/kcontrol/screensaver/screensaver.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell screensaver +Exec=tdecmshell screensaver Icon=tdescreensaver Type=Application DocPath=kcontrol/screensaver/index.html |