summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kcontrol/krdb/krdb.cpp2
-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
-rw-r--r--kcontrol/tdm/tdm-appear.cpp2
-rw-r--r--kpersonalizer/CMakeLists.txt4
-rw-r--r--kpersonalizer/Makefile.am6
-rw-r--r--kpersonalizer/TODO2
-rw-r--r--kpersonalizer/kpersonalizer.cpp2
-rw-r--r--kpersonalizer/tdestylepage.cpp (renamed from kpersonalizer/kstylepage.cpp)6
-rw-r--r--kpersonalizer/tdestylepage.h (renamed from kpersonalizer/kstylepage.h)8
-rw-r--r--kpersonalizer/tdestylepagedlg.ui (renamed from kpersonalizer/kstylepagedlg.ui)0
-rw-r--r--r14-xdg-update7
-rw-r--r--twin/options.cpp2
15 files changed, 35 insertions, 30 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);
diff --git a/kpersonalizer/CMakeLists.txt b/kpersonalizer/CMakeLists.txt
index 4c151b493..313ff48a5 100644
--- a/kpersonalizer/CMakeLists.txt
+++ b/kpersonalizer/CMakeLists.txt
@@ -35,11 +35,11 @@ install( FILES uninstall.desktop DESTINATION ${APPS_INSTALL_DIR}/System RENAME k
tde_add_executable( kpersonalizer AUTOMOC
SOURCES
- stylepreview.ui krefinepage.cpp kstylepage.cpp
+ stylepreview.ui krefinepage.cpp tdestylepage.cpp
keyecandypage.cpp kospage.cpp kcountrypage.cpp
kpersonalizer.cpp main.cpp kfindlanguage.cpp
kcountrypagedlg.ui kospagedlg.ui keyecandypagedlg.ui
- kstylepagedlg.ui krefinepagedlg.ui ksysinfo.cpp
+ tdestylepagedlg.ui krefinepagedlg.ui ksysinfo.cpp
LINK tdeio-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kpersonalizer/Makefile.am b/kpersonalizer/Makefile.am
index 66b957804..c4e01d719 100644
--- a/kpersonalizer/Makefile.am
+++ b/kpersonalizer/Makefile.am
@@ -1,13 +1,13 @@
bin_PROGRAMS = kpersonalizer
kpersonalizer_SOURCES = stylepreview.ui krefinepage.cpp \
- kstylepage.cpp keyecandypage.cpp kospage.cpp kcountrypage.cpp kpersonalizer.cpp \
+ tdestylepage.cpp keyecandypage.cpp kospage.cpp kcountrypage.cpp kpersonalizer.cpp \
main.cpp kfindlanguage.cpp \
- kcountrypagedlg.ui kospagedlg.ui keyecandypagedlg.ui kstylepagedlg.ui \
+ kcountrypagedlg.ui kospagedlg.ui keyecandypagedlg.ui tdestylepagedlg.ui \
krefinepagedlg.ui ksysinfo.cpp
kpersonalizer_LDADD = $(LIB_KIO)
-EXTRA_DIST = main.cpp kpersonalizer.cpp kpersonalizer.h kpersonalizer.desktop kcountrypage.cpp kcountrypage.h kospage.cpp kospage.h keyecandypage.cpp keyecandypage.h kstylepage.cpp kstylepage.h krefinepage.cpp krefinepage.h cr16-app-kpersonalizer.png cr32-app-kpersonalizer.png README kcountrypagedlg.ui kospage.ui keyecandypagedlg.ui kstylepagedlg.ui krefinepagedlg.ui kfindlanguage.cpp kfindlanguage.h
+EXTRA_DIST = main.cpp kpersonalizer.cpp kpersonalizer.h kpersonalizer.desktop kcountrypage.cpp kcountrypage.h kospage.cpp kospage.h keyecandypage.cpp keyecandypage.h tdestylepage.cpp tdestylepage.h krefinepage.cpp krefinepage.h cr16-app-kpersonalizer.png cr32-app-kpersonalizer.png README kcountrypagedlg.ui kospage.ui keyecandypagedlg.ui tdestylepagedlg.ui krefinepagedlg.ui kfindlanguage.cpp kfindlanguage.h
xdg_apps_DATA = kpersonalizer.desktop
diff --git a/kpersonalizer/TODO b/kpersonalizer/TODO
index fdc0bf705..0a1bab85f 100644
--- a/kpersonalizer/TODO
+++ b/kpersonalizer/TODO
@@ -17,7 +17,7 @@ o kospage:
- Desktop Icons are arranged after dcop-call, but we just want to align them
o krefinepage:
- quit kpersonalizer, if user starts kcontrol
-o kstylepage:
+o tdestylepage:
- don't hardcode the styles
- style preview
o keyecandypage:
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index c3611baf3..86b0a5b4a 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -43,7 +43,7 @@
#include "kcountrypage.h"
#include "kospage.h"
#include "keyecandypage.h"
-#include "kstylepage.h"
+#include "tdestylepage.h"
#include "krefinepage.h"
#include "kpersonalizer.h"
diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/tdestylepage.cpp
index 974ac0c9d..4995460cb 100644
--- a/kpersonalizer/kstylepage.cpp
+++ b/kpersonalizer/tdestylepage.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- kstylepage.cpp - description
+ tdestylepage.cpp - description
-------------------
begin : Tue May 22 2001
copyright : (C) 2001 by Ralf Nolden
@@ -41,7 +41,7 @@
#include <kiconloader.h>
#include "stylepreview.h"
-#include "kstylepage.h"
+#include "tdestylepage.h"
TDEStylePage::TDEStylePage(TQWidget *parent, const char *name ) : TDEStylePageDlg(parent,name) {
@@ -581,4 +581,4 @@ TQPalette TDEStylePage::createPalette() {
return TQPalette( colgrp, disabledgrp, colgrp);
}
-#include "kstylepage.moc"
+#include "tdestylepage.moc"
diff --git a/kpersonalizer/kstylepage.h b/kpersonalizer/tdestylepage.h
index 7a31e26cf..30b907094 100644
--- a/kpersonalizer/kstylepage.h
+++ b/kpersonalizer/tdestylepage.h
@@ -1,5 +1,5 @@
/***************************************************************************
- kstylepage.h - description
+ tdestylepage.h - description
-------------------
begin : Tue May 22 2001
copyright : (C) 2001 by Ralf Nolden
@@ -15,11 +15,11 @@
* *
***************************************************************************/
-#ifndef KSTYLEPAGE_H
-#define KSTYLEPAGE_H
+#ifndef TDESTYLEPAGE_H
+#define TDESTYLEPAGE_H
#include <tqcolor.h>
-#include "kstylepagedlg.h"
+#include "tdestylepagedlg.h"
/**Abstract class for the style page
*@author Ralf Nolden
diff --git a/kpersonalizer/kstylepagedlg.ui b/kpersonalizer/tdestylepagedlg.ui
index 65570e542..65570e542 100644
--- a/kpersonalizer/kstylepagedlg.ui
+++ b/kpersonalizer/tdestylepagedlg.ui
diff --git a/r14-xdg-update b/r14-xdg-update
index 84c9e0c08..090cec9e3 100644
--- a/r14-xdg-update
+++ b/r14-xdg-update
@@ -634,7 +634,12 @@ if [ ! -f $HOME/.tderc ] && [ -f $HOME/.kderc ]; then
mv $HOME/.kderc $HOME/.tderc 2>/dev/null
fi
fi
-# Copy the following two rc files rather than move because the older versions are for HAL systems.
+if [ -a $PROFILE_DIR/share/apps/kstyle ]; then
+ Message_Prefix
+ echo " kstyle->tdestyle"
+ mv $PROFILE_DIR/share/apps/kstyle $PROFILE_DIR/share/apps/tdestyle 2>/dev/null
+fi
+# Copy the following two rc files rather than move because the older versions are needed for HAL systems.
if [ ! -f $PROFILE_DIR/share/config/tdenetworkmanagerrc ] && [ -f $PROFILE_DIR/share/config/knetworkmanagerrc ]; then
Message_Prefix
echo " knetworkmanager->tdenetworkmanager"
diff --git a/twin/options.cpp b/twin/options.cpp
index 73d416155..0bb127e11 100644
--- a/twin/options.cpp
+++ b/twin/options.cpp
@@ -216,7 +216,7 @@ unsigned long Options::updateSettings()
// Read button tooltip animation effect from kdeglobals
// Since we want to allow users to enable window decoration tooltips
- // and not kstyle tooltips and vise-versa, we don't read the
+ // and not tdestyle tooltips and vise-versa, we don't read the
// "EffectNoTooltip" setting from kdeglobals.
TDEConfig globalConfig("kdeglobals");
globalConfig.setGroup("KDE");
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-30 01:15:42 +0000