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/krdb | |
| 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/krdb')
| -rw-r--r-- | kcontrol/krdb/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcontrol/krdb/Makefile.am | 2 | ||||
| -rw-r--r-- | kcontrol/krdb/krdb.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/krdb/CMakeLists.txt b/kcontrol/krdb/CMakeLists.txt index 669875032..035505d98 100644 --- a/kcontrol/krdb/CMakeLists.txt +++ b/kcontrol/krdb/CMakeLists.txt @@ -27,7 +27,7 @@ link_directories( ##### other data ################################ -install( FILES kcmdisplayrc.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) +install( FILES kcmdisplayrc.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update ) ##### krdb (static) ############################# diff --git a/kcontrol/krdb/Makefile.am b/kcontrol/krdb/Makefile.am index a478f2f83..db6dda987 100644 --- a/kcontrol/krdb/Makefile.am +++ b/kcontrol/krdb/Makefile.am @@ -12,4 +12,4 @@ messages: $(XGETTEXT) *.cpp -o $(podir)/krdb.pot update_DATA = kcmdisplayrc.upd -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index 72d9c1fe0..613816f84 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -30,7 +30,7 @@ #include <dcopclient.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobalsettings.h> #include <kstandarddirs.h> @@ -94,7 +94,7 @@ static void applyGtkStyles(bool active, int version) TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << name << value; - kapp->dcopClient()->send("klauncher", "klauncher", "setLaunchEnv(TQCString,TQCString)", params); + kapp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params); } // ----------------------------------------------------------------------------- @@ -261,7 +261,7 @@ static void applyQtSettings( TDEConfig& kglobals, TQSettings& settings ) /* ##### looks like kcmfonts skips this, so we don't do this here */ /*bool usexft = kglobals.readBoolEntry("AntiAliasing", false); - kconfig.setGroup("General"); + tdeconfig.setGroup("General"); settings.writeEntry("/qt/enableXft", usexft); settings.writeEntry("/qt/useXft", usexft); */ |