summaryrefslogtreecommitdiffstats
path: root/kcontrol
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol')
-rw-r--r--kcontrol/colors/colorscm.cpp6
-rw-r--r--kcontrol/displayconfig/displayconfig.cpp4
-rw-r--r--kcontrol/fonts/fonts.h2
-rw-r--r--kcontrol/krdb/ad/CMakeLists.txt2
-rw-r--r--kcontrol/krdb/ad/Makefile.am6
-rw-r--r--kcontrol/krdb/ad/README4
-rw-r--r--kcontrol/krdb/kcs/CMakeLists.txt2
-rw-r--r--kcontrol/krdb/kcs/Makefile.am6
-rw-r--r--kcontrol/krdb/krdb.cpp2
-rw-r--r--kcontrol/kthememanager/ktheme.cpp2
-rw-r--r--kcontrol/tdm/tdm-appear.cpp2
11 files changed, 19 insertions, 19 deletions
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index 6bb368fe2..370d32532 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -560,7 +560,7 @@ void KColorScheme::slotAdd()
}
else
{
- sFile = TDEGlobal::dirs()->saveLocation("data", "kdisplay/color-schemes/") + sFile + ".kcsrc";
+ sFile = TDEGlobal::dirs()->saveLocation("data", "tdedisplay/color-schemes/") + sFile + ".kcsrc";
KSimpleConfig *config = new KSimpleConfig(sFile);
config->setGroup( "Color Scheme");
config->writeEntry("Name", sName);
@@ -580,7 +580,7 @@ void KColorScheme::slotAdd()
void KColorScheme::slotImport()
{
- TQString location = locateLocal( "data", "kdisplay/color-schemes/" );
+ TQString location = locateLocal( "data", "tdedisplay/color-schemes/" );
KURL file ( KFileDialog::getOpenFileName(TQString::null, "*.kcsrc", this) );
if ( file.isEmpty() )
@@ -861,7 +861,7 @@ void KColorScheme::readSchemeNames()
// Global + local schemes
TQStringList list = TDEGlobal::dirs()->findAllResources("data",
- "kdisplay/color-schemes/*.kcsrc", false, true);
+ "tdedisplay/color-schemes/*.kcsrc", false, true);
// And add them
for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) {
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 2a758d6e0..196a2ec84 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -749,11 +749,11 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin
TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
if (getuid() != 0) {
- systemconfig = new KSimpleConfig( locateLocal("config", "kdisplay/", true) + "kdisplayconfigrc" );
+ systemconfig = new KSimpleConfig( locateLocal("config", "tdedisplay/", true) + "tdedisplayconfigrc" );
systemconfig->setFileWriteMode(0600);
}
else {
- systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdisplay/kdisplayconfigrc" ));
+ systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdedisplay/tdedisplayconfigrc" ));
systemconfig->setFileWriteMode(0644);
}
diff --git a/kcontrol/fonts/fonts.h b/kcontrol/fonts/fonts.h
index cd9f52e02..65a1266cb 100644
--- a/kcontrol/fonts/fonts.h
+++ b/kcontrol/fonts/fonts.h
@@ -1,6 +1,6 @@
//-----------------------------------------------------------------------------
//
-// kdisplay, fonts tab
+// tdedisplay, fonts tab
//
// Copyright (c) Mark Donohoe 1997
// Lars Knoll 1999
diff --git a/kcontrol/krdb/ad/CMakeLists.txt b/kcontrol/krdb/ad/CMakeLists.txt
index e295acd85..43fde7fee 100644
--- a/kcontrol/krdb/ad/CMakeLists.txt
+++ b/kcontrol/krdb/ad/CMakeLists.txt
@@ -13,7 +13,7 @@ install( FILES
AAAAAAGeneral.ad AAAMotif.ad AAATk.ad AAAXaw.ad AcroRead.ad
Editres.ad Emacs.ad GV.ad ML.ad Nedit.ad Netscape.ad RVPlayer.ad
WPerfect.ad XCalc.ad Xawtv.ad Xdvi.ad XTerm.ad XOsview.ad XV.ad Xpdf.ad
- DESTINATION ${DATA_INSTALL_DIR}/kdisplay/app-defaults )
+ DESTINATION ${DATA_INSTALL_DIR}/tdedisplay/app-defaults )
install( PROGRAMS
krdb
diff --git a/kcontrol/krdb/ad/Makefile.am b/kcontrol/krdb/ad/Makefile.am
index 68b2fe2bb..bb6a1eebb 100644
--- a/kcontrol/krdb/ad/Makefile.am
+++ b/kcontrol/krdb/ad/Makefile.am
@@ -1,13 +1,13 @@
AM_CPPFLAGS = $(all_includes)
-kdisplay_defaults_data_DATA = AAAAAAGeneral.ad AAAMotif.ad AAATk.ad AAAXaw.ad AcroRead.ad \
+tdedisplay_defaults_data_DATA = AAAAAAGeneral.ad AAAMotif.ad AAATk.ad AAAXaw.ad AcroRead.ad \
Editres.ad Emacs.ad GV.ad ML.ad Nedit.ad Netscape.ad RVPlayer.ad \
WPerfect.ad XCalc.ad Xawtv.ad Xdvi.ad XTerm.ad XOsview.ad XV.ad Xpdf.ad
-kdisplay_defaults_datadir = $(kde_datadir)/kdisplay/app-defaults
+tdedisplay_defaults_datadir = $(kde_datadir)/tdedisplay/app-defaults
-EXTRA_DIST = $(kdisplay_defaults_data_DATA)
+EXTRA_DIST = $(tdedisplay_defaults_data_DATA)
bin_SCRIPTS = krdb
diff --git a/kcontrol/krdb/ad/README b/kcontrol/krdb/ad/README
index 9a5d836cb..1d921ca67 100644
--- a/kcontrol/krdb/ad/README
+++ b/kcontrol/krdb/ad/README
@@ -35,11 +35,11 @@ Their meaning should be obvious to anyone familiar with
KDE's desktop wide resources. Install your application
default file either in
-$(TDEDIR)/share/apps/kdisplay/app-defaults
+$(TDEDIR)/share/apps/tdedisplay/app-defaults
or
-$(HOME)/.trinity/share/apps/kdisplay/app-defaults
+$(HOME)/.trinity/share/apps/tdedisplay/app-defaults
so that it is available to krdb for reading. If you want to
override a system file simply copy it to your user
diff --git a/kcontrol/krdb/kcs/CMakeLists.txt b/kcontrol/krdb/kcs/CMakeLists.txt
index 5a3a8bb99..4238fe075 100644
--- a/kcontrol/krdb/kcs/CMakeLists.txt
+++ b/kcontrol/krdb/kcs/CMakeLists.txt
@@ -17,4 +17,4 @@ install( FILES
KDEOne.kcsrc KDETwo.kcsrc MediaPeach.kcsrc Windows95.kcsrc EveX.kcsrc
WindowsXP.kcsrc Keramik.kcsrc KeramikEmerald.kcsrc KeramikWhite.kcsrc
BlackOnWhite.kcsrc WhiteOnBlack.kcsrc YellowOnBlue.kcsrc Plastik.kcsrc
- DESTINATION ${DATA_INSTALL_DIR}/kdisplay/color-schemes )
+ DESTINATION ${DATA_INSTALL_DIR}/tdedisplay/color-schemes )
diff --git a/kcontrol/krdb/kcs/Makefile.am b/kcontrol/krdb/kcs/Makefile.am
index 8c5200089..dfa2389cf 100644
--- a/kcontrol/krdb/kcs/Makefile.am
+++ b/kcontrol/krdb/kcs/Makefile.am
@@ -1,5 +1,5 @@
-kdisplay_colorschemes_data_DATA = AtlasGreen.kcsrc BeOS.kcsrc BlueSlate.kcsrc \
+tdedisplay_colorschemes_data_DATA = AtlasGreen.kcsrc BeOS.kcsrc BlueSlate.kcsrc \
CDE.kcsrc DarkBlue.kcsrc DesertRed.kcsrc DigitalCDE.kcsrc \
PaleGray.kcsrc Pumpkin.kcsrc SolarisCDE.kcsrc Storm.kcsrc \
Windows2000.kcsrc System.kcsrc Next.kcsrc PointReyesGreen.kcsrc \
@@ -7,6 +7,6 @@ kdisplay_colorschemes_data_DATA = AtlasGreen.kcsrc BeOS.kcsrc BlueSlate.kcsrc \
WindowsXP.kcsrc Keramik.kcsrc KeramikEmerald.kcsrc KeramikWhite.kcsrc \
BlackOnWhite.kcsrc WhiteOnBlack.kcsrc YellowOnBlue.kcsrc Plastik.kcsrc
-kdisplay_colorschemes_datadir = $(kde_datadir)/kdisplay/color-schemes
+tdedisplay_colorschemes_datadir = $(kde_datadir)/tdedisplay/color-schemes
-EXTRA_DIST = $(kdisplay_colorschemes_data_DATA)
+EXTRA_DIST = $(tdedisplay_colorschemes_data_DATA)
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index d8a2b026d..a04d144c8 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -444,7 +444,7 @@ void runRdb( uint flags )
// Export colors to non-(KDE/Qt) apps (e.g. Motif, GTK+ apps)
if (exportColors)
{
- TDEGlobal::dirs()->addResourceType("appdefaults", TDEStandardDirs::kde_default("data") + "kdisplay/app-defaults/");
+ TDEGlobal::dirs()->addResourceType("appdefaults", TDEStandardDirs::kde_default("data") + "tdedisplay/app-defaults/");
TQColorGroup cg = newPal.active();
TDEGlobal::locale()->insertCatalogue("krdb");
createGtkrc( true, cg, 1 );
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index e516ddd41..efa056676 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -528,7 +528,7 @@ void KTheme::apply()
TQDomNodeList colorList = colorsElem.childNodes();
TDEConfig * colorConf = TDEGlobal::config();
- TQString sCurrentScheme = locateLocal("data", "kdisplay/color-schemes/thememgr.kcsrc");
+ TQString sCurrentScheme = locateLocal("data", "tdedisplay/color-schemes/thememgr.kcsrc");
KSimpleConfig *colorScheme = new KSimpleConfig( sCurrentScheme );
colorScheme->setGroup("Color Scheme" );
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index 14e3427f3..2a217fb86 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -309,7 +309,7 @@ void TDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo)
{
// XXX: Global + local schemes
TQStringList list = TDEGlobal::dirs()->
- findAllResources("data", "kdisplay/color-schemes/*.kcsrc", false, true);
+ findAllResources("data", "tdedisplay/color-schemes/*.kcsrc", false, true);
for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
KSimpleConfig config(*it, true);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-11 10:02:48 +0000