summaryrefslogtreecommitdiffstats
path: root/kcontrol/style
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-08-18 10:16:29 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2013-08-18 10:16:29 -0500
commit3fce7943f47444f0ac0ccbd225e8b48d8275764b (patch)
tree1245fb62987e54d04ddd5a245a84ab90b28eea4d /kcontrol/style
parentdf510360d365d88e9496f583fc4d385680b15a17 (diff)
downloadtdebase-3fce7943f47444f0ac0ccbd225e8b48d8275764b.tar.gz
tdebase-3fce7943f47444f0ac0ccbd225e8b48d8275764b.zip
Rename KStyle to TDEStyle to avoid conflicts with KDE4.
Diffstat (limited to 'kcontrol/style')
-rw-r--r--kcontrol/style/kcmstyle.cpp4
-rw-r--r--kcontrol/style/keramik/CMakeLists.txt4
-rw-r--r--kcontrol/style/keramik/Makefile.am10
-rw-r--r--kcontrol/style/keramik/keramikconf.cpp6
4 files changed, 12 insertions, 12 deletions
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 623ceeebf..2ca50631d 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -128,7 +128,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
m_bToolbarsDirty = false;
TDEGlobal::dirs()->addResourceType("themes",
- TDEStandardDirs::kde_default("data") + "kstyle/themes");
+ TDEStandardDirs::kde_default("data") + "tdestyle/themes");
TDEAboutData *about =
new TDEAboutData( I18N_NOOP("kcmstyle"),
@@ -451,7 +451,7 @@ void KCMStyle::styleSpecificConfig()
return;
}
- void* allocPtr = library->symbol("allocate_kstyle_config");
+ void* allocPtr = library->symbol("allocate_tdestyle_config");
if (!allocPtr)
{
diff --git a/kcontrol/style/keramik/CMakeLists.txt b/kcontrol/style/keramik/CMakeLists.txt
index b68be1c2e..c6ba1f64b 100644
--- a/kcontrol/style/keramik/CMakeLists.txt
+++ b/kcontrol/style/keramik/CMakeLists.txt
@@ -20,9 +20,9 @@ link_directories(
)
-##### kstyle_keramik_config (module) ############
+##### tdestyle_keramik_config (module) ############
-tde_add_kpart( kstyle_keramik_config AUTOMOC
+tde_add_kpart( tdestyle_keramik_config AUTOMOC
SOURCES keramikconf.cpp
LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kcontrol/style/keramik/Makefile.am b/kcontrol/style/keramik/Makefile.am
index 56fbefa6b..d0fd2d721 100644
--- a/kcontrol/style/keramik/Makefile.am
+++ b/kcontrol/style/keramik/Makefile.am
@@ -1,12 +1,12 @@
INCLUDES = $(all_includes)
noinst_HEADERS = keramikconf.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
+kde_module_LTLIBRARIES = tdestyle_keramik_config.la
+tdestyle_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+tdestyle_keramik_config_la_LIBADD = $(LIB_TDEUI)
+tdestyle_keramik_config_la_SOURCES = keramikconf.cpp
METASOURCES = AUTO
messages:
- $(XGETTEXT) *.cpp *.h -o $(podir)/kstyle_keramik_config.pot
+ $(XGETTEXT) *.cpp *.h -o $(podir)/tdestyle_keramik_config.pot
diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp
index 251ea50aa..7fa6ef698 100644
--- a/kcontrol/style/keramik/keramikconf.cpp
+++ b/kcontrol/style/keramik/keramikconf.cpp
@@ -32,7 +32,7 @@ DEALINGS IN THE SOFTWARE.
extern "C"
{
- KDE_EXPORT TQWidget* allocate_kstyle_config(TQWidget* parent)
+ KDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent)
{
return new KeramikStyleConfig(parent);
}
@@ -42,7 +42,7 @@ KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent)
{
//Should have no margins here, the dialog provides them
TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
- TDEGlobal::locale()->insertCatalogue("kstyle_keramik_config");
+ TDEGlobal::locale()->insertCatalogue("tdestyle_keramik_config");
//highlightLineEdits = new TQCheckBox(i18n("Highlight active lineedits"), this);
highlightScrollBar = new TQCheckBox(i18n("Highlight scroll bar handles"), this);
@@ -70,7 +70,7 @@ KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent)
KeramikStyleConfig::~KeramikStyleConfig()
{
- TDEGlobal::locale()->removeCatalogue("kstyle_keramik_config");
+ TDEGlobal::locale()->removeCatalogue("tdestyle_keramik_config");
}