diff options
25 files changed, 36 insertions, 36 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); diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 58f6d9da1..2c4083443 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -919,7 +919,7 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, connect(m_layoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout())); connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdate())); - connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(globalPaletteChange())); + connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(globalPaletteChange())); reconfigure(); // initialize clock widget slotUpdate(); diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index 2b2d65217..f5b26b94b 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -70,7 +70,7 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type, connectDCOPSignal("kicker", "kicker", "configurationChanged()", "configure()", false); - connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), + connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(setBackgroundTheme())); TQTimer::singleShot(0, this, TQT_SLOT(setBackgroundTheme())); diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 769f8408d..4b8683bbb 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -168,7 +168,7 @@ void ExtensionContainer::init() installEventFilter(this); // for mouse event handling - connect(Kicker::the(), TQT_SIGNAL(kdisplayPaletteChanged()), this, TQT_SLOT(updateHighlightColor())); + connect(Kicker::the(), TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(updateHighlightColor())); updateHighlightColor(); // if we were hidden when kicker quit, let's start out hidden as well! diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index 32a5cdfa5..fa4af2ea6 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -104,7 +104,7 @@ ContainerArea::ContainerArea(TDEConfig* _c, setBackground(); connect(&_autoScrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoScroll())); - connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(setBackground())); + connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(setBackground())); connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)), TQT_SLOT(immutabilityChanged(bool))); connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground())); diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index 893cb1665..022bcd180 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -211,7 +211,7 @@ void ExtensionManager::configureMenubar(bool duringInit) updateMenubar(); m_menubarPanel->show(); - connect(kapp, TQT_SIGNAL(kdisplayFontChanged()), TQT_SLOT(updateMenubar())); + connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), TQT_SLOT(updateMenubar())); } else if (m_menubarPanel) { diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index c39f9a775..316f1a625 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -125,8 +125,8 @@ Kicker::Kicker() configure(); connect(this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - connect(this, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); - connect(this, TQT_SIGNAL(kdisplayStyleChanged()), TQT_SLOT(slotStyleChanged())); + connect(this, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(this, TQT_SIGNAL(tdedisplayStyleChanged()), TQT_SLOT(slotStyleChanged())); #if (TQT_VERSION-0 >= 0x030200) // XRANDR support connect(desktop(), TQT_SIGNAL(resized(int)), TQT_SLOT(slotDesktopResized())); diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 46d66b099..123125b21 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -247,9 +247,9 @@ void PanelKMenu::initialize() if (loadSidePixmap()) { // in case we've been through here before, let's disconnect - disconnect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), + disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(paletteChanged())); - connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), + connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(paletteChanged())); } else diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index f8e3eaef5..81907b0ae 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -1198,9 +1198,9 @@ void KMenu::initialize() kdDebug(1210) << "KMenu::initialize()" << endl; // in case we've been through here before, let's disconnect - disconnect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), + disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(paletteChanged())); - connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), + connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(paletteChanged())); /* diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index 00a4b1a59..4f3aa169a 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cc @@ -432,7 +432,7 @@ void TOM::initialize() } else { - connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); }*/ // TASKS diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index 48b5ae599..37e78c7d4 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -223,7 +223,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), this, TQT_SLOT( slotDatabaseChanged() ) ); - connect( kapp, TQT_SIGNAL( kdisplayFontChanged()), TQT_SLOT(slotReconfigure())); + connect( kapp, TQT_SIGNAL( tdedisplayFontChanged()), TQT_SLOT(slotReconfigure())); //load the xmlui file specified in the profile or the default konqueror.rc setXMLFile( xmluiFile ); diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index d78908cd1..26d8d5623 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -344,7 +344,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo if (te) te->setScrollbarLocation(TEWidget::SCRNONE); } -// connect(kapp, TQT_SIGNAL(kdisplayFontChanged()), this, TQT_SLOT(slotFontChanged())); +// connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), this, TQT_SLOT(slotFontChanged())); kapp->dcopClient()->setDefaultObject( "konsole" ); diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp index 09a993916..57dd38510 100644 --- a/kpersonalizer/kstylepage.cpp +++ b/kpersonalizer/kstylepage.cpp @@ -324,7 +324,7 @@ void KStylePage::getColors(colorSet *set, bool colorfile ){ bool deleteConfig = false; // get the color scheme file and go to the color scheme group if(colorfile){ - TDEGlobal::dirs()->addResourceType("colors", TDEStandardDirs::kde_default("data")+"kdisplay/color-schemes"); + TDEGlobal::dirs()->addResourceType("colors", TDEStandardDirs::kde_default("data")+"tdedisplay/color-schemes"); // set the style if (kde->isSelected()) { set->bgMode="Flat"; diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index 60a32c735..ad99acc11 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -316,7 +316,7 @@ kg_main( const char *argv0 ) app->setStyle( _GUIStyle ); } - _colorScheme = locate( "data", "kdisplay/color-schemes/" + _colorScheme + ".kcsrc" ); + _colorScheme = locate( "data", "tdedisplay/color-schemes/" + _colorScheme + ".kcsrc" ); if (!_colorScheme.isEmpty()) { KSimpleConfig config( _colorScheme, true ); config.setGroup( "Color Scheme" ); diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp index 41a635c51..a522c3436 100644 --- a/twin/kcmtwin/twinoptions/mouse.cpp +++ b/twin/kcmtwin/twinoptions/mouse.cpp @@ -366,7 +366,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); } - connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); layout->addStretch(); |