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 /tdm/kfrontend/themer | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdm/kfrontend/themer')
| -rw-r--r-- | tdm/kfrontend/themer/tdmlabel.cpp | 6 | ||||
| -rw-r--r-- | tdm/kfrontend/themer/tdmpixmap.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tdm/kfrontend/themer/tdmlabel.cpp b/tdm/kfrontend/themer/tdmlabel.cpp index 5239d48dc..8841eb22d 100644 --- a/tdm/kfrontend/themer/tdmlabel.cpp +++ b/tdm/kfrontend/themer/tdmlabel.cpp @@ -52,7 +52,7 @@ KdmLabel::KdmLabel( KdmItem *parent, const TQDomNode &node, const char *name ) label.prelight.present = false; label.maximumWidth = -1; - const TQString locale = KGlobal::locale()->language(); + const TQString locale = TDEGlobal::locale()->language(); // Read LABEL ID TQDomNode n = node; @@ -267,8 +267,8 @@ KdmLabel::lookupText( const TQString &t ) m['d'] = TQString::number( KThemedGreeter::timedDelay ); m['s'] = KThemedGreeter::timedUser; // xgettext:no-c-format - KGlobal::locale()->setDateFormat( i18n("date format", "%a %d %B") ); - m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false, false ); + TDEGlobal::locale()->setDateFormat( i18n("date format", "%a %d %B") ); + m['c'] = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false, false ); return KMacroExpander::expandMacros( text, m ); } diff --git a/tdm/kfrontend/themer/tdmpixmap.cpp b/tdm/kfrontend/themer/tdmpixmap.cpp index 7a8d1a3d2..56ece936c 100644 --- a/tdm/kfrontend/themer/tdmpixmap.cpp +++ b/tdm/kfrontend/themer/tdmpixmap.cpp @@ -72,7 +72,7 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name ) if ((_compositor.isEmpty()) || (!argb_visual_available)) { // Software blend only (no compositing support) // Use the preset TDM background... - KStandardDirs *m_pDirs = KGlobal::dirs(); + KStandardDirs *m_pDirs = TDEGlobal::dirs(); KSimpleConfig *config = new KSimpleConfig( TQFile::decodeName( _backgroundCfg ) ); config->setGroup("Desktop0"); pixmap.normal.fullpath = m_pDirs->findResource("wallpaper", config->readPathEntry("Wallpaper")); |