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 /kpager | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kpager')
| -rw-r--r-- | kpager/desktop.cpp | 6 | ||||
| -rw-r--r-- | kpager/kpager.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp index 6af6d8daf..f8a14c221 100644 --- a/kpager/desktop.cpp +++ b/kpager/desktop.cpp @@ -62,7 +62,7 @@ Desktop::Desktop( int desk, TQString desktopName, TQWidget *parent, const char * setBackgroundMode(NoBackground); if (m_desk==1) Desktop::m_windowPixmaps.setAutoDelete(true); - KConfig *cfg= KGlobal::config(); + KConfig *cfg= TDEGlobal::config(); m_transparentMode=static_cast<WindowTransparentMode> (cfg->readNumEntry("windowTransparentMode", c_defWindowTransparentMode)); resize(67, 50); @@ -466,11 +466,11 @@ void Desktop::paintEvent( TQPaintEvent * ) // set font if (sname) { - TQFont f(KGlobalSettings::generalFont().family(), 10, TQFont::Bold); + TQFont f(TDEGlobalSettings::generalFont().family(), 10, TQFont::Bold); p.setFont(f); } else { - TQFont f(KGlobalSettings::generalFont().family(), 12, TQFont::Bold); + TQFont f(TDEGlobalSettings::generalFont().family(), 12, TQFont::Bold); p.setFont(f); } diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index 3bce94fac..ff79f5e45 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -122,7 +122,7 @@ extern bool closed_by_sm; bool KPagerMainWindow::queryClose() { - KConfig *cfg=KGlobal::config(); + KConfig *cfg=TDEGlobal::config(); cfg->setGroup("KPager"); cfg->writeEntry("layoutType", static_cast<int>(m_pPager->m_layoutType)); @@ -227,7 +227,7 @@ KPager::KPager(KPagerMainWindow *parent, const char *name) connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int))); - TQFont defFont(KGlobalSettings::generalFont().family(), 10, TQFont::Bold); + TQFont defFont(TDEGlobalSettings::generalFont().family(), 10, TQFont::Bold); defFont = cfg->readFontEntry("Font", &defFont); setFont(defFont); @@ -356,7 +356,7 @@ void KPager::configureDialog() if (dialog->exec()) { m_layoutType=static_cast<enum KPager::LayoutTypes>(KPagerConfigDialog::m_layoutType); - KConfig *cfg=KGlobal::config(); + KConfig *cfg=TDEGlobal::config(); int nWd = (parent() ? ((TQWidget *)parent())->width() : width()); int nHg = (parent() ? ((TQWidget *)parent())->width() : width()); |