diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:51:13 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:51:13 -0600 |
| commit | ff2557dc4fd7a8383b56081c1e8d1cd9cc7accd2 (patch) | |
| tree | 615cd10a425a86db70dff47b6bbd0337495565b2 /settings-backend | |
| parent | 5272df885ca759bd58be6405a2ebf80abd50b47f (diff) | |
| download | compizconfig-backend-tdeconfig-ff2557dc4fd7a8383b56081c1e8d1cd9cc7accd2.tar.gz compizconfig-backend-tdeconfig-ff2557dc4fd7a8383b56081c1e8d1cd9cc7accd2.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'settings-backend')
| -rw-r--r-- | settings-backend/Makefile.am | 8 | ||||
| -rw-r--r-- | settings-backend/tdeconfig_backend.cpp (renamed from settings-backend/kconfig_backend.cpp) | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/settings-backend/Makefile.am b/settings-backend/Makefile.am index 2159ecb..8687bc5 100644 --- a/settings-backend/Makefile.am +++ b/settings-backend/Makefile.am @@ -1,12 +1,12 @@ INCLUDES = -I$(srcdir)/lib $(all_includes) -libkconfig_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) -libkconfig_la_LIBADD = $(CCS_LIBS) $(LIB_TDECORE) -libkconfig_la_SOURCES = kconfig_backend.cpp +libtdeconfig_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) +libtdeconfig_la_LIBADD = $(CCS_LIBS) $(LIB_TDECORE) +libtdeconfig_la_SOURCES = tdeconfig_backend.cpp backenddir = $(BACKENDDIR)/backends KDE_CXXFLAGS = $(CCS_CFLAGS) METASOURCES = AUTO -backend_LTLIBRARIES = libkconfig.la +backend_LTLIBRARIES = libtdeconfig.la diff --git a/settings-backend/kconfig_backend.cpp b/settings-backend/tdeconfig_backend.cpp index d6b1c8c..0360250 100644 --- a/settings-backend/kconfig_backend.cpp +++ b/settings-backend/tdeconfig_backend.cpp @@ -21,7 +21,7 @@ #include <tqdir.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ksimpleconfig.h> #include <kdebug.h> #include <kglobal.h> @@ -610,7 +610,7 @@ static CCSStringList getExistingProfiles (CCSContext *) { if (!instance) - instance = new TDEInstance ("ccs-backend-kconfig"); + instance = new TDEInstance ("ccs-backend-tdeconfig"); TQDir dir (TDEGlobal::dirs()->saveLocation ("config", TQString(), false), "compizrc.*"); @@ -1760,7 +1760,7 @@ static Bool readInit (CCSContext *c) { if (!instance) - instance = new TDEInstance ("ccs-backend-kconfig"); + instance = new TDEInstance ("ccs-backend-tdeconfig"); if (cFiles->profile != ccsGetProfile (c) ) { @@ -1796,7 +1796,7 @@ static Bool writeInit (CCSContext *c) { if (!instance) - instance = new TDEInstance ("ccs-backend-kconfig"); + instance = new TDEInstance ("ccs-backend-tdeconfig"); if (cFiles->profile != ccsGetProfile (c) ) { @@ -1853,7 +1853,7 @@ static Bool init (CCSContext *c) { if (!instance) - instance = new TDEInstance ("ccs-backend-kconfig"); + instance = new TDEInstance ("ccs-backend-tdeconfig"); cFiles = new ConfigFiles; @@ -1938,9 +1938,9 @@ deleteProfile (CCSContext *, return FALSE; } -static CCSBackendVTable kconfigVTable = +static CCSBackendVTable tdeconfigVTable = { - "kconfig", + "tdeconfig", "KDE Configuration Backend", "KDE Configuration Backend for libccs", true, @@ -1966,7 +1966,7 @@ extern "C" CCSBackendVTable * getBackendInfo (void) { - return &kconfigVTable; + return &tdeconfigVTable; } } |