diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /twin/kcmtwin/twindecoration | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'twin/kcmtwin/twindecoration')
| -rw-r--r-- | twin/kcmtwin/twindecoration/buttons.cpp | 2 | ||||
| -rw-r--r-- | twin/kcmtwin/twindecoration/preview.cpp | 4 | ||||
| -rw-r--r-- | twin/kcmtwin/twindecoration/twindecoration.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp index 3cf0ab78d..fc00dea9d 100644 --- a/twin/kcmtwin/twindecoration/buttons.cpp +++ b/twin/kcmtwin/twindecoration/buttons.cpp @@ -607,7 +607,7 @@ void ButtonDropSite::drawContents( TQPainter* p ) TQColor c1( 0x0A, 0x5F, 0x89 ); // KDE 2 titlebar default colour p->fillRect( r, c1 ); p->setPen( Qt::white ); - p->setFont( TQFont( KGlobalSettings::generalFont().family(), 12, TQFont::Bold) ); + p->setFont( TQFont( TDEGlobalSettings::generalFont().family(), 12, TQFont::Bold) ); p->drawText( r, AlignLeft | AlignVCenter, i18n("KDE") ); offset = geometry().width() - 3 - rightoffset; diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp index 29d93a7f3..43555ef60 100644 --- a/twin/kcmtwin/twindecoration/preview.cpp +++ b/twin/kcmtwin/twindecoration/preview.cpp @@ -321,8 +321,8 @@ NET::WindowType KDecorationPreviewBridge::windowType( unsigned long ) const TQIconSet KDecorationPreviewBridge::icon() const { - return TQIconSet( KGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 16 ), - KGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 32 )); + return TQIconSet( TDEGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 16 ), + TDEGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 32 )); } TQString KDecorationPreviewBridge::caption() const diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index 4f9c82a21..efe46c1bc 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -399,7 +399,7 @@ KWinDecorationModule::~KWinDecorationModule() // And insert these into a DecorationInfo structure void KWinDecorationModule::findDecorations() { - TQStringList dirList = KGlobal::dirs()->findDirs("data", "twin"); + TQStringList dirList = TDEGlobal::dirs()->findDirs("data", "twin"); TQStringList::ConstIterator it; for (it = dirList.begin(); it != dirList.end(); it++) @@ -819,13 +819,13 @@ void KWinDecorationModule::writeConfig( KConfig* conf ) wmExecutableName.truncate(descStart); } if (conf->readEntry("WMExecutable", "twin") != wmExecutableName) { - KProcess newWMProc; + TDEProcess newWMProc; TQStringList wmstartupcommand; wmstartupcommand.split(" ", thirdpartyWMArguments->text()); wmstartupcommand.prepend(wmExecutableName); wmstartupcommand.append("--replace"); newWMProc << wmstartupcommand; - newWMProc.start(KProcess::DontCare, KProcess::NoCommunication); + newWMProc.start(TDEProcess::DontCare, TDEProcess::NoCommunication); newWMProc.detach(); } conf->writeEntry("WMExecutable", wmExecutableName); |