diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol | |
parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol')
115 files changed, 438 insertions, 438 deletions
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index d119ed683..01b5090de 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -115,14 +115,14 @@ KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled) int KAccessApp::newInstance() { - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); readSettings(); return 0; } void KAccessApp::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); // bell --------------------------------------------------------------- @@ -790,7 +790,7 @@ void KAccessApp::applyChanges() { unsigned int enabled = requestedFeatures & ~features; unsigned int disabled = features & ~requestedFeatures; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Keyboard"); if (enabled & XkbSlowKeysMask) @@ -823,7 +823,7 @@ void KAccessApp::yesClicked() { dialog->deleteLater(); dialog = 0; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Keyboard"); switch (showModeCombobox->currentItem()) { case 0: @@ -854,7 +854,7 @@ void KAccessApp::noClicked() { dialog = 0; requestedFeatures = features; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Keyboard"); switch (showModeCombobox->currentItem()) { case 0: diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index 1e28238a6..64cb290e9 100644 --- a/kcontrol/access/kcmaccess.cpp +++ b/kcontrol/access/kcmaccess.cpp @@ -578,7 +578,7 @@ void KAccessConfig::changeFlashScreenColor() void KAccessConfig::selectSound() { - TQStringList list = KGlobal::dirs()->findDirs("sound", ""); + TQStringList list = TDEGlobal::dirs()->findDirs("sound", ""); TQString start; if (list.count()>0) start = list[0]; diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index 6f6a39cd1..c6a012fe7 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -57,7 +57,7 @@ extern "C" { KDE_EXPORT KCModule *create_arts(TQWidget *parent, const char* /*name*/) { - KGlobal::locale()->insertCatalogue("kcmarts"); + TDEGlobal::locale()->insertCatalogue("kcmarts"); return new KArtsModule(parent, "kcmarts" ); } } @@ -96,16 +96,16 @@ static bool startArts() */ void KArtsModule::initAudioIOList() { - KProcess* artsd = new KProcess(); + TDEProcess* artsd = new TDEProcess(); *artsd << "artsd"; *artsd << "-A"; - connect(artsd, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotArtsdExited(KProcess*))); - connect(artsd, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotProcessArtsdOutput(KProcess*, char*, int))); + connect(artsd, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotArtsdExited(TDEProcess*))); + connect(artsd, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotProcessArtsdOutput(TDEProcess*, char*, int))); - if (!artsd->start(KProcess::Block, KProcess::Stderr)) { + if (!artsd->start(TDEProcess::Block, TDEProcess::Stderr)) { KMessageBox::error(0, i18n("Unable to start the sound server to " "retrieve possible sound I/O methods.\n" "Only automatic detection will be " @@ -114,13 +114,13 @@ void KArtsModule::initAudioIOList() } } -void KArtsModule::slotArtsdExited(KProcess* proc) +void KArtsModule::slotArtsdExited(TDEProcess* proc) { latestProcessStatus = proc->exitStatus(); delete proc; } -void KArtsModule::slotProcessArtsdOutput(KProcess*, char* buf, int len) +void KArtsModule::slotProcessArtsdOutput(TDEProcess*, char* buf, int len) { // XXX(gioele): I suppose this will be called with full lines, am I wrong? @@ -438,10 +438,10 @@ void KArtsModule::slotTestSound() if (configChanged && (userSavedChanges() == KMessageBox::Yes) || !artsdIsRunning() ) restartServer(); - KProcess test; + TDEProcess test; test << "artsplay"; test << locate("sound", "KDE_Startup_1.ogg"); - test.start(KProcess::DontCare); + test.start(TDEProcess::DontCare); } void KArtsModule::defaults() @@ -538,13 +538,13 @@ bool KArtsModule::realtimeIsPossible() static bool checked = false; if (!checked) { - KProcess* checkProcess = new KProcess(); + TDEProcess* checkProcess = new TDEProcess(); *checkProcess << "artswrapper"; *checkProcess << "check"; - connect(checkProcess, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotArtsdExited(KProcess*))); - if (!checkProcess->start(KProcess::Block)) + connect(checkProcess, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotArtsdExited(TDEProcess*))); + if (!checkProcess->start(TDEProcess::Block)) { delete checkProcess; realtimePossible = false; @@ -574,10 +574,10 @@ void KArtsModule::restartServer() DCOPRef("knotify", "qt/knotify").send("quit"); // Shut down artsd - KProcess terminateArts; + TDEProcess terminateArts; terminateArts << "artsshell"; terminateArts << "terminate"; - terminateArts.start(KProcess::Block); + terminateArts.start(TDEProcess::Block); if (starting) { @@ -594,10 +594,10 @@ void KArtsModule::restartServer() bool KArtsModule::artsdIsRunning() { - KProcess check; + TDEProcess check; check << "artsshell"; check << "status"; - check.start(KProcess::Block); + check.start(TDEProcess::Block); return (check.exitStatus() == 0); } diff --git a/kcontrol/arts/arts.h b/kcontrol/arts/arts.h index 80df5bd8e..4e4b4fd81 100644 --- a/kcontrol/arts/arts.h +++ b/kcontrol/arts/arts.h @@ -43,7 +43,7 @@ #include "hardwaretab.h" -class KProcess; +class TDEProcess; class DeviceManager; class KArtsModule : public KCModule @@ -67,8 +67,8 @@ private slots: void slotChanged(); void slotTestSound(); - void slotArtsdExited(KProcess* proc); - void slotProcessArtsdOutput(KProcess* p, char* buf, int len); + void slotArtsdExited(TDEProcess* proc); + void slotProcessArtsdOutput(TDEProcess* p, char* buf, int len); //void slotStartServerChanged(); private: diff --git a/kcontrol/arts/krichtextlabel.cpp b/kcontrol/arts/krichtextlabel.cpp index 0a188a475..6543b3690 100644 --- a/kcontrol/arts/krichtextlabel.cpp +++ b/kcontrol/arts/krichtextlabel.cpp @@ -40,14 +40,14 @@ static TQString qrichtextify( const TQString& text ) KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); + m_defaultWidth = TQMIN(500, TDEGlobalSettings::desktopGeometry(this).width()*3/5); setAlignment( TQt::WordBreak ); setText(text); } KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); + m_defaultWidth = TQMIN(500, TDEGlobalSettings::desktopGeometry(this).width()*3/5); setAlignment( TQt::WordBreak ); } diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 53b095be1..2905d7ac7 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -69,8 +69,8 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop) : BGDialog_UI(parent, "BGDialog") { - m_pGlobals = new KGlobalBackgroundSettings(_config); - m_pDirs = KGlobal::dirs(); + m_pGlobals = new TDEGlobalBackgroundSettings(_config); + m_pDirs = TDEGlobal::dirs(); m_multidesktop = _multidesktop; m_previewUpdates = true; @@ -246,7 +246,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop) if (m_wallpaperPos == KBackgroundSettings::NoWallpaper) m_wallpaperPos = KBackgroundSettings::Centred; // Default - if (KGlobal::dirs()->isRestrictedResource("wallpaper")) + if (TDEGlobal::dirs()->isRestrictedResource("wallpaper")) { m_urlWallpaperButton->hide(); m_buttonSetupWallpapers->hide(); @@ -407,7 +407,7 @@ void BGDialog::slotIdentifyScreens() { TQLabel *screenLabel = new TQLabel(0,"Screen Identify", (WFlags)(WDestructiveClose | WStyle_Customize | WX11BypassWM)); - TQFont identifyFont(KGlobalSettings::generalFont()); + TQFont identifyFont(TDEGlobalSettings::generalFont()); identifyFont.setPixelSize(100); screenLabel->setFont(identifyFont); @@ -1244,7 +1244,7 @@ void BGDialog::slotGetNewStuff() //FIXME set this to a server when we get one //should really be in a .rc file but could be either //kcmshellrc or kcontrolrc - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("KNewStuff"); config->writeEntry( "ProvidersUrl", "http://download.kde.org/khotnewstuff/wallpaper-providers.xml" ); config->writeEntry( "StandardResource", "wallpaper" ); diff --git a/kcontrol/background/bgdialog.h b/kcontrol/background/bgdialog.h index 30bb0f004..86e10a039 100644 --- a/kcontrol/background/bgdialog.h +++ b/kcontrol/background/bgdialog.h @@ -83,7 +83,7 @@ protected slots: protected: void getEScreen(); - KGlobalBackgroundSettings *m_pGlobals; + TDEGlobalBackgroundSettings *m_pGlobals; KStandardDirs *m_pDirs; bool m_multidesktop; bool m_useViewports; diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index 51d114582..2c3da199f 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -53,7 +53,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou m_State = 0; m_isBusyCursor = false; m_enableBusyCursor = false; - m_pDirs = KGlobal::dirs(); + m_pDirs = TDEGlobal::dirs(); m_rSize = m_Size = drawBackgroundPerScreen ? TDEApplication::desktop()->screenGeometry(screen).size() : TDEApplication::desktop()->geometry().size(); m_pProc = 0L; m_Tempfile = 0L; @@ -238,8 +238,8 @@ int KBackgroundRenderer::doBackground(bool quit) delete m_pProc; m_pProc = new KShellProcess; *m_pProc << file; - connect(m_pProc, TQT_SIGNAL(processExited(KProcess *)), - TQT_SLOT(slotBackgroundDone(KProcess *))); + connect(m_pProc, TQT_SIGNAL(processExited(TDEProcess *)), + TQT_SLOT(slotBackgroundDone(TDEProcess *))); m_pProc->start(KShellProcess::NotifyOnExit); retval = Wait; break; @@ -741,7 +741,7 @@ void KBackgroundRenderer::blend(TQImage& dst, TQRect dr, const TQImage& src, TQP -void KBackgroundRenderer::slotBackgroundDone(KProcess *process) +void KBackgroundRenderer::slotBackgroundDone(TDEProcess *process) { Q_ASSERT(process == m_pProc); m_State |= BackgroundDone; diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h index cf1682578..ee798894e 100644 --- a/kcontrol/background/bgrender.h +++ b/kcontrol/background/bgrender.h @@ -24,7 +24,7 @@ class TQString; class TQTimer; class KConfig; -class KProcess; +class TDEProcess; class KTempFile; class KShellProcess; class KStandardDirs; @@ -68,7 +68,7 @@ signals: void programSuccess(int desk); //programSuccess is emitted after imageDone private slots: - void slotBackgroundDone(KProcess *); + void slotBackgroundDone(TDEProcess *); void render(); void done(); diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp index b89731c42..d51995299 100644 --- a/kcontrol/background/bgsettings.cpp +++ b/kcontrol/background/bgsettings.cpp @@ -42,7 +42,7 @@ KBackgroundPattern::KBackgroundPattern(TQString name) dirty = false; hashdirty = true; - m_pDirs = KGlobal::dirs(); + m_pDirs = TDEGlobal::dirs(); m_pDirs->addResourceType("dtop_pattern", m_pDirs->kde_default("data") + "kdesktop/patterns"); m_pConfig = 0L; @@ -182,7 +182,7 @@ int KBackgroundPattern::hash() /* static */ TQStringList KBackgroundPattern::list() { - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); dirs->addResourceType("dtop_pattern", dirs->kde_default("data") + "kdesktop/patterns"); TQStringList lst = dirs->findAllResources("dtop_pattern", "*.desktop", @@ -209,7 +209,7 @@ KBackgroundProgram::KBackgroundProgram(TQString name) dirty = false; hashdirty = true; - m_pDirs = KGlobal::dirs(); + m_pDirs = TDEGlobal::dirs(); m_pDirs->addResourceType("dtop_program", m_pDirs->kde_default("data") + "kdesktop/programs"); m_pConfig = 0L; @@ -393,7 +393,7 @@ int KBackgroundProgram::hash() /* static */ TQStringList KBackgroundProgram::list() { - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); dirs->addResourceType("dtop_program", dirs->kde_default("data") + "kdesktop/programs"); TQStringList lst = dirs->findAllResources("dtop_program", "*.desktop", @@ -489,7 +489,7 @@ KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgrou ADD_STRING(NoMultiRandom) #undef ADD_STRING - m_pDirs = KGlobal::dirs(); + m_pDirs = TDEGlobal::dirs(); if (!config) { int screen_number = 0; @@ -651,7 +651,7 @@ void KBackgroundSettings::setWallpaperMode(int mode) void KBackgroundSettings::setWallpaperList(TQStringList list) { - KStandardDirs *d = KGlobal::dirs(); + KStandardDirs *d = TDEGlobal::dirs(); if (m_WallpaperList == list) return; @@ -1029,7 +1029,7 @@ TQString KBackgroundSettings::fingerprint() s += TQString("wm:%1;").arg(m_WallpaperMode); if (m_WallpaperMode != NoWallpaper) { - TQ_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false); + TQ_UINT32 rh = TDEGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false); s += TQString("wp:%2:%1;").arg(rh).arg(currentWallpaper()); } @@ -1063,9 +1063,9 @@ void KBackgroundSettings::setEnabled(const bool enable) hashdirty = true; } -/**** KGlobalBackgroundSettings ****/ +/**** TDEGlobalBackgroundSettings ****/ -KGlobalBackgroundSettings::KGlobalBackgroundSettings(KConfig *_config) +TDEGlobalBackgroundSettings::TDEGlobalBackgroundSettings(KConfig *_config) { m_pConfig = _config; @@ -1073,14 +1073,14 @@ KGlobalBackgroundSettings::KGlobalBackgroundSettings(KConfig *_config) } -TQString KGlobalBackgroundSettings::deskName(int desk) +TQString TDEGlobalBackgroundSettings::deskName(int desk) { return m_Names[desk]; } /* -void KGlobalBackgroundSettings::setDeskName(int desk, TQString name) +void TDEGlobalBackgroundSettings::setDeskName(int desk, TQString name) { if (name == m_Names[desk]) return; @@ -1090,7 +1090,7 @@ void KGlobalBackgroundSettings::setDeskName(int desk, TQString name) */ -void KGlobalBackgroundSettings::setCacheSize(int size) +void TDEGlobalBackgroundSettings::setCacheSize(int size) { if (size == m_CacheSize) return; @@ -1099,7 +1099,7 @@ void KGlobalBackgroundSettings::setCacheSize(int size) } -void KGlobalBackgroundSettings::setLimitCache(bool limit) +void TDEGlobalBackgroundSettings::setLimitCache(bool limit) { if (limit == m_bLimitCache) return; @@ -1108,7 +1108,7 @@ void KGlobalBackgroundSettings::setLimitCache(bool limit) } -bool KGlobalBackgroundSettings::drawBackgroundPerScreen(int desk) const +bool TDEGlobalBackgroundSettings::drawBackgroundPerScreen(int desk) const { if ( desk > int(m_bDrawBackgroundPerScreen.size()) ) return _defDrawBackgroundPerScreen; @@ -1116,7 +1116,7 @@ bool KGlobalBackgroundSettings::drawBackgroundPerScreen(int desk) const } -void KGlobalBackgroundSettings::setDrawBackgroundPerScreen(int desk, bool perScreen) +void TDEGlobalBackgroundSettings::setDrawBackgroundPerScreen(int desk, bool perScreen) { if ( desk >= int(m_bDrawBackgroundPerScreen.size()) ) return; @@ -1129,7 +1129,7 @@ void KGlobalBackgroundSettings::setDrawBackgroundPerScreen(int desk, bool perScr } -void KGlobalBackgroundSettings::setCommonScreenBackground(bool common) +void TDEGlobalBackgroundSettings::setCommonScreenBackground(bool common) { if (common == m_bCommonScreen) return; @@ -1138,7 +1138,7 @@ void KGlobalBackgroundSettings::setCommonScreenBackground(bool common) } -void KGlobalBackgroundSettings::setCommonDeskBackground(bool common) +void TDEGlobalBackgroundSettings::setCommonDeskBackground(bool common) { if (common == m_bCommonDesk) return; @@ -1147,7 +1147,7 @@ void KGlobalBackgroundSettings::setCommonDeskBackground(bool common) } -void KGlobalBackgroundSettings::setDockPanel(bool dock) +void TDEGlobalBackgroundSettings::setDockPanel(bool dock) { if (dock == m_bDock) return; @@ -1156,7 +1156,7 @@ void KGlobalBackgroundSettings::setDockPanel(bool dock) } -void KGlobalBackgroundSettings::setExportBackground(bool _export) +void TDEGlobalBackgroundSettings::setExportBackground(bool _export) { if (_export == m_bExport) return; @@ -1164,7 +1164,7 @@ void KGlobalBackgroundSettings::setExportBackground(bool _export) m_bExport = _export; } -void KGlobalBackgroundSettings::setTextColor(TQColor _color) +void TDEGlobalBackgroundSettings::setTextColor(TQColor _color) { if (_color == m_TextColor) return; @@ -1172,7 +1172,7 @@ void KGlobalBackgroundSettings::setTextColor(TQColor _color) m_TextColor = _color; } -void KGlobalBackgroundSettings::setTextBackgroundColor(TQColor _color) +void TDEGlobalBackgroundSettings::setTextBackgroundColor(TQColor _color) { if (_color == m_TextBackgroundColor) return; @@ -1180,7 +1180,7 @@ void KGlobalBackgroundSettings::setTextBackgroundColor(TQColor _color) m_TextBackgroundColor = _color; } -void KGlobalBackgroundSettings::setShadowEnabled(bool enabled) +void TDEGlobalBackgroundSettings::setShadowEnabled(bool enabled) { if (enabled == m_shadowEnabled) return; @@ -1188,7 +1188,7 @@ void KGlobalBackgroundSettings::setShadowEnabled(bool enabled) m_shadowEnabled = enabled; } -void KGlobalBackgroundSettings::setTextLines(int lines) +void TDEGlobalBackgroundSettings::setTextLines(int lines) { if (lines == m_textLines) return; @@ -1196,7 +1196,7 @@ void KGlobalBackgroundSettings::setTextLines(int lines) m_textLines = lines; } -void KGlobalBackgroundSettings::setTextWidth(int width) +void TDEGlobalBackgroundSettings::setTextWidth(int width) { if (width == m_textWidth) return; @@ -1204,7 +1204,7 @@ void KGlobalBackgroundSettings::setTextWidth(int width) m_textWidth = width; } -void KGlobalBackgroundSettings::readSettings() +void TDEGlobalBackgroundSettings::readSettings() { m_pConfig->setGroup("Background Common"); m_bCommonScreen = m_pConfig->readBoolEntry("CommonScreen", _defCommonScreen); @@ -1220,7 +1220,7 @@ void KGlobalBackgroundSettings::readSettings() for ( int i = 0 ; i < info.numberOfDesktops() ; ++i ) m_bDrawBackgroundPerScreen[i] = m_pConfig->readBoolEntry( TQString("DrawBackgroundPerScreen_%1").arg(i), _defDrawBackgroundPerScreen ); - m_TextColor = KGlobalSettings::textColor(); + m_TextColor = TDEGlobalSettings::textColor(); m_pConfig->setGroup("FMSettings"); m_TextColor = m_pConfig->readColorEntry("NormalTextColor", &m_TextColor); m_TextBackgroundColor = m_pConfig->readColorEntry("ItemTextBackground"); @@ -1234,7 +1234,7 @@ void KGlobalBackgroundSettings::readSettings() dirty = false; } -void KGlobalBackgroundSettings::writeSettings() +void TDEGlobalBackgroundSettings::writeSettings() { if (!dirty) return; diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h index abb8b6cf9..03aa171e7 100644 --- a/kcontrol/background/bgsettings.h +++ b/kcontrol/background/bgsettings.h @@ -302,10 +302,10 @@ public: /** * A class to read/modify the global desktop background settings. */ -class KGlobalBackgroundSettings +class TDEGlobalBackgroundSettings { public: - KGlobalBackgroundSettings(KConfig *config); + TDEGlobalBackgroundSettings(KConfig *config); TQString deskName(int desk); //void setDeskName(int desk, TQString name); diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp index 82bb1d8af..f10add59a 100644 --- a/kcontrol/background/bgwallpaper.cpp +++ b/kcontrol/background/bgwallpaper.cpp @@ -149,7 +149,7 @@ void BGMultiWallpaperDialog::slotAdd() mimeTypes += "image/svg+xml"; #endif - KFileDialog fileDialog(KGlobal::dirs()->findDirs("wallpaper", "").first(), + KFileDialog fileDialog(TDEGlobal::dirs()->findDirs("wallpaper", "").first(), mimeTypes.join( " " ), this, 0L, true); diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index 109e436c4..e291387c0 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -195,9 +195,9 @@ void Dtime::serverTimeCheck() { } void Dtime::findNTPutility(){ - KProcess proc; + TDEProcess proc; proc << "which" << "ntpdate"; - proc.start(KProcess::Block); + proc.start(TDEProcess::Block); if(proc.exitStatus() == 0) { ntpUtility = "ntpdate"; kdDebug() << "ntpUtility = " << ntpUtility.latin1() << endl; @@ -205,7 +205,7 @@ void Dtime::findNTPutility(){ } proc.clearArguments(); proc << "which" << "rdate"; - proc.start(KProcess::Block); + proc.start(TDEProcess::Block); if(proc.exitStatus() == 0) { ntpUtility = "rdate"; kdDebug() << "ntpUtility = " << ntpUtility.latin1() << endl; @@ -289,9 +289,9 @@ void Dtime::save() timeServer.replace( TQRegExp("\\).*"), "" ); // Would this be better?: s/^.*\(([^)]*)\).*$/\1/ } - KProcess proc; + TDEProcess proc; proc << ntpUtility << timeServer; - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); if( proc.exitStatus() != 0 ){ KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").arg(timeServer).latin1())); setDateTimeAuto->setChecked( false ); @@ -303,7 +303,7 @@ void Dtime::save() } else { // User time setting - KProcess c_proc; + TDEProcess c_proc; // BSD systems reverse year compared to Susv3 #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) @@ -321,7 +321,7 @@ void Dtime::save() kdDebug() << "Set date " << BufS << endl; c_proc << "date" << BufS; - c_proc.start( KProcess::Block ); + c_proc.start( TDEProcess::Block ); int result = c_proc.exitStatus(); if (result != 0 #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) @@ -333,9 +333,9 @@ void Dtime::save() } // try to set hardware clock. We do not care if it fails - KProcess hwc_proc; + TDEProcess hwc_proc; hwc_proc << "hwclock" << "--systohc"; - hwc_proc.start(KProcess::Block); + hwc_proc.start(TDEProcess::Block); } // restart time diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp index 69fece8e3..5885c2594 100644 --- a/kcontrol/clock/main.cpp +++ b/kcontrol/clock/main.cpp @@ -57,7 +57,7 @@ KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringLis " the root password, but feel the system time should be corrected, please contact your system" " administrator.")); - KGlobal::locale()->insertCatalogue("timezones"); // For time zone translations + TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translations TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index 041be096d..8bf7607ce 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -308,7 +308,7 @@ void KColorScheme::load() } void KColorScheme::load( bool useDefaults ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setReadDefaults( useDefaults ); config->setGroup("KDE"); sCurrentScheme = config->readEntry("colorScheme"); @@ -335,7 +335,7 @@ void KColorScheme::load( bool useDefaults ) void KColorScheme::save() { - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); cfg->setGroup( "General" ); cfg->writeEntry("background", cs->back, true, true); cfg->writeEntry("selectBackground", cs->select, true, true); @@ -560,7 +560,7 @@ void KColorScheme::slotAdd() } else { - sFile = KGlobal::dirs()->saveLocation("data", "kdisplay/color-schemes/") + sFile + ".kcsrc"; + sFile = TDEGlobal::dirs()->saveLocation("data", "kdisplay/color-schemes/") + sFile + ".kcsrc"; KSimpleConfig *config = new KSimpleConfig(sFile); config->setGroup( "Color Scheme"); config->writeEntry("Name", sName); @@ -676,11 +676,11 @@ void KColorScheme::slotSelectColor(const TQColor &col) // of course if ( selection == CSM_Standard_background && color(CSM_Alternate_background) == - KGlobalSettings::calculateAlternateBackgroundColor( + TDEGlobalSettings::calculateAlternateBackgroundColor( color(CSM_Standard_background) ) ) { color(CSM_Alternate_background) = - KGlobalSettings::calculateAlternateBackgroundColor( col ); + TDEGlobalSettings::calculateAlternateBackgroundColor( col ); } color(selection) = col; @@ -791,7 +791,7 @@ void KColorScheme::readScheme( int index ) if (index == 0) { // Current scheme - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("General"); } else { // Open scheme file @@ -818,7 +818,7 @@ void KColorScheme::readScheme( int index ) cs->buttonTxt = config->readColorEntry( "buttonForeground", &black ); cs->link = config->readColorEntry( "linkColor", &link ); cs->visitedLink = config->readColorEntry( "visitedLinkColor", &visitedLink ); - TQColor alternate = KGlobalSettings::calculateAlternateBackgroundColor(cs->window); + TQColor alternate = TDEGlobalSettings::calculateAlternateBackgroundColor(cs->window); cs->alternateBackground = config->readColorEntry( "alternateBackground", &alternate ); if (index == 0) @@ -860,7 +860,7 @@ void KColorScheme::readSchemeNames() nSysSchemes = 2; // Global + local schemes - TQStringList list = KGlobal::dirs()->findAllResources("data", + TQStringList list = TDEGlobal::dirs()->findAllResources("data", "kdisplay/color-schemes/*.kcsrc", false, true); // And add them diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index 623fd67b8..db39d21be 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -282,14 +282,14 @@ void WidgetCanvas::drawSampleWidgets() // Keep in sync with kglobalsettings. - TQFont windowFontGuess(KGlobalSettings::generalFont().family(), 12, TQFont::SansSerif, true); + TQFont windowFontGuess(TDEGlobalSettings::generalFont().family(), 12, TQFont::SansSerif, true); windowFontGuess.setPixelSize(12); c->setGroup("WM"); TQFont windowFont = c->readFontEntry("activeFont", &windowFontGuess); c->setGroup("General"); - TQFont defaultMenuFont = KGlobalSettings::menuFont(); + TQFont defaultMenuFont = TDEGlobalSettings::menuFont(); TQFont menuFont = c->readFontEntry("menuFont", &defaultMenuFont); delete c; @@ -468,7 +468,7 @@ void WidgetCanvas::drawSampleWidgets() height(), cg, TRUE, 2, &brush); // Standard text - TQFont fnt = KGlobalSettings::generalFont(); + TQFont fnt = TDEGlobalSettings::generalFont(); paint.setFont( fnt ); paint.setPen( windowTxt ); paint.drawText( 140, 127-20, i18n( "Standard text") ); diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp index f67065c24..616c98a50 100644 --- a/kcontrol/componentchooser/componentchooser.cpp +++ b/kcontrol/componentchooser/componentchooser.cpp @@ -169,7 +169,7 @@ void CfgEmailClient::selectEmailClient() TQString client = dlg.text(); // get the preferred Terminal Application - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); preferredTerminal += TQString::fromLatin1(" -e "); @@ -198,7 +198,7 @@ void CfgEmailClient::save(KConfig *) } // insure proper permissions -- contains sensitive data - TQString cfgName(KGlobal::dirs()->findResource("config", "emails")); + TQString cfgName(TDEGlobal::dirs()->findResource("config", "emails")); if (!cfgName.isEmpty()) ::chmod(TQFile::encodeName(cfgName), 0600); @@ -386,7 +386,7 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name): latestEditedService=""; TQStringList dummy; - TQStringList services=KGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy); + TQStringList services=TDEGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy); for (TQStringList::Iterator it=services.begin();it!=services.end();++it) { KSimpleConfig cfg(*it); diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp index fd9401d59..2e80ad145 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.cpp +++ b/kcontrol/componentchooser/kcm_componentchooser.cpp @@ -57,7 +57,7 @@ extern "C" { KDE_EXPORT KCModule *create_componentchooser( TQWidget *parent, const char * ) { - KGlobal::locale()->insertCatalogue("kcmcomponentchooser"); + TDEGlobal::locale()->insertCatalogue("kcmcomponentchooser"); return new KCMComponentChooser( parent, "kcmcomponentchooser" ); } } diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp index 4c9b9967b..6bdc6478f 100644 --- a/kcontrol/crypto/crypto.cpp +++ b/kcontrol/crypto/crypto.cpp @@ -1227,7 +1227,7 @@ void KCryptoConfig::save() authcfg->sync(); // insure proper permissions -- contains sensitive data - TQString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults")); + TQString cfgName(TDEGlobal::dirs()->findResource("config", "cryptodefaults")); if (!cfgName.isEmpty()) ::chmod(TQFile::encodeName(cfgName), 0600); @@ -1471,7 +1471,7 @@ TQDateTime qdt = x->getExpires(); int rc = kdtd.exec(); if (rc == KDialog::Accepted) { x->setExpires(kdtd.getDateTime()); - untilDate->setText(KGlobal::locale()->formatDateTime(x->getExpires())); + untilDate->setText(TDEGlobal::locale()->formatDateTime(x->getExpires())); configChanged(); } } @@ -1517,8 +1517,8 @@ TQString iss = TQString(); validFrom->setText(cert->getNotBefore()); validUntil->setText(cert->getNotAfter()); - untilDate->setText(x ? KGlobal::locale()->formatDateTime(x->getExpires()) - : KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC))); + untilDate->setText(x ? TDEGlobal::locale()->formatDateTime(x->getExpires()) + : TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC))); untilDate->setEnabled(x && !x->isPermanent()); pHash->setText(cert->getMD5DigestText()); delete cert; @@ -2024,11 +2024,11 @@ void KCryptoConfig::slotCAImport() { void KCryptoConfig::offerImportToKMail( const TQString& certFile ) { if ( KMessageBox::questionYesNo( this, i18n( "Do you want to make this certificate available to KMail as well?" ), TQString(), i18n("Make Available"), i18n("Do Not Make Available") ) == KMessageBox::Yes ) { - KProcess proc; + TDEProcess proc; proc << "kleopatra"; proc << "--import-certificate"; proc << certFile; - if ( !proc.start( KProcess::DontCare ) ) + if ( !proc.start( TDEProcess::DontCare ) ) KMessageBox::error( this, i18n( "Could not execute Kleopatra. You might have to install or update the tdepim package." ) ); } } @@ -2054,7 +2054,7 @@ void KCryptoConfig::slotCARestore() { // For now, we just rm the existing file and rebuild - TQString path = KGlobal::dirs()->saveLocation("config"); + TQString path = TDEGlobal::dirs()->saveLocation("config"); path += "/ksslcalist"; diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp index 9706ccd5f..e956edccb 100644 --- a/kcontrol/css/kcmcss.cpp +++ b/kcontrol/css/kcmcss.cpp @@ -371,7 +371,7 @@ void CSSConfig::slotPreview() // Show the preview PreviewDialog *dlg = new PreviewDialog(this, 0, true); dlg->preview->setPaper(back); - dlg->preview->viewport()->setFont(TQFont(KGlobalSettings::generalFont().family(), bfs)); + dlg->preview->viewport()->setFont(TQFont(TDEGlobalSettings::generalFont().family(), bfs)); dlg->exec(); diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 3ca9e8ccc..7a7ccc318 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -742,7 +742,7 @@ void KDisplayConfig::setRealResolutionSliderValue(int index) { KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStringList &) : KCModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0) { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); m_randrsimple = new KRandrSimpleAPI(); diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index c8bc0a8ed..8cb993476 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -95,7 +95,7 @@ void KCMDnssd::save() TQString scaryMessage = i18n("Enabling local network browsing will open a network port (5353) on your computer. If security problems are discovered in the zeroconf server, remote attackers could access your computer as the \"avahi\" user."); - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "tdesu"; @@ -103,13 +103,13 @@ void KCMDnssd::save() if (KMessageBox::warningYesNo( this, scaryMessage, i18n("Enable Zeroconf Network Browsing"), KGuiItem(i18n("Enable Browsing")), KGuiItem(i18n("Don't Enable Browsing")) ) == KMessageBox::Yes) { *proc << "/usr/share/avahi/enable_avahi 1"; - proc->start(KProcess::Block); + proc->start(TDEProcess::Block); } else { enableZeroconf->setChecked(false); } } else { *proc << "/usr/share/avahi/enable_avahi 0"; - proc->start(KProcess::Block); + proc->start(TDEProcess::Block); } } setCursor(TQCursor(Qt::ArrowCursor)); diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp index 586f947ff..f2e7fb20e 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp @@ -50,7 +50,7 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider, connect(m_dlg->leShortcut, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); // Data init - TQStringList charsets = KGlobal::charsets()->availableEncodingNames(); + TQStringList charsets = TDEGlobal::charsets()->availableEncodingNames(); charsets.prepend(i18n("Default")); m_dlg->cbCharset->insertStringList(charsets); diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp index 14626580e..8b6da2a99 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp +++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp @@ -82,11 +82,11 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const m_fullname = TQString::null; - KProcess proc; + TDEProcess proc; proc << helper << host; - connect( &proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - TQT_SLOT(receiveOutput(KProcess *, char *, int)) ); - if( !proc.start( KProcess::NotifyOnExit, KProcess::Stdout )) + connect( &proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQT_SLOT(receiveOutput(TDEProcess *, char *, int)) ); + if( !proc.start( TDEProcess::NotifyOnExit, TDEProcess::Stdout )) return last_result = false; last_host = host; @@ -101,7 +101,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const return last_result; } -void LocalDomainURIFilter::receiveOutput( KProcess *, char *buf, int ) +void LocalDomainURIFilter::receiveOutput( TDEProcess *, char *buf, int ) { m_fullname = TQFile::decodeName( buf ); } diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h index b5154cbc6..9d0c5f26d 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h +++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h @@ -29,7 +29,7 @@ #include <tqregexp.h> class TDEInstance; -class KProcess; +class TDEProcess; /* This filter takes care of hostnames in the local search domain. @@ -59,7 +59,7 @@ class LocalDomainURIFilter : public KURIFilterPlugin, public DCOPObject TQRegExp m_hostPortPattern; private slots: - void receiveOutput( KProcess *, char *, int ); + void receiveOutput( TDEProcess *, char *, int ); }; #endif diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index ef338d92b..93d76c28e 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -162,7 +162,7 @@ void FontUseItem::readFont( bool useDefaults ) bool deleteme = false; if (_rcfile.isEmpty()) - config = KGlobal::config(); + config = TDEGlobal::config(); else { config = new KConfig(_rcfile, true); @@ -182,7 +182,7 @@ void FontUseItem::writeFont() KConfigBase *config; if (_rcfile.isEmpty()) { - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup(_rcgroup); config->writeEntry(_rckey, font(), true, true); } else { @@ -713,7 +713,7 @@ void KFonts::save() for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() ) i->writeFont(); - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); KConfig cfgfonts("kcmfonts"); cfgfonts.setGroup("General"); @@ -729,7 +729,7 @@ void KFonts::save() proc << "xrdb" << "-quiet" << "-remove" << "-nocpp"; proc.writeStdin( TQCString( "Xft.dpi" ), true ); proc.closeWhenDone(); - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); } // KDE-1.x support diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp index 64e2bcde2..c271fa13b 100644 --- a/kcontrol/hwmanager/devicepropsdlg.cpp +++ b/kcontrol/hwmanager/devicepropsdlg.cpp @@ -312,7 +312,7 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge mainGrid->addWidget(base, 0, 0); } - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(processHardwareRemoved(TDEGenericDevice*))); connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(processHardwareUpdated(TDEGenericDevice*))); diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp index 040433665..a63eb84ea 100644 --- a/kcontrol/hwmanager/hwmanager.cpp +++ b/kcontrol/hwmanager/hwmanager.cpp @@ -83,7 +83,7 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis setRootOnlyMsg(i18n("<b>Hardware settings are system wide, and therefore require administrator access</b><br>To alter the system's hardware settings, click on the \"Administrator Mode\" button below.")); setUseRootOnlyMsg(true); - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(populateTreeView())); @@ -139,7 +139,7 @@ void TDEHWManager::populateTreeView() base->deviceTree->clear(); if (show_by_connection) { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEGenericHardwareList hwlist = hwdevices->listByDeviceClass(TDEGenericDeviceType::RootSystem); TDEGenericDevice *hwdevice; for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { @@ -152,7 +152,7 @@ void TDEHWManager::populateTreeView() } } else { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); for (int i=0;i<=TDEGenericDeviceType::Last;i++) { if (i != TDEGenericDeviceType::Root) { DeviceIconItem* rootitem = new DeviceIconItem(base->deviceTree, hwdevices->getFriendlyDeviceTypeStringFromType((TDEGenericDeviceType::TDEGenericDeviceType)i), hwdevices->getDeviceTypeIconFromType((TDEGenericDeviceType::TDEGenericDeviceType)i, base->deviceTree->iconSize()), 0); @@ -172,7 +172,7 @@ void TDEHWManager::populateTreeView() void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_connection, TQString selected_syspath) { if (show_by_connection) { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEGenericHardwareList hwlist = hwdevices->listAllPhysicalDevices(); TDEGenericDevice *hwdevice; for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index 80eb4f1ad..8f9e46fbc 100644 --- a/kcontrol/icons/icons.cpp +++ b/kcontrol/icons/icons.cpp @@ -135,8 +135,8 @@ TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget * void KIconConfig::init() { - mpLoader = KGlobal::iconLoader(); - mpConfig = KGlobal::config(); + mpLoader = TDEGlobal::iconLoader(); + mpConfig = TDEGlobal::config(); mpEffect = new KIconEffect; mpTheme = mpLoader->theme(); mUsage = 0; @@ -289,7 +289,7 @@ void KIconConfig::read() mpKickerConfig->setGroup("General"); mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", KIcon::SizeLarge); - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); mpRoundedCheck->setChecked(g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED)); mpActiveEffectCheck->setChecked(g.readBoolEntry("ShowKonqIconActivationEffect", KDE_DEFAULT_KONQ_ACTIVATION_EFFECT)); } @@ -410,7 +410,7 @@ void KIconConfig::load() void KIconConfig::load( bool useDefaults ) { - mpConfig = KGlobal::config(); + mpConfig = TDEGlobal::config(); mpConfig->setReadDefaults( useDefaults ); read(); apply(); @@ -473,7 +473,7 @@ void KIconConfig::save() mpKickerConfig->setGroup("General"); mpKickerConfig->writeEntry("panelIconWidth", mQuickLaunchSize); - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); g.writeEntry("IconUseRoundedRect", mpRoundedCheck->isChecked(), true, true); g.writeEntry("ShowKonqIconActivationEffect", mpActiveEffectCheck->isChecked(), true, true); diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index 5d7f924a9..6e8824cce 100644 --- a/kcontrol/icons/iconthemes.cpp +++ b/kcontrol/icons/iconthemes.cpp @@ -191,7 +191,7 @@ void IconThemesConfig::installNewTheme() KIO::NetAccess::removeTempFile(themeTmpFile); - KGlobal::instance()->newIconLoader(); + TDEGlobal::instance()->newIconLoader(); loadThemes(); TQListViewItem *item=iconThemeItem(KIconTheme::current()); @@ -302,7 +302,7 @@ void IconThemesConfig::removeSelectedTheme() unlink(TQFile::encodeName(icontheme.dir()+"/index.desktop").data()); KIO::del(KURL( icontheme.dir() )); - KGlobal::instance()->newIconLoader(); + TDEGlobal::instance()->newIconLoader(); loadThemes(); diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp index 017f9477b..0837209d6 100644 --- a/kcontrol/info/info.cpp +++ b/kcontrol/info/info.cpp @@ -73,7 +73,7 @@ static bool sorting_allowed; /* is sorting allowed by user ? */ static const TQString Value( int val, int numbers=1 ) { - return KGlobal::locale()->formatNumber(val, 0).rightJustify(numbers); + return TDEGlobal::locale()->formatNumber(val, 0).rightJustify(numbers); } static const TQString HexStr(unsigned long val, int digits ) @@ -189,8 +189,8 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie Value((int)DisplayCells(dpy, scr))); last = new TQListViewItem(item, last, i18n("Preallocated Pixels"), i18n("Black %1, White %2") - .arg(KGlobal::locale()->formatNumber(BlackPixel(dpy,scr), 0)) - .arg(KGlobal::locale()->formatNumber(WhitePixel(dpy,scr), 0))); + .arg(TDEGlobal::locale()->formatNumber(BlackPixel(dpy,scr), 0)) + .arg(TDEGlobal::locale()->formatNumber(WhitePixel(dpy,scr), 0))); TQString YES(i18n("Yes")); TQString NO(i18n("No")); @@ -239,7 +239,7 @@ static const TQString ByteString( unsigned long n ) return i18n("1 Byte"); // singular form: "1 Byte" (yes, it's "1", not "%1"!) return i18n("%1 Bytes") // plural form: "%1 Bytes" - .arg(KGlobal::locale()->formatNumber(n,0)); + .arg(TDEGlobal::locale()->formatNumber(n,0)); } static bool GetInfo_XServer_Generic( TQListView *lBox ) @@ -370,7 +370,7 @@ void KInfoListWidget::load() /* is the user allowed to use sorting ? */ lBox->header()->setClickEnabled(sorting_allowed); - lBox->header()->setFont(KGlobalSettings::generalFont()); + lBox->header()->setFont(TDEGlobalSettings::generalFont()); lBox->setShowSortIndicator(sorting_allowed); if (ok) @@ -420,7 +420,7 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const lBox = new TQListView(widgetStack); widgetStack->addWidget(lBox, 0); lBox->setMinimumSize(200,120); - lBox->setFont(KGlobalSettings::generalFont()); /* default font */ + lBox->setFont(TDEGlobalSettings::generalFont()); /* default font */ lBox->setAllColumnsShowFocus(true); TQWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) ); NoInfoText = new TQLabel(widgetStack); diff --git a/kcontrol/info/info_linux.cpp b/kcontrol/info/info_linux.cpp index 18287c45f..dc3872f01 100644 --- a/kcontrol/info/info_linux.cpp +++ b/kcontrol/info/info_linux.cpp @@ -140,7 +140,7 @@ bool GetInfo_CPU(TQListView * lBox) bool GetInfo_IRQ(TQListView * lBox) { - lBox->setFont(KGlobalSettings::fixedFont()); + lBox->setFont(TDEGlobalSettings::fixedFont()); return GetInfo_ReadfromFile(lBox, INFO_IRQ, 0); } diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index 483f7dd1d..49cb03dde 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -80,11 +80,11 @@ static TQString formatted_unit(t_memsize value) { if (value > (1024 * 1024)) if (value > (1024 * 1024 * 1024)) - return i18n("%1 GB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024 * 1024.0), 2)); + return i18n("%1 GB").arg(TDEGlobal::locale()->formatNumber(value / (1024 * 1024 * 1024.0), 2)); else - return i18n("%1 MB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024.0), 2)); + return i18n("%1 MB").arg(TDEGlobal::locale()->formatNumber(value / (1024 * 1024.0), 2)); else - return i18n("%1 KB").arg(KGlobal::locale()->formatNumber(value / 1024.0, 2)); + return i18n("%1 KB").arg(TDEGlobal::locale()->formatNumber(value / 1024.0, 2)); } KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) @@ -368,7 +368,7 @@ void KMemoryWidget::update_Values() label->clear(); else label->setText(i18n("%1 bytes ="). - arg(KGlobal::locale()-> + arg(TDEGlobal::locale()-> formatNumber(Memory_Info[i], 0))); } diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp index e61d57941..ed3975fc9 100644 --- a/kcontrol/input/core/themepage.cpp +++ b/kcontrol/input/core/themepage.cpp @@ -178,7 +178,7 @@ void ThemePage::fixCursorFile() // // Run mkfontdir to update fonts.dir in that dir. - KGlobal::dirs()->addResourceType( "font", "share/fonts/" ); + TDEGlobal::dirs()->addResourceType( "font", "share/fonts/" ); KIO::mkdir( KURL::fromPathOrURL(TQDir::homeDirPath() + "/.fonts/kde-override") ); TQString overrideDir = TQDir::homeDirPath() + "/.fonts/kde-override/"; @@ -200,12 +200,12 @@ void ThemePage::fixCursorFile() KIO::NetAccess::file_copy( source, installedFont, -1, true ); } - TQString cmd = KGlobal::dirs()->findExe( "mkfontdir" ); + TQString cmd = TDEGlobal::dirs()->findExe( "mkfontdir" ); if ( !cmd.isEmpty() ) { - KProcess p; + TDEProcess p; p << cmd << overrideDir; - p.start(KProcess::Block); + p.start(TDEProcess::Block); } } diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp index 686772709..ed43ef858 100644 --- a/kcontrol/input/mouse.cpp +++ b/kcontrol/input/mouse.cpp @@ -639,7 +639,7 @@ void MouseSettings::load(KConfig *config) handedEnabled = true; - // ## keep this in sync with KGlobalSettings::mouseSettings + // ## keep this in sync with TDEGlobalSettings::mouseSettings if( num_buttons == 1 ) { /* disable button remapping */ diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp index a4cd605be..6ed69774b 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp +++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp @@ -119,7 +119,7 @@ void KCMIOSlaveInfo::slotResult(KIO::Job *) void KCMIOSlaveInfo::showInfo(const TQString& protocol) { TQString file = TQString("kioslave/%1.docbook").arg( protocol ); - file = KGlobal::locale()->langLookup( file ); + file = TDEGlobal::locale()->langLookup( file ); if (m_tfj) { m_tfj->kill(); diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp index ae629ac3e..0214b2791 100644 --- a/kcontrol/joystick/joywidget.cpp +++ b/kcontrol/joystick/joywidget.cpp @@ -54,7 +54,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name) messageBox = new TQHBox(mainVbox); messageBox->setSpacing(KDialog::spacingHint()); TQLabel *icon = new TQLabel(messageBox); - icon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, + icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true)); icon->setFixedSize(icon->sizeHint()); message = new TQLabel(messageBox); diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index 1bfd3d127..12db9e615 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/kcontrol/kcontrol/aboutwidget.cpp @@ -150,7 +150,7 @@ void AboutWidget::updatePixmap() } else { - KIconLoader *loader = KGlobal::instance()->iconLoader(); + KIconLoader *loader = TDEGlobal::instance()->iconLoader(); TQString iconPath; if (!_icon.isEmpty()) { iconPath = loader->iconPath( _icon, KIcon::Toolbar ); diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp index 5c4907a91..d6cdd91d1 100644 --- a/kcontrol/kcontrol/dockcontainer.cpp +++ b/kcontrol/kcontrol/dockcontainer.cpp @@ -83,7 +83,7 @@ void ModuleTitle::showTitleFor( ConfigModule *config ) TQWhatsThis::remove( this ); TQWhatsThis::add( this, config->comment() ); - KIconLoader *loader = KGlobal::instance()->iconLoader(); + KIconLoader *loader = TDEGlobal::instance()->iconLoader(); TQPixmap icon = loader->loadIcon( config->icon(), KIcon::NoGroup, 22 ); m_icon->setPixmap( icon ); m_name->setText( config->moduleName() ); diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp index 7421d353e..76fc756c4 100644 --- a/kcontrol/kcontrol/helpwidget.cpp +++ b/kcontrol/kcontrol/helpwidget.cpp @@ -74,13 +74,13 @@ bool HelpWidget::clicked(const TQString & _url) return true; } - KProcess process; + TDEProcess process; KURL url(KURL("help:/"), _url); if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") { process << "khelpcenter" << url.url(); - process.start(KProcess::DontCare); + process.start(TDEProcess::DontCare); } else { new KRun(url); } diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index 411a95748..7edc8bd43 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -56,7 +56,7 @@ KControlApp::KControlApp() toplevel = new TopLevel(); setMainWidget(toplevel); - KGlobal::setActiveInstance(this); + TDEGlobal::setActiveInstance(this); // KUniqueApplication does dcop regitration for us ModuleIface *modIface = new ModuleIface(TQT_TQOBJECT(toplevel), "moduleIface"); @@ -64,8 +64,8 @@ KControlApp::KControlApp() connect (modIface, TQT_SIGNAL(helpClicked()), toplevel, TQT_SLOT(slotHelpRequest())); connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest())); - TQRect desk = KGlobalSettings::desktopGeometry(toplevel); - KConfig *config = KGlobal::config(); + TQRect desk = TDEGlobalSettings::desktopGeometry(toplevel); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); // Initial size is: // never bigger than workspace as reported by desk @@ -88,7 +88,7 @@ KControlApp::~KControlApp() { if (toplevel) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop()); config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width()); diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp index ad60eda5a..2b8f74b12 100644 --- a/kcontrol/kcontrol/modulemenu.cpp +++ b/kcontrol/kcontrol/modulemenu.cpp @@ -72,7 +72,7 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath) TQString name = group->caption(); name.replace("&", "&&"); - parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall) + parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall) , name, menu); fill(menu, path); @@ -87,7 +87,7 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath) TQString name = module->moduleName(); name.replace("&", "&&"); - int realid = parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall) + int realid = parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall) , name, id); _moduleDict.insert(realid, module); diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index 584480837..592eb52c2 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -189,7 +189,7 @@ void ConfigModule::runAsRoot() TQString tdesu = KStandardDirs::findExe("tdesu"); if (!tdesu.isEmpty()) { - _rootProcess = new KProcess; + _rootProcess = new TDEProcess; *_rootProcess << tdesu; *_rootProcess << "--nonewdcop"; // We have to disable the keep-password feature because @@ -198,15 +198,15 @@ void ConfigModule::runAsRoot() // We also don't have a way to close the module in that case. *_rootProcess << "--n"; // Don't keep password. if (kdeshell) { - *_rootProcess << TQString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "kcmshell")).arg(cmd).arg(_embedWidget->winId()).arg(KGlobal::locale()->language()); + *_rootProcess << TQString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "kcmshell")).arg(cmd).arg(_embedWidget->winId()).arg(TDEGlobal::locale()->language()); } else { - *_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( KGlobal::locale()->language() ); + *_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( TDEGlobal::locale()->language() ); } - connect(_rootProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(rootExited(KProcess*))); + connect(_rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(rootExited(TDEProcess*))); - if ( !_rootProcess->start(KProcess::NotifyOnExit) ) + if ( !_rootProcess->start(TDEProcess::NotifyOnExit) ) { delete _rootProcess; _rootProcess = 0L; @@ -226,7 +226,7 @@ void ConfigModule::runAsRoot() } -void ConfigModule::rootExited(KProcess *) +void ConfigModule::rootExited(TDEProcess *) { if (_embedWidget->embeddedWinId()) XDestroyWindow(tqt_xdisplay(), _embedWidget->embeddedWinId()); diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h index fc5406fa6..bb612e376 100644 --- a/kcontrol/kcontrol/modules.h +++ b/kcontrol/kcontrol/modules.h @@ -30,7 +30,7 @@ class TQStringList; class TDEAboutData; class KCModule; class ProxyWidget; -class KProcess; +class TDEProcess; class QXEmbed; class TQVBoxLayout; class TQVBox; @@ -63,7 +63,7 @@ private slots: void clientClosed(); void clientChanged(bool state); void runAsRoot(); - void rootExited(KProcess *proc); + void rootExited(TDEProcess *proc); void embedded(); @@ -80,7 +80,7 @@ private: bool _changed; ProxyWidget *_module; QXEmbed *_embedWidget; - KProcess *_rootProcess; + TDEProcess *_rootProcess; TQVBoxLayout *_embedLayout; TQVBox *_embedFrame; TQWidgetStack *_embedStack; diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp index 794a69b91..7c095c5f7 100644 --- a/kcontrol/kcontrol/moduletreeview.cpp +++ b/kcontrol/kcontrol/moduletreeview.cpp @@ -38,7 +38,7 @@ static TQPixmap appIcon(const TQString &iconName) { TQString path; - TQPixmap normal = KGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, &path, true); + TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, &path, true); // make sure they are not larger than KIcon::SizeSmall if (normal.width() > KIcon::SizeSmall || normal.height() > KIcon::SizeSmall) { diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp index 2333774ba..1b32e0f7f 100644 --- a/kcontrol/kcontrol/searchwidget.cpp +++ b/kcontrol/kcontrol/searchwidget.cpp @@ -39,7 +39,7 @@ class ModuleItem : public TQListBoxPixmap public: ModuleItem(ConfigModule *module, TQListBox * listbox = 0) : TQListBoxPixmap(listbox, - KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall), + TDEGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall), module->moduleName()) , m_module(module) { diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index bd3c70222..62b23591a 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -57,7 +57,7 @@ TopLevel::TopLevel(const char* name) report_bug = 0; // read settings - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Index"); TQString viewmode = config->readEntry("ViewMode", "Tree"); @@ -182,8 +182,8 @@ TopLevel::TopLevel(const char* name) TQT_SLOT( activateModule( ConfigModule * ) ) ); _dock->setBaseWidget( aw ); KWin::setIcons( winId(), - KGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 32 ), - KGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 16 ) ); + TDEGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 32 ), + TDEGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 16 ) ); } else { @@ -196,7 +196,7 @@ TopLevel::TopLevel(const char* name) TopLevel::~TopLevel() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Index"); if (KCGlobal::viewMode() == Tree) config->writeEntry("ViewMode", "Tree"); @@ -486,7 +486,7 @@ void TopLevel::reportBug() bool deleteit = false; if (!_active) // report against kcontrol - dummyAbout = const_cast<TDEAboutData*>(KGlobal::instance()->aboutData()); + dummyAbout = const_cast<TDEAboutData*>(TDEGlobal::instance()->aboutData()); else { if (_active->aboutData()) diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp index 226e84310..af606f5fd 100644 --- a/kcontrol/kded/kcmkded.cpp +++ b/kcontrol/kded/kcmkded.cpp @@ -148,7 +148,7 @@ void KDEDConfig::load( bool useDefaults ) { _lvLoD->clear(); TQStringList files; - KGlobal::dirs()->findAllResources( "services", + TDEGlobal::dirs()->findAllResources( "services", TQString::fromLatin1( "kded/*.desktop" ), true, true, files ); @@ -186,7 +186,7 @@ void KDEDConfig::save() { TQCheckListItem* item = 0L; TQStringList files; - KGlobal::dirs()->findAllResources( "services", + TDEGlobal::dirs()->findAllResources( "services", TQString::fromLatin1( "kded/*.desktop" ), true, true, files ); diff --git a/kcontrol/keys/ChangeLog b/kcontrol/keys/ChangeLog index b8ef570df..da787a8c6 100644 --- a/kcontrol/keys/ChangeLog +++ b/kcontrol/keys/ChangeLog @@ -15,8 +15,8 @@ global.cpp did for just the global keys. * converted main.cpp to use keyconfig.cpp rather than global.cpp and standard.cpp for standard and globall - key configuration. KGlobalConfig and KStdConfig disappear. - (KGlobalConfig is renamed to KKeyConfig) + key configuration. TDEGlobalConfig and KStdConfig disappear. + (TDEGlobalConfig is renamed to KKeyConfig) * appropriate changes to Makefile.am. * standard key binding are now #include'd from stdbindings.cpp diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index dc9d30954..539c67215 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -226,7 +226,7 @@ void KKeyModule::defaults() /*void KKeyModule::slotRemove() { TQString kksPath = - KGlobal::dirs()->saveLocation("data", "kcmkeys/" + KeyType); + TDEGlobal::dirs()->saveLocation("data", "kcmkeys/" + KeyType); TQDir d( kksPath ); if (!d.exists()) // what can we do? @@ -360,7 +360,7 @@ void KKeyModule::readScheme( int index ) TQT_SLOT( slotPreviewScheme( int ) ) ); - TQString kksPath = KGlobal::dirs()->saveLocation("data", "kcmkeys/"); + TQString kksPath = TDEGlobal::dirs()->saveLocation("data", "kcmkeys/"); TQDir d( kksPath ); if ( !d.exists() ) @@ -426,7 +426,7 @@ void KKeyModule::readScheme( int index ) /*void KKeyModule::readSchemeNames( ) { - TQStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/" + KeyType + "/*.kksrc"); + TQStringList schemes = TDEGlobal::dirs()->findAllResources("data", "kcmkeys/" + KeyType + "/*.kksrc"); //TQRegExp r( "-kde[34].kksrc$" ); TQRegExp r( "-trinity.kksrc$" ); @@ -472,11 +472,11 @@ void KKeyModule::init() kdDebug(125) << "KKeyModule::init()\n"; /*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n"; - KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" ); - TQString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" ); + KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" ); KAccel::useFourModifierKeys( fourMods == "true" ); bool bUseFourModifierKeys = KAccel::useFourModifierKeys(); - KGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true ); + TDEGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true ); */ KAccelActions* keys = new KAccelActions(); diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp index a91fca234..456818bed 100644 --- a/kcontrol/keys/main.cpp +++ b/kcontrol/keys/main.cpp @@ -132,9 +132,9 @@ extern "C" KDE_EXPORT KCModule *create_keys(TQWidget *parent, const char * /*name*/) { // What does this do? Why not insert klipper and kxkb, too? --ellis, 2002/01/15 - KGlobal::locale()->insertCatalogue("twin"); - KGlobal::locale()->insertCatalogue("kdesktop"); - KGlobal::locale()->insertCatalogue("kicker"); + TDEGlobal::locale()->insertCatalogue("twin"); + TDEGlobal::locale()->insertCatalogue("kdesktop"); + TDEGlobal::locale()->insertCatalogue("kicker"); return new KeyModule(parent, "kcmkeys"); } @@ -142,8 +142,8 @@ extern "C" { kdDebug(125) << "KeyModule::initModifiers()" << endl; - KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" ); - bool bMacSwap = KGlobal::config()->readBoolEntry( "Mac Modifier Swap", false ); + KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + bool bMacSwap = TDEGlobal::config()->readBoolEntry( "Mac Modifier Swap", false ); if( bMacSwap ) ModifiersModule::setupMacModifierKeys(); } @@ -153,11 +153,11 @@ extern "C" kdDebug(125) << "KeyModule::init()\n"; /*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n"; - KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" ); - TQString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" ); + KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" ); KAccel::useFourModifierKeys( fourMods == "true" ); bool bUseFourModifierKeys = KAccel::useFourModifierKeys(); - KGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true ); + TDEGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true ); */ KAccelActions* keys = new KAccelActions(); @@ -179,16 +179,16 @@ extern "C" // This is needed to be able to check for conflicts with global keys in app's keyconfig // dialogs, kdeglobals is empty as long as you don't apply any change in controlcenter/keys. // However, avoid writing at every KDE startup, just update them after every rebuild of this file. - KConfigGroup group( KGlobal::config(), "Global Shortcuts" ); + KConfigGroup group( TDEGlobal::config(), "Global Shortcuts" ); if( group.readEntry( "Defaults timestamp" ) != __DATE__ __TIME__ ) { kdDebug(125) << "KeyModule::init() - Read Config Bindings\n"; // Check for old group, - if( KGlobal::config()->hasGroup( "Global Keys" ) ) { + if( TDEGlobal::config()->hasGroup( "Global Keys" ) ) { keys->readActions( "Global Keys" ); - KGlobal::config()->deleteGroup( "Global Keys", true, true ); + TDEGlobal::config()->deleteGroup( "Global Keys", true, true ); } keys->readActions( "Global Shortcuts" ); - KGlobal::config()->deleteGroup( "Global Shortcuts", true, true ); + TDEGlobal::config()->deleteGroup( "Global Shortcuts", true, true ); kdDebug(125) << "KeyModule::init() - Write Config Bindings\n"; keys->writeActions( "Global Shortcuts", 0, true, true ); diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp index db304f0c5..05802de74 100644 --- a/kcontrol/keys/modifiers.cpp +++ b/kcontrol/keys/modifiers.cpp @@ -61,7 +61,7 @@ ModifiersModule::ModifiersModule( TQWidget *parent, const char *name ) void ModifiersModule::load( bool useDefaults ) { - KConfig *c = KGlobal::config(); + KConfig *c = TDEGlobal::config(); c->setReadDefaults( useDefaults ); @@ -82,35 +82,35 @@ void ModifiersModule::save() { kdDebug(125) << "ModifiersModule::save()" << endl; - KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" ); + KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); if( m_plblCtrl->text() != "Ctrl" ) - KGlobal::config()->writeEntry( "Label Ctrl", m_plblCtrl->text(), true, true ); + TDEGlobal::config()->writeEntry( "Label Ctrl", m_plblCtrl->text(), true, true ); else - KGlobal::config()->deleteEntry( "Label Ctrl", false, true ); + TDEGlobal::config()->deleteEntry( "Label Ctrl", false, true ); if( m_plblAlt->text() != "Alt" ) - KGlobal::config()->writeEntry( "Label Alt", m_plblAlt->text(), true, true ); + TDEGlobal::config()->writeEntry( "Label Alt", m_plblAlt->text(), true, true ); else - KGlobal::config()->deleteEntry( "Label Alt", false, true ); + TDEGlobal::config()->deleteEntry( "Label Alt", false, true ); if( m_plblWin->text() != "Win" ) - KGlobal::config()->writeEntry( "Label Win", m_plblWin->text(), true, true ); + TDEGlobal::config()->writeEntry( "Label Win", m_plblWin->text(), true, true ); else - KGlobal::config()->deleteEntry( "Label Win", false, true ); + TDEGlobal::config()->deleteEntry( "Label Win", false, true ); if( m_pchkMacKeyboard->isChecked() ) - KGlobal::config()->writeEntry( "Mac Keyboard", true, true, true ); + TDEGlobal::config()->writeEntry( "Mac Keyboard", true, true, true ); else - KGlobal::config()->deleteEntry( "Mac Keyboard", false, true ); + TDEGlobal::config()->deleteEntry( "Mac Keyboard", false, true ); bool bMacSwap = m_pchkMacKeyboard->isChecked() && m_pchkMacSwap->isChecked(); if( bMacSwap ) - KGlobal::config()->writeEntry( "Mac Modifier Swap", true, true, true ); + TDEGlobal::config()->writeEntry( "Mac Modifier Swap", true, true, true ); else - KGlobal::config()->deleteEntry( "Mac Modifier Swap", false, true ); + TDEGlobal::config()->deleteEntry( "Mac Modifier Swap", false, true ); - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); if( m_bMacSwapOrig != bMacSwap ) { if( bMacSwap ) diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index 265f25564..3dac9dcf7 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -69,10 +69,10 @@ void ShortcutsModule::save() // FIXME: This isn't working. Why? -- ellis, 2002/01/27 // Check for old group, - if( KGlobal::config()->hasGroup( "Keys" ) ) { - KGlobal::config()->deleteGroup( "Keys", true, true ); + if( TDEGlobal::config()->hasGroup( "Keys" ) ) { + TDEGlobal::config()->deleteGroup( "Keys", true, true ); } - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); m_pkcGeneral->commitChanges(); m_pkcSequence->commitChanges(); @@ -104,7 +104,7 @@ TQString ShortcutsModule::quickHelp() const void ShortcutsModule::initGUI() { - TQString kde_winkeys_env_dir = KGlobal::dirs()->localtdedir() + "/env/"; + TQString kde_winkeys_env_dir = TDEGlobal::dirs()->localtdedir() + "/env/"; kdDebug(125) << "A-----------" << endl; KAccelActions* keys = &m_actionsGeneral; @@ -264,7 +264,7 @@ void ShortcutsModule::createActionsSequence() void ShortcutsModule::readSchemeNames() { - TQStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/*.kksrc"); + TQStringList schemes = TDEGlobal::dirs()->findAllResources("data", "kcmkeys/*.kksrc"); m_pcbSchemes->clear(); m_rgsSchemeFiles.clear(); @@ -406,7 +406,7 @@ void ShortcutsModule::slotSaveSchemeAs() disconnect( m_pcbSchemes, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelectScheme(int)) ); - TQString kksPath = KGlobal::dirs()->saveLocation( "data", "kcmkeys/" ); + TQString kksPath = TDEGlobal::dirs()->saveLocation( "data", "kcmkeys/" ); TQDir dir( kksPath ); if( !dir.exists() && !dir.mkdir( kksPath ) ) { @@ -458,7 +458,7 @@ void ShortcutsModule::slotRemoveScheme() void ShortcutsModule::slotUseRmWinKeysClicked() { - TQString kde_winkeys_env_dir = KGlobal::dirs()->localtdedir() + "/env/"; + TQString kde_winkeys_env_dir = TDEGlobal::dirs()->localtdedir() + "/env/"; // See if ~/.trinity/env/win-key.sh exists TQFile f( kde_winkeys_env_dir + "win-key.sh" ); diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp index 58de8a1f5..31b39974f 100644 --- a/kcontrol/keys/treeview.cpp +++ b/kcontrol/keys/treeview.cpp @@ -215,7 +215,7 @@ TQStringList AppTreeView::fileList(const TQString& rPath) TQStringList filelist; // loop through all resource dirs and build a file list - TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps"); + TQStringList resdirlist = TDEGlobal::dirs()->resourceDirs("apps"); for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it) { TQDir dir((*it) + "/" + relativePath); @@ -254,7 +254,7 @@ TQStringList AppTreeView::dirList(const TQString& rPath) TQStringList dirlist; // loop through all resource dirs and build a subdir list - TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps"); + TQStringList resdirlist = TDEGlobal::dirs()->resourceDirs("apps"); for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it) { TQDir dir((*it) + "/" + relativePath); diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index 5b2ac8a1a..814703b0f 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -82,7 +82,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) #endif itsConfig(KFI_UI_CFG_FILE) { - KGlobal::locale()->insertCatalogue(KFI_CATALOGUE); + TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE); TDEAboutData* about = new TDEAboutData("kcmfontinst", I18N_NOOP("TDE Font Installer"), diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp index df1bbe746..df50e81a3 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp @@ -189,7 +189,7 @@ void CKFileFontView::slotActivate(TQListViewItem *item) void CKFileFontView::selected(TQListViewItem *item) { if (item && !(TDEApplication::keyboardMouseState() & (ShiftButton|ControlButton)) && - KGlobalSettings::singleClick()) + TDEGlobalSettings::singleClick()) { const KFileItem *fi = ((CFontListViewItem*)item)->fileInfo(); @@ -632,7 +632,7 @@ void CFontListViewItem::init() CFontListViewItem::setPixmap(COL_NAME, itsInf->pixmap(KIcon::SizeSmall)); setText(COL_NAME, itsInf->text()); - setText(COL_SIZE, itsInf->isDir() ? "" : KGlobal::locale()->formatNumber(itsInf->size(), 0)); + setText(COL_SIZE, itsInf->isDir() ? "" : TDEGlobal::locale()->formatNumber(itsInf->size(), 0)); setText(COL_TYPE, itsInf->mimeComment()); } diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp index 112e3562b..a4f09cb56 100644 --- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp +++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp @@ -268,7 +268,7 @@ namespace KFI KFileFontPlugin::KFileFontPlugin(TQObject *parent, const char *name, const TQStringList& args) : KFilePlugin(parent, name, args) { - KGlobal::locale()->insertCatalogue(KFI_CATALOGUE); + TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE); addMimeType("application/x-font-ttf"), addMimeType("application/x-font-type1"); diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp index 7421d1681..15531901f 100644 --- a/kcontrol/kfontinst/kio/KioFonts.cpp +++ b/kcontrol/kfontinst/kio/KioFonts.cpp @@ -1127,15 +1127,15 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume) if(!Misc::dExists(itsFolders[destFolder].location)) { cmd+="mkdir "; - cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location)); + cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location)); cmd+=" && chmod 0755 "; - cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location)); + cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location)); cmd+=" && "; } cmd+="cp -f "; - cmd+=TQFile::encodeName(KProcess::quote(tmpFileC)); + cmd+=TQFile::encodeName(TDEProcess::quote(tmpFileC)); cmd+=" "; - cmd+=TQFile::encodeName(KProcess::quote(destC)); + cmd+=TQFile::encodeName(TDEProcess::quote(destC)); cmd+=" && chmod 0644 "; cmd+=destC; @@ -1351,9 +1351,9 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite) if(!Misc::dExists(itsFolders[destFolder].location)) { cmd+="mkdir "; - cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location)); + cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location)); cmd+=" && chmod 0755 "; - cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location)); + cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location)); cmd+=" && "; } @@ -1363,9 +1363,9 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite) for(; fIt!=fEnd; ++fIt) { cmd+="cp -f "; - cmd+=TQFile::encodeName(KProcess::quote(fIt.key())); + cmd+=TQFile::encodeName(TDEProcess::quote(fIt.key())); cmd+=" "; - cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location+modifyName(fIt.data()))); + cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location+modifyName(fIt.data()))); int s=getSize(TQFile::encodeName(fIt.key())); if(s>0) size+=s; @@ -1540,7 +1540,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite) toSys=FOLDER_SYS==destFolder; TQCString userId, groupId, - destDir(TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location))); + destDir(TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location))); userId.setNum(toSys ? 0 : getuid()); groupId.setNum(toSys ? 0 : getgid()); @@ -1548,7 +1548,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite) for(; fIt!=fEnd; ++fIt) { TQCString cmd, - destFile(TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location+fIt.data()))); + destFile(TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location+fIt.data()))); if(toSys && !Misc::dExists(itsFolders[destFolder].location)) { @@ -1558,7 +1558,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite) } cmd+="mv -f "; - cmd+=TQFile::encodeName(KProcess::quote(fIt.key())); + cmd+=TQFile::encodeName(TDEProcess::quote(fIt.key())); cmd+=" "; cmd+=destFile; cmd+=" && chmod -f 0644 "; @@ -1631,7 +1631,7 @@ void CKioFonts::del(const KURL &url, bool) modifiedDirs.add(Misc::getDir(file)); cmd+=" "; - cmd+=TQFile::encodeName(KProcess::quote(file)); + cmd+=TQFile::encodeName(TDEProcess::quote(file)); KURL::List urls; @@ -1645,7 +1645,7 @@ void CKioFonts::del(const KURL &url, bool) for(uIt=urls.begin(); uIt!=uEnd; ++uIt) { cmd+=" "; - cmd+=TQFile::encodeName(KProcess::quote((*uIt).path())); + cmd+=TQFile::encodeName(TDEProcess::quote((*uIt).path())); } } } @@ -1800,7 +1800,7 @@ void CKioFonts::createRootRefreshCmd(TQCString &cmd, const CDirList &dirs, bool cmd+=" && kfontinst "; cmd+=tmpCmd; cmd+=" "; - cmd+=TQFile::encodeName(KProcess::quote(*it)); + cmd+=TQFile::encodeName(TDEProcess::quote(*it)); } } } @@ -1809,7 +1809,7 @@ void CKioFonts::createRootRefreshCmd(TQCString &cmd, const CDirList &dirs, bool cmd+=" && kfontinst "; cmd+=itsNrsKfiParams; cmd+=" "; - cmd+=TQFile::encodeName(KProcess::quote(itsFolders[FOLDER_SYS].location)); + cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[FOLDER_SYS].location)); } } @@ -2437,7 +2437,7 @@ void CKioFonts::createAfm(const TQString &file, bool nrs, const TQString &passwd if(nrs) { TQCString cmd("pf2afm "); - cmd+=TQFile::encodeName(KProcess::quote(name)); + cmd+=TQFile::encodeName(TDEProcess::quote(name)); doRootCmd(cmd, passwd); } else diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp index 44d180fd2..3c2320588 100644 --- a/kcontrol/kfontinst/lib/FcEngine.cpp +++ b/kcontrol/kfontinst/lib/FcEngine.cpp @@ -579,7 +579,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b if(1==itsSizes.size()) title=i18n("%1 [1 pixel]", "%1 [%n pixels]", itsSizes[0]).arg(title); - painter.setFont(KGlobalSettings::generalFont()); + painter.setFont(TDEGlobalSettings::generalFont()); painter.setPen(Qt::black); y=painter.fontMetrics().height(); drawText(painter, x, y, w-offset, title); diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp index 1e779b514..fe6054cd5 100644 --- a/kcontrol/kfontinst/lib/Misc.cpp +++ b/kcontrol/kfontinst/lib/Misc.cpp @@ -133,7 +133,7 @@ bool createDir(const TQString &dir) bool doCmd(const TQString &cmd, const TQString &p1, const TQString &p2, const TQString &p3) { - KProcess proc; + TDEProcess proc; proc << cmd; @@ -144,7 +144,7 @@ bool doCmd(const TQString &cmd, const TQString &p1, const TQString &p2, const TQ if(!p3.isEmpty()) proc << p3; - proc.start(KProcess::Block); + proc.start(TDEProcess::Block); return proc.normalExit() && proc.exitStatus()==0; } diff --git a/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp b/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp index 363ebe064..aaf85e940 100644 --- a/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp +++ b/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp @@ -49,7 +49,7 @@ namespace KFI CFontThumbnail::CFontThumbnail() { - KGlobal::locale()->insertCatalogue(KFI_CATALOGUE); + TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE); } bool CFontThumbnail::create(const TQString &path, int width, int height, TQImage &img) diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp index 32f36f9e9..41d06984e 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp @@ -37,7 +37,7 @@ extern "C" { KDE_EXPORT void* init_libkfontviewpart() { - KGlobal::locale()->insertCatalogue("kfontinst"); + TDEGlobal::locale()->insertCatalogue("kfontinst"); return new KFI::CFontViewPartFactory; } } diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp index bbac01bc8..28dbd0f1f 100644 --- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp @@ -100,7 +100,7 @@ void CFontViewerAppMainWindow::fileOpen() CFontViewerApp::CFontViewerApp() { - KGlobal::locale()->insertCatalogue(KFI_CATALOGUE); + TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE); setMainWidget(new CFontViewerAppMainWindow()); } diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp index fec6dc693..f2b7cc1b4 100644 --- a/kcontrol/kicker/applettab_impl.cpp +++ b/kcontrol/kicker/applettab_impl.cpp @@ -120,7 +120,7 @@ void AppletTab::load( bool useDefaults ) list_group->setEnabled(trusted_rb->isChecked()); - TQStringList list = KGlobal::dirs()->findAllResources("applets", "*.desktop"); + TQStringList list = TDEGlobal::dirs()->findAllResources("applets", "*.desktop"); for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { TQFileInfo fi(*it); diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp index 24c640a1d..b2e6a79dc 100644 --- a/kcontrol/kicker/lookandfeeltab_impl.cpp +++ b/kcontrol/kicker/lookandfeeltab_impl.cpp @@ -319,7 +319,7 @@ void LookAndFeelTab::fillTileCombos() m_tilename.clear(); m_tilename << "" << "Colorize"; - TQStringList list = KGlobal::dirs()->findAllResources("tiles","*_tiny_up.png"); + TQStringList list = TDEGlobal::dirs()->findAllResources("tiles","*_tiny_up.png"); int minHeight = 0; for (TQStringList::Iterator it = list.begin(); it != list.end(); ++it) diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp index 8bf4646df..5fa5ceb06 100644 --- a/kcontrol/kicker/main.cpp +++ b/kcontrol/kicker/main.cpp @@ -100,7 +100,7 @@ void KickerConfig::init() } TQString configname = configName(); - TQString configpath = KGlobal::dirs()->findResource("config", configname); + TQString configpath = TDEGlobal::dirs()->findResource("config", configname); if (configpath.isEmpty()) configpath = locateLocal("config", configname); KSharedConfig::Ptr config = KSharedConfig::openConfig(configname); @@ -195,9 +195,9 @@ void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool re // set config group config.setGroup(group); - TQString df = KGlobal::dirs()->findResource("extensions", config.readEntry("DesktopFile")); + TQString df = TDEGlobal::dirs()->findResource("extensions", config.readEntry("DesktopFile")); TQString configname = config.readEntry("ConfigFile"); - TQString configpath = KGlobal::dirs()->findResource("config", configname); + TQString configpath = TDEGlobal::dirs()->findResource("config", configname); if (checkExists) { @@ -383,14 +383,14 @@ extern "C" KDE_EXPORT KCModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/) { - KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + "kicker/extensions"); return new PositionConfig(parent, "kcmkicker"); } KDE_EXPORT KCModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/) { - KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + "kicker/extensions"); return new HidingConfig(parent, "kcmkicker"); } @@ -403,9 +403,9 @@ extern "C" KDE_EXPORT KCModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/) { KImageIO::registerFormats(); - KGlobal::dirs()->addResourceType("tiles", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType("tiles", KStandardDirs::kde_default("data") + "kicker/tiles"); - KGlobal::dirs()->addResourceType("hb_pics", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType("hb_pics", KStandardDirs::kde_default("data") + "kcmkicker/pics"); return new LookAndFeelConfig(parent, "kcmkicker"); } diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index 8380efbdd..5b08627cb 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/kcontrol/kicker/menutab_impl.cpp @@ -84,7 +84,7 @@ MenuTab::MenuTab( TQWidget *parent, const char* name ) //connect(kcfg_ButtonFont, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(kmenuChanged())); connect(maxrecentdocs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(kmenuChanged())); - KIconLoader * ldr = KGlobal::iconLoader(); + KIconLoader * ldr = TDEGlobal::iconLoader(); TQPixmap kmenu_icon; m_kmenu_icon = KickerSettings::customKMenuIcon(); if (m_kmenu_icon.isNull() == true) { @@ -136,7 +136,7 @@ void MenuTab::load( bool useDefaults ) TQStringList ext_default; ext_default << "prefmenu.desktop" << "systemmenu.desktop"; TQStringList ext = c->readListEntry("Extensions", ext_default); - TQStringList dirs = KGlobal::dirs()->findDirs("data", "kicker/menuext"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "kicker/menuext"); kSubMenuItem* menuItem(0); for (TQStringList::ConstIterator dit=dirs.begin(); dit!=dirs.end(); ++dit) { @@ -312,7 +312,7 @@ void MenuTab::launchIconEditor() return; m_kmenu_icon = newIcon; - KIconLoader * ldr = KGlobal::iconLoader(); + KIconLoader * ldr = TDEGlobal::iconLoader(); TQPixmap kmenu_icon; kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall); btnCustomKMenuIcon->setPixmap(kmenu_icon); diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp index 5e90a9c54..8c02821b9 100644 --- a/kcontrol/kicker/positiontab_impl.cpp +++ b/kcontrol/kicker/positiontab_impl.cpp @@ -689,7 +689,7 @@ void PositionTab::showIdentify() TQLabel *screenLabel = new TQLabel(0,"Screen Identify", (WFlags)(WDestructiveClose | WStyle_Customize | WX11BypassWM) ); - TQFont identifyFont(KGlobalSettings::generalFont()); + TQFont identifyFont(TDEGlobalSettings::generalFont()); identifyFont.setPixelSize(100); screenLabel->setFont(identifyFont); diff --git a/kcontrol/kio/cache.cpp b/kcontrol/kio/cache.cpp index d98cba302..1537ade1d 100644 --- a/kcontrol/kio/cache.cpp +++ b/kcontrol/kio/cache.cpp @@ -117,9 +117,9 @@ void KCacheConfigDialog::configChanged() void KCacheConfigDialog::slotClearCache() { - KProcess process; + TDEProcess process; process << "kio_http_cache_cleaner" << "--clear-all"; - process.start(KProcess::DontCare); + process.start(TDEProcess::DontCare); // Cleaning up might take a while. Better detach. process.detach(); } diff --git a/kcontrol/kio/fakeuaprovider.cpp b/kcontrol/kio/fakeuaprovider.cpp index b3eec5340..e00c63862 100644 --- a/kcontrol/kio/fakeuaprovider.cpp +++ b/kcontrol/kio/fakeuaprovider.cpp @@ -94,7 +94,7 @@ void FakeUASProvider::parseDescription() tmp.replace( QFL("appSysRelease"), TQString(utsn.release) ); tmp.replace( QFL("appMachineType"), TQString(utsn.machine) ); - TQStringList languageList = KGlobal::locale()->languageList(); + TQStringList languageList = TDEGlobal::locale()->languageList(); if ( languageList.count() ) { TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp index 9a4f6eb2c..e825fd2a4 100644 --- a/kcontrol/kio/kcookiesmanagement.cpp +++ b/kcontrol/kio/kcookiesmanagement.cpp @@ -334,7 +334,7 @@ bool KCookiesManagement::cookieDetails(CookieProp *cookie) { TQDateTime expDate; expDate.setTime_t(tmp); - cookie->expireDate = KGlobal::locale()->formatDateTime(expDate); + cookie->expireDate = TDEGlobal::locale()->formatDateTime(expDate); } tmp = (*c).toUInt(); diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp index 90dfd9170..1b0a4fea8 100644 --- a/kcontrol/kio/smbrodlg.cpp +++ b/kcontrol/kio/smbrodlg.cpp @@ -63,7 +63,7 @@ SMBRoOptions::SMBRoOptions(TQWidget *parent) layout->addMultiCellWidget(m_showHiddenShares,4,4,0,1); m_encodingList = new KComboBox( false, this ); - TQStringList _strList = KGlobal::charsets()->availableEncodingNames(); + TQStringList _strList = TDEGlobal::charsets()->availableEncodingNames(); m_encodingList->insertStringList( _strList ); label = new TQLabel( m_encodingList, i18n( "MS Windows encoding:" ), this ); @@ -99,7 +99,7 @@ void SMBRoOptions::load() // m_workgroupLe->setText(cfg->readEntry("Workgroup")); // m_showHiddenShares->setChecked(cfg->readBoolEntry("ShowHiddenShares",false)); -// TQStringList _strList = KGlobal::charsets()->availableEncodingNames(); +// TQStringList _strList = TDEGlobal::charsets()->availableEncodingNames(); // TQString m_encoding = TQTextCodec::codecForLocale()->name(); // m_encodingList->setCurrentItem( _strList.findIndex( cfg->readEntry( "Encoding", m_encoding.lower() ) ) ); diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index 30914e96a..63438cbf2 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -163,7 +163,7 @@ void KCMKNotify::load( bool useDefaults ) m_notifyWidget->clear(); TQStringList fullpaths = - KGlobal::dirs()->findAllResources("data", "*/eventsrc", false, true ); + TDEGlobal::dirs()->findAllResources("data", "*/eventsrc", false, true ); TQStringList::ConstIterator it = fullpaths.begin(); for ( ; it != fullpaths.end(); ++it) diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index 307a04a6d..757385cd0 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -122,7 +122,7 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * * or left handed. The outer button functionality is actually swapped * */ - bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded); + bool leftHandedMouse = ( TDEGlobalSettings::mouseSettings().handed == TDEGlobalSettings::KMouseSettings::LeftHanded); m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media")); diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index 37ab6f71c..a01cdc06d 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -246,11 +246,11 @@ void KonqFontOptions::load( bool useDefaults ) if ( m_fSize == -1 ) m_fSize = TQFontInfo(stdFont).pointSize(); - normalTextColor = KGlobalSettings::textColor(); + normalTextColor = TDEGlobalSettings::textColor(); normalTextColor = g_pConfig->readColorEntry( "NormalTextColor", &normalTextColor ); m_pNormalText->setColor( normalTextColor ); - /* highlightedTextColor = KGlobalSettings::highlightedTextColor(); + /* highlightedTextColor = TDEGlobalSettings::highlightedTextColor(); highlightedTextColor = g_pConfig->readColorEntry( "HighlightedTextColor", &highlightedTextColor ); m_pHighlightedText->setColor( highlightedTextColor ); */ @@ -298,7 +298,7 @@ void KonqFontOptions::defaults() void KonqFontOptions::updateGUI() { if ( m_stdName.isEmpty() ) - m_stdName = KGlobalSettings::generalFont().family(); + m_stdName = TDEGlobalSettings::generalFont().family(); m_pStandard->setCurrentFont( m_stdName ); m_pSize->setValue( m_fSize ); diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index 53c16f15f..cfa367448 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -158,8 +158,8 @@ KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ ) void KPreviewOptions::load(bool useDefaults) { // *** load and apply to GUI *** - KGlobal::config()->setReadDefaults(useDefaults); - KConfigGroup group( KGlobal::config(), "PreviewSettings" ); + TDEGlobal::config()->setReadDefaults(useDefaults); + KConfigGroup group( TDEGlobal::config(), "PreviewSettings" ); TQPtrListIterator<TQCheckListItem> it( m_items ); for ( ; it.current() ; ++it ) { @@ -176,7 +176,7 @@ void KPreviewOptions::load(bool useDefaults) m_boostSize->setChecked( group.readBoolEntry( "BoostSize", false /*default*/ ) ); m_useFileThumbnails->setChecked( group.readBoolEntry( "UseFileThumbnails", true /*default*/ ) ); - KGlobal::config()->setReadDefaults(false); + TDEGlobal::config()->setReadDefaults(false); } void KPreviewOptions::load() @@ -191,7 +191,7 @@ void KPreviewOptions::defaults() void KPreviewOptions::save() { - KConfigGroup group( KGlobal::config(), "PreviewSettings" ); + KConfigGroup group( TDEGlobal::config(), "PreviewSettings" ); TQPtrListIterator<TQCheckListItem> it( m_items ); for ( ; it.current() ; ++it ) { TQString protocol( it.current()->text() ); diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index 589ad0e3a..ea3c5baa4 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -131,7 +131,7 @@ void DesktopPathConfig::load( bool useDefaults ) // Desktop Paths config.setReadDefaults( useDefaults ); config.setGroup("Paths"); - urAutostart->setURL( config.readPathEntry( "Autostart" , KGlobalSettings::autostartPath() )); + urAutostart->setURL( config.readPathEntry( "Autostart" , TDEGlobalSettings::autostartPath() )); KConfig xdguserconfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" ); @@ -148,7 +148,7 @@ void DesktopPathConfig::defaults() void DesktopPathConfig::save() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfig *xdgconfig = new KConfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" ); KConfigGroupSaver cgs( config, "Paths" ); @@ -156,17 +156,17 @@ void DesktopPathConfig::save() bool autostartMoved = false; KURL desktopURL; - desktopURL.setPath( KGlobalSettings::desktopPath() ); + desktopURL.setPath( TDEGlobalSettings::desktopPath() ); KURL newDesktopURL; newDesktopURL.setPath(urDesktop->url()); KURL autostartURL; - autostartURL.setPath( KGlobalSettings::autostartPath() ); + autostartURL.setPath( TDEGlobalSettings::autostartPath() ); KURL newAutostartURL; newAutostartURL.setPath(urAutostart->url()); KURL documentURL; - documentURL.setPath( KGlobalSettings::documentPath() ); + documentURL.setPath( TDEGlobalSettings::documentPath() ); KURL newDocumentURL; newDocumentURL.setPath(urDocument->url()); @@ -202,11 +202,11 @@ void DesktopPathConfig::save() if ( newAutostartURL.equals( futureAutostartURL, true ) ) autostartMoved = true; else - autostartMoved = moveDir( KURL( KGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") ); + autostartMoved = moveDir( KURL( TDEGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") ); } } - if ( moveDir( KURL( KGlobalSettings::desktopPath() ), KURL( urlDesktop ), i18n("Desktop") ) ) + if ( moveDir( KURL( TDEGlobalSettings::desktopPath() ), KURL( urlDesktop ), i18n("Desktop") ) ) { xdgconfig->writePathEntry( "XDG_DESKTOP_DIR", '"'+ urlDesktop + '"', true, false ); pathChanged = true; @@ -216,7 +216,7 @@ void DesktopPathConfig::save() if ( !newAutostartURL.equals( autostartURL, true ) ) { if (!autostartMoved) - autostartMoved = moveDir( KURL( KGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") ); + autostartMoved = moveDir( KURL( TDEGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") ); if (autostartMoved) { config->writePathEntry( "Autostart", urAutostart->url(), true, true ); diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index 1a20fd27b..fa22ab533 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -212,7 +212,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, TQString group, TQWidget m_pEncoding = new TQComboBox( false, this ); label->setBuddy( m_pEncoding ); - encodings = KGlobal::charsets()->availableEncodingNames(); + encodings = TDEGlobal::charsets()->availableEncodingNames(); encodings.prepend(i18n("Use Language Encoding")); m_pEncoding->insertStringList( encodings ); lay->addMultiCellWidget(m_pEncoding,r, r, M, W); @@ -337,8 +337,8 @@ void KAppearanceOptions::load( bool useDefaults ) fSize = fMinSize; defaultFonts = TQStringList(); - defaultFonts.append( READ_ENTRY( "StandardFont", KGlobalSettings::generalFont().family() ) ); - defaultFonts.append( READ_ENTRY( "FixedFont", KGlobalSettings::fixedFont().family() ) ); + defaultFonts.append( READ_ENTRY( "StandardFont", TDEGlobalSettings::generalFont().family() ) ); + defaultFonts.append( READ_ENTRY( "FixedFont", TDEGlobalSettings::fixedFont().family() ) ); defaultFonts.append( READ_ENTRY( "SerifFont", HTML_DEFAULT_VIEW_SERIF_FONT ) ); defaultFonts.append( READ_ENTRY( "SansSerifFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT ) ); defaultFonts.append( READ_ENTRY( "CursiveFont", HTML_DEFAULT_VIEW_CURSIVE_FONT ) ); diff --git a/kcontrol/konqhtml/khttpoptdlg.cpp b/kcontrol/konqhtml/khttpoptdlg.cpp index ca175e8e9..93fb20d70 100644 --- a/kcontrol/konqhtml/khttpoptdlg.cpp +++ b/kcontrol/konqhtml/khttpoptdlg.cpp @@ -49,7 +49,7 @@ void KHTTPOptions::load( bool useDefaults ) m_pConfig->setReadDefaults( useDefaults ); m_pConfig->setGroup( "Browser Settings/HTTP" ); - tmp = m_pConfig->readEntry( "AcceptLanguages",KGlobal::locale()->languageList().join(",")); + tmp = m_pConfig->readEntry( "AcceptLanguages",TDEGlobal::locale()->languageList().join(",")); le_languages->setText( tmp ); tmp = m_pConfig->readEntry( "AcceptCharsets",defaultCharsets); le_charsets->setText( tmp ); diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index 221b2f9ed..c78a63eec 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -292,7 +292,7 @@ void KPluginOptions::scan() } m_nspluginscan = new KProcIO; - TQString scanExe = KGlobal::dirs()->findExe("nspluginscan"); + TQString scanExe = TDEGlobal::dirs()->findExe("nspluginscan"); if (!scanExe) { kdDebug() << "can't find nspluginviewer" << endl; delete m_nspluginscan; @@ -314,7 +314,7 @@ void KPluginOptions::scan() kdDebug() << "Running nspluginscan" << endl; connect(m_nspluginscan, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(progress(KProcIO*))); - connect(m_nspluginscan, TQT_SIGNAL(processExited(KProcess *)), + connect(m_nspluginscan, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(scanDone())); connect(m_progress, TQT_SIGNAL(cancelled()), this, TQT_SLOT(scanDone())); diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp index e870aff33..f712c8c0d 100644 --- a/kcontrol/konsole/schemaeditor.cpp +++ b/kcontrol/konsole/schemaeditor.cpp @@ -93,7 +93,7 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name) transparencyCheck->setChecked(false); - KGlobal::locale()->insertCatalogue("konsole"); // For schema translations + TDEGlobal::locale()->insertCatalogue("konsole"); // For schema translations connect(imageBrowse, TQT_SIGNAL(clicked()), this, TQT_SLOT(imageSelect())); connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveCurrent())); connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCurrent())); @@ -228,7 +228,7 @@ void SchemaEditor::show() void SchemaEditor::loadAllSchema(TQString currentFile) { - TQStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.schema"); + TQStringList list = TDEGlobal::dirs()->findAllResources("data", "konsole/*.schema"); TQStringList::ConstIterator it; disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int))); schemaList->clear(); @@ -263,7 +263,7 @@ void SchemaEditor::imageSelect() start = backgndLine->text(); if (start.isEmpty()) { - TQStringList list=KGlobal::dirs()->resourceDirs("wallpaper"); + TQStringList list=TDEGlobal::dirs()->resourceDirs("wallpaper"); if(list.count()>0) start= list.last(); } @@ -361,7 +361,7 @@ void SchemaEditor::saveCurrent() } if (fullpath[0] != '/') - fullpath = KGlobal::dirs()->saveLocation("data", "konsole/") + fullpath; + fullpath = TDEGlobal::dirs()->saveLocation("data", "konsole/") + fullpath; TQFile f(fullpath); if (f.open(IO_WriteOnly)) { diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp index e93084af1..c9a767cac 100644 --- a/kcontrol/konsole/sessioneditor.cpp +++ b/kcontrol/konsole/sessioneditor.cpp @@ -56,8 +56,8 @@ SessionEditor::SessionEditor(TQWidget * parent, const char *name) oldSession=-1; loaded=false; - KGlobal::locale()->insertCatalogue("konsole"); // For schema and keytab translations - KGlobal::iconLoader()->addAppDir( "konsole" ); + TDEGlobal::locale()->insertCatalogue("konsole"); // For schema and keytab translations + TDEGlobal::iconLoader()->addAppDir( "konsole" ); directoryLine->setMode(KFile::Directory); connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int))); @@ -97,7 +97,7 @@ void SessionEditor::show() void SessionEditor::loadAllKeytab() { - TQStringList lst = KGlobal::dirs()->findAllResources("data", "konsole/*.keytab"); + TQStringList lst = TDEGlobal::dirs()->findAllResources("data", "konsole/*.keytab"); keytabCombo->clear(); keytabFilename.clear(); @@ -159,7 +159,7 @@ TQString SessionEditor::readKeymapTitle(const TQString & file) void SessionEditor::loadAllSession(TQString currentFile) { - TQStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.desktop", false, true); + TQStringList list = TDEGlobal::dirs()->findAllResources("data", "konsole/*.desktop", false, true); sessionList->clear(); TQListBoxItem* currentItem = 0; @@ -296,7 +296,7 @@ void SessionEditor::saveCurrent() exec = exec.mid( 7, exec.length() - 8 ); exec = KRun::binaryName( exec, false ); exec = KShell::tildeExpand( exec ); - TQString pexec = KGlobal::dirs()->findExe( exec ); + TQString pexec = TDEGlobal::dirs()->findExe( exec ); if ( pexec.isEmpty() ) { @@ -326,7 +326,7 @@ void SessionEditor::saveCurrent() } if (fullpath[0] != '/') - fullpath = KGlobal::dirs()->saveLocation("data", "konsole/") + fullpath; + fullpath = TDEGlobal::dirs()->saveLocation("data", "konsole/") + fullpath; KSimpleConfig* co = new KSimpleConfig(fullpath); co->setDesktopGroup(); diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index af817b4f5..1f8dfcc7d 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -210,7 +210,7 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings ) kdeAdded.clear(); //Merge in KDE ones.. - plugins = KGlobal::dirs()->resourceDirs( "qtplugins" ); + plugins = TDEGlobal::dirs()->resourceDirs( "qtplugins" ); for (TQStringList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) { @@ -257,7 +257,7 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings ) settings.writeEntry("/qt/style", style); /* export font settings */ - settings.writeEntry("/qt/font", KGlobalSettings::generalFont().toString()); + settings.writeEntry("/qt/font", TDEGlobalSettings::generalFont().toString()); /* ##### looks like kcmfonts skips this, so we don't do this here */ /*bool usexft = kglobals.readBoolEntry("AntiAliasing", false); @@ -444,9 +444,9 @@ void runRdb( uint flags ) // Export colors to non-(KDE/Qt) apps (e.g. Motif, GTK+ apps) if (exportColors) { - KGlobal::dirs()->addResourceType("appdefaults", KStandardDirs::kde_default("data") + "kdisplay/app-defaults/"); + TDEGlobal::dirs()->addResourceType("appdefaults", KStandardDirs::kde_default("data") + "kdisplay/app-defaults/"); TQColorGroup cg = newPal.active(); - KGlobal::locale()->insertCatalogue("krdb"); + TDEGlobal::locale()->insertCatalogue("krdb"); createGtkrc( true, cg, 1 ); createGtkrc( true, cg, 2 ); @@ -454,23 +454,23 @@ void runRdb( uint flags ) TQColor backCol = cg.background(); addColorDef(preproc, "FOREGROUND" , cg.foreground()); addColorDef(preproc, "BACKGROUND" , backCol); - addColorDef(preproc, "HIGHLIGHT" , backCol.light(100+(2*KGlobalSettings::contrast()+4)*16/1)); - addColorDef(preproc, "LOWLIGHT" , backCol.dark(100+(2*KGlobalSettings::contrast()+4)*10)); + addColorDef(preproc, "HIGHLIGHT" , backCol.light(100+(2*TDEGlobalSettings::contrast()+4)*16/1)); + addColorDef(preproc, "LOWLIGHT" , backCol.dark(100+(2*TDEGlobalSettings::contrast()+4)*10)); addColorDef(preproc, "SELECT_BACKGROUND" , cg.highlight()); addColorDef(preproc, "SELECT_FOREGROUND" , cg.highlightedText()); addColorDef(preproc, "WINDOW_BACKGROUND" , cg.base()); addColorDef(preproc, "WINDOW_FOREGROUND" , cg.foreground()); - addColorDef(preproc, "INACTIVE_BACKGROUND", KGlobalSettings::inactiveTitleColor()); - addColorDef(preproc, "INACTIVE_FOREGROUND", KGlobalSettings::inactiveTitleColor()); - addColorDef(preproc, "ACTIVE_BACKGROUND" , KGlobalSettings::activeTitleColor()); - addColorDef(preproc, "ACTIVE_FOREGROUND" , KGlobalSettings::activeTitleColor()); + addColorDef(preproc, "INACTIVE_BACKGROUND", TDEGlobalSettings::inactiveTitleColor()); + addColorDef(preproc, "INACTIVE_FOREGROUND", TDEGlobalSettings::inactiveTitleColor()); + addColorDef(preproc, "ACTIVE_BACKGROUND" , TDEGlobalSettings::activeTitleColor()); + addColorDef(preproc, "ACTIVE_FOREGROUND" , TDEGlobalSettings::activeTitleColor()); //--------------------------------------------------------------- tmp.writeBlock( preproc.latin1(), preproc.length() ); TQStringList list; - TQStringList adPaths = KGlobal::dirs()->findDirs("appdefaults", ""); + TQStringList adPaths = TDEGlobal::dirs()->findDirs("appdefaults", ""); for (TQStringList::ConstIterator it = adPaths.begin(); it != adPaths.end(); ++it) { TQDir dSys( *it ); @@ -556,13 +556,13 @@ void runRdb( uint flags ) tmpFile.close(); - KProcess proc; + TDEProcess proc; #ifndef NDEBUG proc << "xrdb" << "-merge" << "-nocpp" << tmpFile.name(); #else proc << "xrdb" << "-quiet" << "-merge" << "-nocpp" << tmpFile.name(); #endif - proc.start( KProcess::Block, KProcess::Stdin ); + proc.start( TDEProcess::Block, TDEProcess::Stdin ); tmpFile.unlink(); diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index 8cd96a01b..aebf467a0 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/kcontrol/kthememanager/ktheme.cpp @@ -54,7 +54,7 @@ KTheme::KTheme( TQWidget *parent, const TQString & xmlFile ) //kdDebug() << m_dom.toString( 2 ) << endl; setName( TQFileInfo( file ).baseName() ); - m_kgd = KGlobal::dirs(); + m_kgd = TDEGlobal::dirs(); } KTheme::KTheme( TQWidget *parent, bool create ) @@ -72,7 +72,7 @@ KTheme::KTheme( TQWidget *parent, bool create ) m_root.appendChild( m_general ); } - m_kgd = KGlobal::dirs(); + m_kgd = TDEGlobal::dirs(); } KTheme::~KTheme() @@ -125,7 +125,7 @@ TQString KTheme::createYourself( bool pack ) // 1. General stuff set by methods setBlah() // 2. Background theme - KConfig * globalConf = KGlobal::config(); + KConfig * globalConf = TDEGlobal::config(); KConfig twinConf( "twinrc", true ); twinConf.setGroup( "Desktops" ); @@ -448,7 +448,7 @@ void KTheme::apply() TQDomElement iconElem = m_dom.elementsByTagName( "icons" ).item( 0 ).toElement(); if ( !iconElem.isNull() ) { - KConfig * iconConf = KGlobal::config(); + KConfig * iconConf = TDEGlobal::config(); iconConf->setGroup( "Icons" ); iconConf->writeEntry( "Theme", iconElem.attribute( "name", "crystalsvg" ), true, true ); @@ -526,7 +526,7 @@ void KTheme::apply() if ( !colorsElem.isNull() ) { TQDomNodeList colorList = colorsElem.childNodes(); - KConfig * colorConf = KGlobal::config(); + KConfig * colorConf = TDEGlobal::config(); TQString sCurrentScheme = locateLocal("data", "kdisplay/color-schemes/thememgr.kcsrc"); KSimpleConfig *colorScheme = new KSimpleConfig( sCurrentScheme ); @@ -643,7 +643,7 @@ void KTheme::apply() if ( !widgetsElem.isNull() ) { - KConfig * widgetConf = KGlobal::config(); + KConfig * widgetConf = TDEGlobal::config(); widgetConf->setGroup( "General" ); widgetConf->writeEntry( "widgetStyle", widgetsElem.attribute( "name" ), true, true ); widgetConf->sync(); @@ -654,7 +654,7 @@ void KTheme::apply() TQDomElement fontsElem = m_dom.elementsByTagName( "fonts" ).item( 0 ).toElement(); if ( !fontsElem.isNull() ) { - KConfig * fontsConf = KGlobal::config(); + KConfig * fontsConf = TDEGlobal::config(); KConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" ); kde1xConf->setGroup( "General" ); @@ -688,7 +688,7 @@ void KTheme::apply() bool KTheme::remove( const TQString & name ) { kdDebug() << "Going to remove theme: " << name << endl; - return KIO::NetAccess::del( KGlobal::dirs()->saveLocation( "themes", name + "/" ), 0L ); + return KIO::NetAccess::del( TDEGlobal::dirs()->saveLocation( "themes", name + "/" ), 0L ); } void KTheme::setProperty( const TQString & name, const TQString & value, TQDomElement parent ) diff --git a/kcontrol/kthememanager/ktheme.h b/kcontrol/kthememanager/ktheme.h index 6ba23f535..fd659d3c7 100644 --- a/kcontrol/kthememanager/ktheme.h +++ b/kcontrol/kthememanager/ktheme.h @@ -200,7 +200,7 @@ private: bool copyFile( const TQString & from, const TQString & to ); /** - * Wrapper around KGlobal::dirs()->findResource() + * Wrapper around TDEGlobal::dirs()->findResource() * @param section Section to work on (desktop, sounds, panel etc) * @param path The file to find */ diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index 4a3f21644..5489aedbf 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -106,7 +106,7 @@ kthememanager::~kthememanager() void kthememanager::init() { - KGlobal::dirs()->addResourceType( "themes", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType( "themes", KStandardDirs::kde_default("data") + "kthememanager/themes/" ); } @@ -115,7 +115,7 @@ void kthememanager::updateButton() TQListViewItem * cur = dlg->lvThemes->currentItem(); bool enable = (cur != 0); if (enable) { - enable = TQFile(KGlobal::dirs()->saveLocation( "themes", cur->text( 0 ) + "/"+ cur->text( 0 )+ ".xml" ,false)).exists() ; + enable = TQFile(TDEGlobal::dirs()->saveLocation( "themes", cur->text( 0 ) + "/"+ cur->text( 0 )+ ".xml" ,false)).exists() ; } dlg->btnRemove->setEnabled(enable); } @@ -160,7 +160,7 @@ void kthememanager::save() { TQString themeName = cur->text( 0 ); - m_theme = new KTheme( this, KGlobal::dirs()->findResource( "themes", themeName + "/" + themeName + ".xml") ); + m_theme = new KTheme( this, TDEGlobal::dirs()->findResource( "themes", themeName + "/" + themeName + ".xml") ); m_theme->apply(); // Save the current theme name @@ -180,7 +180,7 @@ void kthememanager::listThemes() dlg->lvThemes->clear(); dlg->lbPreview->setPixmap( TQPixmap() ); - TQStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ ); + TQStringList themes = TDEGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ ); TQStringList::const_iterator it; @@ -197,7 +197,7 @@ void kthememanager::listThemes() float kthememanager::getThemeVersion( const TQString & themeName ) { - TQStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ ); + TQStringList themes = TDEGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ ); TQStringList::const_iterator it; @@ -325,7 +325,7 @@ void kthememanager::slotThemeChanged( TQListViewItem * item ) TQString themeName = item->text(0); kdDebug() << "Activated theme: " << themeName << endl; - TQString themeDir = KGlobal::dirs()->findResourceDir( "themes", themeName + "/" + themeName + ".xml") + themeName + "/"; + TQString themeDir = TDEGlobal::dirs()->findResourceDir( "themes", themeName + "/" + themeName + ".xml") + themeName + "/"; TQString pixFile = themeDir + themeName + ".preview.png"; @@ -392,7 +392,7 @@ void kthememanager::queryLNFModules() dlg->lvDetails->sort();*/ // For now use a static list - KIconLoader * il = KGlobal::iconLoader(); + KIconLoader * il = TDEGlobal::iconLoader(); dlg->btnBackground->setIconSet( il->loadIconSet( "background", KIcon::Desktop, 32 ) ); dlg->btnColors->setIconSet( il->loadIconSet( "colorscm", KIcon::Desktop, 32 ) ); dlg->btnStyle->setIconSet( il->loadIconSet( "style", KIcon::Desktop, 32 ) ); @@ -417,7 +417,7 @@ extern "C" { KDE_EXPORT KCModule *create_kthememanager(TQWidget *parent, const char *) { - KGlobal::locale()->insertCatalogue( "kthememanager" ); + TDEGlobal::locale()->insertCatalogue( "kthememanager" ); return new kthememanager( parent, "kthememanager" ); } } diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index f74fa71bc..40bbf1ab7 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -88,7 +88,7 @@ KLocaleConfig::KLocaleConfig(KLocale *locale, // #### HPB: This should be implemented for KDE 3 // new TQLabel(this, I18N_NOOP("Encoding:")); //TQComboBox * cb = new TQComboBox( this ); - //cb->insertStringList( KGlobal::charsets()->descriptiveEncodingNames() ); + //cb->insertStringList( TDEGlobal::charsets()->descriptiveEncodingNames() ); lay->addMultiCellWidget(m_labCountry, 0, 0, 0, 1); lay->addWidget(m_comboCountry, 0, 2); @@ -122,41 +122,41 @@ KLocaleConfig::KLocaleConfig(KLocale *locale, void KLocaleConfig::slotInstallLanguage() { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "tdesu"; *proc << "qt-language-selector --mode install"; - TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotLanguageSelectorExited(KProcess *))); + TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *))); setEnabled(false); proc->start(); } void KLocaleConfig::slotUninstallLanguage() { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "tdesu"; *proc << "qt-language-selector --mode uninstall"; - TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotLanguageSelectorExited(KProcess *))); + TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *))); setEnabled(false); proc->start(); } void KLocaleConfig::slotSelectLanguage() { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "tdesu"; *proc << "qt-language-selector --mode select"; - TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotLanguageSelectorExited(KProcess *))); + TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *))); setEnabled(false); proc->start(); } -void KLocaleConfig::slotLanguageSelectorExited(KProcess *) +void KLocaleConfig::slotLanguageSelectorExited(TDEProcess *) { //reload here loadLanguageList(); @@ -256,8 +256,8 @@ void KLocaleConfig::slotLanguageDown() void KLocaleConfig::loadLanguageList() { // temperary use of our locale as the global locale - KLocale *lsave = KGlobal::_locale; - KGlobal::_locale = m_locale; + KLocale *lsave = TDEGlobal::_locale; + TDEGlobal::_locale = m_locale; // clear the list m_addLanguage->clear(); @@ -277,7 +277,7 @@ void KLocaleConfig::loadLanguageList() } // add all languages to the list - TQStringList alllang = KGlobal::dirs()->findAllResources("locale", + TQStringList alllang = TDEGlobal::dirs()->findAllResources("locale", TQString::fromLatin1("*/entry.desktop"), false, true); TQStringList langlist = prilang; @@ -313,21 +313,21 @@ void KLocaleConfig::loadLanguageList() } // restore the old global locale - KGlobal::_locale = lsave; + TDEGlobal::_locale = lsave; } void KLocaleConfig::loadCountryList() { // temperary use of our locale as the global locale - KLocale *lsave = KGlobal::_locale; - KGlobal::_locale = m_locale; + KLocale *lsave = TDEGlobal::_locale; + TDEGlobal::_locale = m_locale; TQString sub = TQString::fromLatin1("l10n/"); // clear the list m_comboCountry->clear(); - TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", + TQStringList regionlist = TDEGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop"), false, true ); @@ -356,12 +356,12 @@ void KLocaleConfig::loadCountryList() .arg(tag) ) ); TQIconSet icon; if ( !map.isNull() ) - icon = KGlobal::iconLoader()->loadIconSet(map, KIcon::Small); + icon = TDEGlobal::iconLoader()->loadIconSet(map, KIcon::Small); m_comboCountry->insertSubmenu( icon, name, tag, sub, -2 ); } // add all languages to the list - TQStringList countrylist = KGlobal::dirs()->findAllResources + TQStringList countrylist = TDEGlobal::dirs()->findAllResources ("locale", sub + TQString::fromLatin1("*/entry.desktop"), false, true); for ( TQStringList::ConstIterator it = countrylist.begin(); @@ -383,20 +383,20 @@ void KLocaleConfig::loadCountryList() TQString flag( locate( "locale", TQString::fromLatin1( "l10n/%1/flag.png" ) .arg(tag) ) ); - TQIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) ); + TQIconSet icon( TDEGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) ); m_comboCountry->insertItem( icon, name, tag, submenu, menu_index ); } // restore the old global locale - KGlobal::_locale = lsave; + TDEGlobal::_locale = lsave; } void KLocaleConfig::readLocale(const TQString &path, TQString &name, const TQString &sub) const { // temperary use of our locale as the global locale - KLocale *lsave = KGlobal::_locale; - KGlobal::_locale = m_locale; + KLocale *lsave = TDEGlobal::_locale; + TDEGlobal::_locale = m_locale; // read the name TQString filepath = TQString::fromLatin1("%1%2/entry.desktop") @@ -408,12 +408,12 @@ void KLocaleConfig::readLocale(const TQString &path, TQString &name, name = entry.readEntry("Name"); // restore the old global locale - KGlobal::_locale = lsave; + TDEGlobal::_locale = lsave; } void KLocaleConfig::save() { - KConfigBase *config = KGlobal::config(); + KConfigBase *config = TDEGlobal::config(); config->setGroup("Locale"); diff --git a/kcontrol/locale/kcmlocale.h b/kcontrol/locale/kcmlocale.h index 511d9e9fd..3a2992826 100644 --- a/kcontrol/locale/kcmlocale.h +++ b/kcontrol/locale/kcmlocale.h @@ -79,7 +79,7 @@ private slots: void slotInstallLanguage(); void slotUninstallLanguage(); void slotSelectLanguage(); - void slotLanguageSelectorExited(KProcess *); + void slotLanguageSelectorExited(TDEProcess *); private: TQStringList languageList() const; diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp index 1530fda69..dc4cb2c2e 100644 --- a/kcontrol/locale/localemon.cpp +++ b/kcontrol/locale/localemon.cpp @@ -127,7 +127,7 @@ KLocaleConfigMoney::~KLocaleConfigMoney() void KLocaleConfigMoney::save() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp index f6149d6d1..a940a7ef3 100644 --- a/kcontrol/locale/localenum.cpp +++ b/kcontrol/locale/localenum.cpp @@ -82,10 +82,10 @@ KLocaleConfigNumber::~KLocaleConfigNumber() void KLocaleConfigNumber::save() { // temperary use of our locale as the global locale - KLocale *lsave = KGlobal::_locale; - KGlobal::_locale = m_locale; + KLocale *lsave = TDEGlobal::_locale; + TDEGlobal::_locale = m_locale; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", @@ -122,7 +122,7 @@ void KLocaleConfigNumber::save() config->writeEntry("NegativeSign", m_locale->negativeSign(), true, true); // restore the old global locale - KGlobal::_locale = lsave; + TDEGlobal::_locale = lsave; } void KLocaleConfigNumber::slotLocaleChanged() diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp index 1cf6b949b..cf92ea1fb 100644 --- a/kcontrol/locale/localeother.cpp +++ b/kcontrol/locale/localeother.cpp @@ -76,7 +76,7 @@ KLocaleConfigOther::~KLocaleConfigOther() void KLocaleConfigOther::save() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp index 4ed4c263c..df51ae8a4 100644 --- a/kcontrol/locale/localetime.cpp +++ b/kcontrol/locale/localetime.cpp @@ -246,10 +246,10 @@ KLocaleConfigTime::~KLocaleConfigTime() void KLocaleConfigTime::save() { // temperary use of our locale as the global locale - KLocale *lsave = KGlobal::_locale; - KGlobal::_locale = m_locale; + KLocale *lsave = TDEGlobal::_locale; + TDEGlobal::_locale = m_locale; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", @@ -299,7 +299,7 @@ void KLocaleConfigTime::save() config->sync(); // restore the old global locale - KGlobal::_locale = lsave; + TDEGlobal::_locale = lsave; } void KLocaleConfigTime::showEvent( TQShowEvent *e ) diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index f561ecaf6..5df0f5eb7 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -172,8 +172,8 @@ void KLocaleApplication::load( bool useDefaults ) void KLocaleApplication::save() { // temperary use of our locale as the global locale - KLocale *lsave = KGlobal::_locale; - KGlobal::_locale = m_locale; + KLocale *lsave = TDEGlobal::_locale; + TDEGlobal::_locale = m_locale; KMessageBox::information(this, m_locale->translate ("Changed language settings apply only to " "newly started applications.\nTo change the " @@ -182,9 +182,9 @@ void KLocaleApplication::save() m_locale->translate("Applying Language Settings"), TQString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms")); // restore the old global locale - KGlobal::_locale = lsave; + TDEGlobal::_locale = lsave; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver(config, "Locale"); // ##### this doesn't make sense diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index 257dc6e27..e8da79f48 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/kcontrol/privacy/kprivacymanager.cpp @@ -110,9 +110,9 @@ bool KPrivacyManager::clearFormCompletion() const bool KPrivacyManager::clearWebCache() const { - KProcess process; + TDEProcess process; process << "kio_http_cache_cleaner" << "--clear-all"; - return process.start(KProcess::DontCare); + return process.start(TDEProcess::DontCare); } bool KPrivacyManager::clearRecentDocuments() const @@ -143,7 +143,7 @@ bool KPrivacyManager::clearWebHistory() bool KPrivacyManager::clearFavIcons() { - TQDir favIconDir(KGlobal::dirs()->saveLocation( "cache", "favicons/" )); + TQDir favIconDir(TDEGlobal::dirs()->saveLocation( "cache", "favicons/" )); favIconDir.setFilter( TQDir::Files ); TQStringList entries = favIconDir.entryList(); diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp index bc25083a6..55b4246cb 100644 --- a/kcontrol/privacy/privacy.cpp +++ b/kcontrol/privacy/privacy.cpp @@ -311,7 +311,7 @@ extern "C" KDE_EXPORT KCModule *create_privacy(TQWidget *parent, const char * /*name*/) { - KGlobal::locale()->insertCatalogue("privacy"); + TDEGlobal::locale()->insertCatalogue("privacy"); return new Privacy(parent, "Privacy"); } } diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp index a284df69e..708587527 100644 --- a/kcontrol/randr/configdialog.cpp +++ b/kcontrol/randr/configdialog.cpp @@ -35,7 +35,7 @@ #include "configdialog.h" -ConfigDialog::ConfigDialog(KGlobalAccel *accel, +ConfigDialog::ConfigDialog(TDEGlobalAccel *accel, bool isApplet ) : KDialogBase( Tabbed, i18n("Configure"), Ok | Cancel | Help, diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h index 584237975..561732078 100644 --- a/kcontrol/randr/configdialog.h +++ b/kcontrol/randr/configdialog.h @@ -33,7 +33,7 @@ #include <klistview.h> #include <knuminput.h> -class KGlobalAccel; +class TDEGlobalAccel; class KKeyChooser; class KListView; class TQPushButton; @@ -45,7 +45,7 @@ class ConfigDialog : public KDialogBase Q_OBJECT public: - ConfigDialog(KGlobalAccel *accel, bool isApplet ); + ConfigDialog(TDEGlobalAccel *accel, bool isApplet ); ~ConfigDialog(); virtual void show(); diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp index 2cdcdb636..85a5e3f60 100644 --- a/kcontrol/randr/krandrtray.cpp +++ b/kcontrol/randr/krandrtray.cpp @@ -52,7 +52,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) : KSystemTray(parent, name) , m_popupUp(false) - , m_help(new KHelpMenu(this, KGlobal::instance()->aboutData(), false, actionCollection())) + , m_help(new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection())) { setPixmap(KSystemTray::loadSizedIcon("randr", width())); setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); @@ -61,8 +61,8 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) my_parent = parent; //printf("Reading configuration...\n\r"); - globalKeys = new KGlobalAccel(TQT_TQOBJECT(this)); - KGlobalAccel* keys = globalKeys; + globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this)); + TDEGlobalAccel* keys = globalKeys; #include "krandrbindings.cpp" // the keys need to be read from kdeglobals, not kickerrc globalKeys->readSettings(); @@ -90,7 +90,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) applyIccConfiguration(cur_profile, NULL); } - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); } diff --git a/kcontrol/randr/krandrtray.h b/kcontrol/randr/krandrtray.h index eb2025ab0..8a910f373 100644 --- a/kcontrol/randr/krandrtray.h +++ b/kcontrol/randr/krandrtray.h @@ -36,7 +36,7 @@ class KRandRSystemTray : public KSystemTray, public KRandrSimpleAPI public: KRandRSystemTray(TQWidget* parent = 0, const char *name = 0); - KGlobalAccel *globalKeys; + TDEGlobalAccel *globalKeys; virtual void contextMenuAboutToShow(KPopupMenu* menu); diff --git a/kcontrol/randr/main.cpp b/kcontrol/randr/main.cpp index 18df71fbc..1e8edc83e 100644 --- a/kcontrol/randr/main.cpp +++ b/kcontrol/randr/main.cpp @@ -40,7 +40,7 @@ int main(int argc, char **argv) aboutData.addAuthor("Hamish Rodda",I18N_NOOP("Original developer and maintainer"), "[email protected]"); aboutData.addCredit("Lubos Lunak",I18N_NOOP("Many fixes"), "[email protected]"); aboutData.setProductName("krandr/krandrtray"); - KGlobal::locale()->setMainCatalogue("krandr"); + TDEGlobal::locale()->setMainCatalogue("krandr"); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/kcontrol/samba/AUTHORS b/kcontrol/samba/AUTHORS index 0bebeaa06..08f2ff61b 100644 --- a/kcontrol/samba/AUTHORS +++ b/kcontrol/samba/AUTHORS @@ -6,7 +6,7 @@ Conversion to kcontrol applet: Matthias Hoelzer <[email protected]> -Use of KProcess instead of popen, and more error checking +Use of TDEProcess instead of popen, and more error checking David Faure <[email protected]> diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp index 431e0f51a..1e3fa2175 100644 --- a/kcontrol/samba/kcmsambastatistics.cpp +++ b/kcontrol/samba/kcmsambastatistics.cpp @@ -126,8 +126,8 @@ void StatisticsView::setListInfo(TQListView *list, int nrOfFiles, int nrOfConnec dataList=list; filesCount=nrOfFiles; connectionsCount=nrOfConnections; - connectionsL->setText(i18n("Connections: %1").arg(KGlobal::locale()->formatNumber(connectionsCount, 0))); - filesL->setText(i18n("File accesses: %1").arg(KGlobal::locale()->formatNumber(filesCount, 0))); + connectionsL->setText(i18n("Connections: %1").arg(TDEGlobal::locale()->formatNumber(connectionsCount, 0))); + filesL->setText(i18n("File accesses: %1").arg(TDEGlobal::locale()->formatNumber(filesCount, 0))); clearStatistics(); } diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp index bf775deab..effd67312 100644 --- a/kcontrol/samba/ksmbstatus.cpp +++ b/kcontrol/samba/ksmbstatus.cpp @@ -130,7 +130,7 @@ void NetMon::processSambaLine(char *bufline, int) // called when we get some data from smbstatus // can be called for any size of buffer (one line, several lines, // half of one ...) -void NetMon::slotReceivedData(KProcess *, char *buffer, int ) +void NetMon::slotReceivedData(TDEProcess *, char *buffer, int ) { //kdDebug()<<"received stuff"<<endl; char s[250],*start,*end; @@ -161,7 +161,7 @@ void NetMon::slotReceivedData(KProcess *, char *buffer, int ) void NetMon::update() { - KProcess * process = new KProcess(); + TDEProcess * process = new TDEProcess(); memset(&lo, 0, sizeof(lo)); list->clear(); @@ -175,10 +175,10 @@ void NetMon::update() nrpid=0; process->setEnvironment("PATH", path); connect(process, - TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - TQT_SLOT(slotReceivedData(KProcess *, char *, int))); + TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQT_SLOT(slotReceivedData(TDEProcess *, char *, int))); *process << "smbstatus"; - if (!process->start(KProcess::Block,KProcess::Stdout)) + if (!process->start(TDEProcess::Block,TDEProcess::Stdout)) version->setText(i18n("Error: Unable to run smbstatus")); else if (rownumber==0) // empty result version->setText(i18n("Error: Unable to open configuration file \"smb.conf\"")); @@ -197,16 +197,16 @@ void NetMon::update() readingpart=nfs; delete showmountProc; - showmountProc=new KProcess(); + showmountProc=new TDEProcess(); showmountProc->setEnvironment("PATH", path); *showmountProc<<"showmount"<<"-a"<<"localhost"; - connect(showmountProc,TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),TQT_SLOT(slotReceivedData(KProcess *, char *, int))); + connect(showmountProc,TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),TQT_SLOT(slotReceivedData(TDEProcess *, char *, int))); //without this timer showmount hangs up to 5 minutes //if the portmapper daemon isn't running TQTimer::singleShot(5000,this,TQT_SLOT(killShowmount())); //kdDebug()<<"starting kill timer with 5 seconds"<<endl; - connect(showmountProc,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(killShowmount())); - if (!showmountProc->start(KProcess::NotifyOnExit,KProcess::Stdout)) // run showmount + connect(showmountProc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(killShowmount())); + if (!showmountProc->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout)) // run showmount { delete showmountProc; showmountProc=0; diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h index a38eca897..e256de067 100644 --- a/kcontrol/samba/ksmbstatus.h +++ b/kcontrol/samba/ksmbstatus.h @@ -30,7 +30,7 @@ class TQListView; class TQListViewItem; -class KProcess; +class TDEProcess; class NetMon : public TQWidget { @@ -41,7 +41,7 @@ public: void loadSettings() {}; private: KConfig *configFile; - KProcess *showmountProc; + TDEProcess *showmountProc; TQListView *list; TQLabel *version; TQTimer *timer; @@ -59,7 +59,7 @@ private: private slots: void killShowmount(); void update(); - void slotReceivedData(KProcess *proc, char *buffer, int buflen); + void slotReceivedData(TDEProcess *proc, char *buffer, int buflen); }; #endif // main_included diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index 85d1aa628..c9f1e8f2b 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -82,8 +82,8 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mTesting = false; // Add non-TDE path - KGlobal::dirs()->addResourceType("scrsav", - KGlobal::dirs()->kde_default("apps") + + TDEGlobal::dirs()->addResourceType("scrsav", + TDEGlobal::dirs()->kde_default("apps") + "apps/ScreenSavers/"); setQuickHelp( i18n("<h1>Screen Saver</h1> This module allows you to enable and" @@ -107,19 +107,19 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis kdDebug() << "relPath=" << relPath << endl; } - KGlobal::dirs()->addResourceType("scrsav", - KGlobal::dirs()->kde_default("apps") + + TDEGlobal::dirs()->addResourceType("scrsav", + TDEGlobal::dirs()->kde_default("apps") + relPath); readSettings( false ); - mSetupProc = new KProcess; - connect(mSetupProc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotSetupDone(KProcess *))); + mSetupProc = new TDEProcess; + connect(mSetupProc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotSetupDone(TDEProcess *))); - mPreviewProc = new KProcess; - connect(mPreviewProc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotPreviewExited(KProcess *))); + mPreviewProc = new TDEProcess; + connect(mPreviewProc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotPreviewExited(TDEProcess *))); TQBoxLayout *topLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); @@ -465,7 +465,7 @@ void KScreenSaver::save() void KScreenSaver::findSavers() { if ( !mNumLoaded ) { - mSaverFileList = KGlobal::dirs()->findAllResources("scrsav", + mSaverFileList = TDEGlobal::dirs()->findAllResources("scrsav", "*.desktop", false, true); new TQListViewItem ( mSaverListView, i18n("Loading...") ); if ( mSaverFileList.isEmpty() ) @@ -562,7 +562,7 @@ void KScreenSaver::setMonitor() //--------------------------------------------------------------------------- // -void KScreenSaver::slotPreviewExited(KProcess *) +void KScreenSaver::slotPreviewExited(TDEProcess *) { // Ugly hack to prevent continual respawning of savers that crash if (mSelected == mPrevSelected) @@ -754,7 +754,7 @@ void KScreenSaver::slotTest() return; if (!mTestProc) { - mTestProc = new KProcess; + mTestProc = new TDEProcess; } mTestProc->clearArguments(); @@ -800,7 +800,7 @@ void KScreenSaver::slotTest() } mTesting = true; - mTestProc->start(KProcess::NotifyOnExit); + mTestProc->start(TDEProcess::NotifyOnExit); } } @@ -851,7 +851,7 @@ void KScreenSaver::slotLock( bool l ) //--------------------------------------------------------------------------- // -void KScreenSaver::slotSetupDone(KProcess *) +void KScreenSaver::slotSetupDone(TDEProcess *) { mPrevSelected = -1; // see ugly hack in slotPreviewExited() setMonitor(); diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h index 9dcf7f46e..afaa3450b 100644 --- a/kcontrol/screensaver/scrnsave.h +++ b/kcontrol/screensaver/scrnsave.h @@ -28,7 +28,7 @@ class TQListView; class TQListViewItem; class TQPushButton; class KIntNumInput; -class KProcess; +class TDEProcess; //=========================================================================== class KScreenSaver : public KCModule @@ -56,11 +56,11 @@ protected slots: void slotTimeoutChanged( int ); void slotLockTimeoutChanged( int ); void slotLock( bool ); - void slotSetupDone(KProcess*); + void slotSetupDone(TDEProcess*); // when selecting a new screensaver, the old preview will // be killed. -- This callback is responsible for restarting the // new preview - void slotPreviewExited(KProcess *); + void slotPreviewExited(TDEProcess *); void findSavers(); protected: @@ -74,9 +74,9 @@ protected: protected: TestWin *mTestWin; - KProcess *mTestProc; - KProcess *mSetupProc; - KProcess *mPreviewProc; + TDEProcess *mTestProc; + TDEProcess *mSetupProc; + TDEProcess *mPreviewProc; KSSMonitor *mMonitor; TQPushButton *mSetupBt; TQPushButton *mTestBt; diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index 274113bfb..3a2025589 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -75,7 +75,7 @@ extern "C" { KDE_EXPORT KCModule *create_style(TQWidget *parent, const char*) { - KGlobal::locale()->insertCatalogue("kcmstyle"); + TDEGlobal::locale()->insertCatalogue("kcmstyle"); return new KCMStyle(parent, "kcmstyle"); } @@ -96,7 +96,7 @@ extern "C" TQByteArray properties; TQDataStream d(properties, IO_WriteOnly); d.setVersion( 3 ); // Qt2 apps need this. - d << kapp->palette() << KGlobalSettings::generalFont(); + d << kapp->palette() << TDEGlobalSettings::generalFont(); Atom a = XInternAtom(tqt_xdisplay(), "_QT_DESKTOP_PROPERTIES", false); // do it for all root windows - multihead support @@ -127,7 +127,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) m_bStyleDirty= false; m_bToolbarsDirty = false; - KGlobal::dirs()->addResourceType("themes", + TDEGlobal::dirs()->addResourceType("themes", KStandardDirs::kde_default("data") + "kstyle/themes"); TDEAboutData *about = @@ -727,7 +727,7 @@ void KCMStyle::loadStyle( KConfig& config ) styleEntries.setAutoDelete(true); TQString strWidgetStyle; - TQStringList list = KGlobal::dirs()->findAllResources("themes", "*.themerc", true, true); + TQStringList list = TDEGlobal::dirs()->findAllResources("themes", "*.themerc", true, true); for (TQStringList::iterator it = list.begin(); it != list.end(); ++it) { KSimpleConfig config( *it, true ); diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp index 0350ab969..3027106cd 100644 --- a/kcontrol/style/keramik/keramikconf.cpp +++ b/kcontrol/style/keramik/keramikconf.cpp @@ -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); - KGlobal::locale()->insertCatalogue("kstyle_keramik_config"); + TDEGlobal::locale()->insertCatalogue("kstyle_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() { - KGlobal::locale()->removeCatalogue("kstyle_keramik_config"); + TDEGlobal::locale()->removeCatalogue("kstyle_keramik_config"); } diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp index 190f0517f..bad8270e0 100644 --- a/kcontrol/style/menupreview.cpp +++ b/kcontrol/style/menupreview.cpp @@ -82,7 +82,7 @@ void MenuPreview::createPixmaps() (x % 2) ? ((y % 2) ? c2 : c1 ) : // See the grid? ;-) ((y % 2) ? c1 : c2 ) ); - KIconLoader* icl = KGlobal::iconLoader(); + KIconLoader* icl = TDEGlobal::iconLoader(); TQPixmap pix = icl->loadIcon("go", KIcon::Desktop, KIcon::SizeLarge, KIcon::ActiveState); p.drawPixmap( (width()-2-pix.width())/2, (height()-2-pix.height())/2, pix ); } diff --git a/kcontrol/tdm/background.h b/kcontrol/tdm/background.h index 2e5182b16..d88629c35 100644 --- a/kcontrol/tdm/background.h +++ b/kcontrol/tdm/background.h @@ -16,7 +16,7 @@ class KSimpleConfig; class BGDialog; -class KGlobalBackgroundSettings; +class TDEGlobalBackgroundSettings; class TQCheckBox; class TQLabel; diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp index d3693768e..8348a617b 100644 --- a/kcontrol/tdm/main.cpp +++ b/kcontrol/tdm/main.cpp @@ -121,7 +121,7 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &) setlocale( LC_COLLATE, "C" ); - KGlobal::locale()->insertCatalogue("kcmbackground"); + TDEGlobal::locale()->insertCatalogue("kcmbackground"); TQStringList sl; TQMap<gid_t,TQStringList> tgmap; diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index d3629d861..bcd7517aa 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -288,7 +288,7 @@ void TDMAppearanceWidget::makeReadOnly() void TDMAppearanceWidget::loadLanguageList(KLanguageButton *combo) { - TQStringList langlist = KGlobal::dirs()->findAllResources("locale", + TQStringList langlist = TDEGlobal::dirs()->findAllResources("locale", TQString::fromLatin1("*/entry.desktop")); langlist.sort(); for ( TQStringList::ConstIterator it = langlist.begin(); @@ -308,7 +308,7 @@ void TDMAppearanceWidget::loadLanguageList(KLanguageButton *combo) void TDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo) { // XXX: Global + local schemes - TQStringList list = KGlobal::dirs()-> + TQStringList list = TDEGlobal::dirs()-> findAllResources("data", "kdisplay/color-schemes/*.kcsrc", false, true); for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { @@ -329,7 +329,7 @@ void TDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo) void TDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo) { // XXX: Global + local schemes - TQStringList list = KGlobal::dirs()-> + TQStringList list = TDEGlobal::dirs()-> findAllResources("data", "kstyle/themes/*.themerc", false, true); for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { @@ -429,7 +429,7 @@ void TDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e) // we gotta check if it is a non-local file and make a tmp copy at the hd. if(!url->isLocalFile()) { - pixurl.setPath(KGlobal::dirs()->resourceDirs("data").last() + + pixurl.setPath(TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/pics/" + url->fileName()); KIO::NetAccess::copy(*url, pixurl, parentWidget()); istmp = true; @@ -462,7 +462,7 @@ void TDMAppearanceWidget::save() config->writeEntry("LogoArea", noneRadio->isChecked() ? "None" : logoRadio->isChecked() ? "Logo" : "Clock" ); - config->writeEntry("LogoPixmap", KGlobal::iconLoader()->iconPath(logopath, KIcon::Desktop, true)); + config->writeEntry("LogoPixmap", TDEGlobal::iconLoader()->iconPath(logopath, KIcon::Desktop, true)); config->writeEntry("Compositor", compositorcombo->currentId()); diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp index f4b48b9a6..3be482a17 100644 --- a/kcontrol/tdm/tdm-users.cpp +++ b/kcontrol/tdm/tdm-users.cpp @@ -74,7 +74,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) // We assume that $kde_datadir/tdm exists, but better check for pics/ and pics/users, // and create them if necessary. config->setGroup( "X-*-Greeter" ); - m_userPixDir = config->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/'; + m_userPixDir = config->readEntry( "FaceDir", TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/'; m_notFirst = false; TQDir testDir( m_userPixDir ); if ( !testDir.exists() && !testDir.mkdir( testDir.absPath() ) && !geteuid() ) @@ -301,7 +301,7 @@ void TDMUsersWidget::changeUserPix(const TQString &pix) void TDMUsersWidget::slotUserButtonClicked() { KFileDialog dlg(m_notFirst ? TQString::null : - KGlobal::dirs()->resourceDirs("data").last() + "tdm/pics/users", + TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/pics/users", KImageIO::pattern( KImageIO::Reading ), this, 0, true); dlg.setOperationMode( KFileDialog::Opening ); diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp index 795b58492..c1443b221 100644 --- a/kcontrol/view1394/view1394.cpp +++ b/kcontrol/view1394/view1394.cpp @@ -325,7 +325,7 @@ extern "C" KDE_EXPORT KCModule *create_view1394(TQWidget *parent, const char *name) { - KGlobal::locale()->insertCatalogue("kcmview1394"); + TDEGlobal::locale()->insertCatalogue("kcmview1394"); return new View1394(parent, name); } } diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index c70330779..607cd8754 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -218,7 +218,7 @@ void KCMXinerama::windowIndicator(int dpy) { TQWidget *KCMXinerama::indicator(int dpy) { TQLabel *si = new TQLabel(TQString::number(dpy+1), 0, "Screen Indicator", (WFlags)WX11BypassWM ); - TQFont fnt = KGlobalSettings::generalFont(); + TQFont fnt = TDEGlobalSettings::generalFont(); fnt.setPixelSize(100); si->setFont(fnt); si->setFrameStyle(TQFrame::Panel); @@ -240,7 +240,7 @@ void KCMXinerama::clearIndicator() { extern "C" { KDE_EXPORT KCModule *create_xinerama(TQWidget *parent, const char *name) { - KGlobal::locale()->insertCatalogue("kcmxinerama"); + TDEGlobal::locale()->insertCatalogue("kcmxinerama"); return new KCMXinerama(parent, name); } |