diff options
author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kpager | |
parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kpager')
-rw-r--r-- | kpager/config.cpp | 2 | ||||
-rw-r--r-- | kpager/desktop.cpp | 2 | ||||
-rw-r--r-- | kpager/kpager.cpp | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kpager/config.cpp b/kpager/config.cpp index 5ff0d3def..e92d1ce4f 100644 --- a/kpager/config.cpp +++ b/kpager/config.cpp @@ -146,7 +146,7 @@ void KPagerConfigDialog::loadConfiguration() void KPagerConfigDialog::initConfiguration(void) { - KConfig *cfg= kapp->config(); + TDEConfig *cfg= kapp->config(); cfg->setGroup("KPager"); m_windowDrawMode=cfg->readNumEntry("windowDrawMode", Desktop::c_defWindowDrawMode); diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp index f8a14c221..f713ca4f6 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= TDEGlobal::config(); + TDEConfig *cfg= TDEGlobal::config(); m_transparentMode=static_cast<WindowTransparentMode> (cfg->readNumEntry("windowTransparentMode", c_defWindowTransparentMode)); resize(67, 50); diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index ff79f5e45..e2477a254 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -67,7 +67,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name) m_pPager = new KPager(this, 0); setCentralWidget(m_pPager); - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); cfg->setGroup("KPager"); // Update the last used geometry @@ -122,7 +122,7 @@ extern bool closed_by_sm; bool KPagerMainWindow::queryClose() { - KConfig *cfg=TDEGlobal::config(); + TDEConfig *cfg=TDEGlobal::config(); cfg->setGroup("KPager"); cfg->writeEntry("layoutType", static_cast<int>(m_pPager->m_layoutType)); @@ -195,7 +195,7 @@ KPager::KPager(KPagerMainWindow *parent, const char *name) KPagerConfigDialog::initConfiguration(); - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); cfg->setGroup("KPager"); m_showStickyOption=cfg->readBoolEntry("ShowStickyOption",false); @@ -356,7 +356,7 @@ void KPager::configureDialog() if (dialog->exec()) { m_layoutType=static_cast<enum KPager::LayoutTypes>(KPagerConfigDialog::m_layoutType); - KConfig *cfg=TDEGlobal::config(); + TDEConfig *cfg=TDEGlobal::config(); int nWd = (parent() ? ((TQWidget *)parent())->width() : width()); int nHg = (parent() ? ((TQWidget *)parent())->width() : width()); |