summaryrefslogtreecommitdiffstats
path: root/kcontrol/style
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/style')
-rw-r--r--kcontrol/style/CMakeLists.txt2
-rw-r--r--kcontrol/style/kcmstyle.cpp6
-rw-r--r--kcontrol/style/keramik/CMakeLists.txt2
-rw-r--r--kcontrol/style/keramik/Makefile.am4
-rw-r--r--kcontrol/style/keramik/keramitdeconf.cpp (renamed from kcontrol/style/keramik/keramikconf.cpp)4
-rw-r--r--kcontrol/style/keramik/keramitdeconf.h (renamed from kcontrol/style/keramik/keramikconf.h)0
-rw-r--r--kcontrol/style/style.desktop2
7 files changed, 10 insertions, 10 deletions
diff --git a/kcontrol/style/CMakeLists.txt b/kcontrol/style/CMakeLists.txt
index 26a9569ff..88f0927af 100644
--- a/kcontrol/style/CMakeLists.txt
+++ b/kcontrol/style/CMakeLists.txt
@@ -33,6 +33,6 @@ tde_add_kpart( kcm_style AUTOMOC
SOURCES
kcmstyle.cpp stylepreview.ui menupreview.cpp
styleconfdialog.cpp
- LINK krdb-static kio-shared
+ LINK krdb-static tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index f540d7e75..5c274d3cc 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -634,9 +634,9 @@ void KCMStyle::save()
if (m_bStyleDirty | m_bEffectsDirty) // Export only if necessary
{
uint flags = KRdbExportQtSettings;
- TDEConfig kconfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/);
- kconfig.setGroup("X11");
- bool exportKDEColors = kconfig.readBoolEntry("exportKDEColors", true);
+ TDEConfig tdeconfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/);
+ tdeconfig.setGroup("X11");
+ bool exportKDEColors = tdeconfig.readBoolEntry("exportKDEColors", true);
if (exportKDEColors)
flags |= KRdbExportColors;
runRdb( flags );
diff --git a/kcontrol/style/keramik/CMakeLists.txt b/kcontrol/style/keramik/CMakeLists.txt
index b68be1c2e..e03b85ef3 100644
--- a/kcontrol/style/keramik/CMakeLists.txt
+++ b/kcontrol/style/keramik/CMakeLists.txt
@@ -23,7 +23,7 @@ link_directories(
##### kstyle_keramik_config (module) ############
tde_add_kpart( kstyle_keramik_config AUTOMOC
- SOURCES keramikconf.cpp
+ SOURCES keramitdeconf.cpp
LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kcontrol/style/keramik/Makefile.am b/kcontrol/style/keramik/Makefile.am
index 56fbefa6b..78077b923 100644
--- a/kcontrol/style/keramik/Makefile.am
+++ b/kcontrol/style/keramik/Makefile.am
@@ -1,10 +1,10 @@
INCLUDES = $(all_includes)
-noinst_HEADERS = keramikconf.h
+noinst_HEADERS = keramitdeconf.h
kde_module_LTLIBRARIES = kstyle_keramik_config.la
kstyle_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kstyle_keramik_config_la_LIBADD = $(LIB_TDEUI)
-kstyle_keramik_config_la_SOURCES = keramikconf.cpp
+kstyle_keramik_config_la_SOURCES = keramitdeconf.cpp
METASOURCES = AUTO
diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramitdeconf.cpp
index 3027106cd..742842876 100644
--- a/kcontrol/style/keramik/keramikconf.cpp
+++ b/kcontrol/style/keramik/keramitdeconf.cpp
@@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE.
#include <kglobal.h>
#include <klocale.h>
-#include "keramikconf.h"
+#include "keramitdeconf.h"
extern "C"
{
@@ -100,4 +100,4 @@ void KeramikStyleConfig::updateChanged()
emit changed(true);
}
-#include "keramikconf.moc"
+#include "keramitdeconf.moc"
diff --git a/kcontrol/style/keramik/keramikconf.h b/kcontrol/style/keramik/keramitdeconf.h
index 6de7edb10..6de7edb10 100644
--- a/kcontrol/style/keramik/keramikconf.h
+++ b/kcontrol/style/keramik/keramitdeconf.h
diff --git a/kcontrol/style/style.desktop b/kcontrol/style/style.desktop
index 8786a7700..29d82d316 100644
--- a/kcontrol/style/style.desktop
+++ b/kcontrol/style/style.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell style
+Exec=tdecmshell style
Icon=style
Type=Application
DocPath=kcontrol/kcmstyle/index.html