diff options
Diffstat (limited to 'kcontrol')
| -rw-r--r-- | kcontrol/krdb/krdb.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/style/kcmstyle.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/style/keramik/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kcontrol/style/keramik/Makefile.am | 10 | ||||
| -rw-r--r-- | kcontrol/style/keramik/keramikconf.cpp | 6 | ||||
| -rw-r--r-- | kcontrol/tdm/tdm-appear.cpp | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index 1f5d9a99d..a1543a320 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -119,7 +119,7 @@ static void applyQtColors( TDEConfig& kglobals, TQSettings& settings, TQPalette& settings.writeEntry("/qt/Palette/inactive", inactcg); settings.writeEntry("/qt/Palette/disabled", discg); - // export twin's colors to qtrc for kstyle to use + // export twin's colors to qtrc for tdestyle to use kglobals.setGroup("WM"); // active colors 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"); } diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index e8aff7b74..66ecbbfdf 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -330,7 +330,7 @@ void TDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo) { // XXX: Global + local schemes TQStringList list = TDEGlobal::dirs()-> - findAllResources("data", "kstyle/themes/*.themerc", false, true); + findAllResources("data", "tdestyle/themes/*.themerc", false, true); for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { KSimpleConfig config(*it, true); |