diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
| commit | 703fb0c89c2eee56a1e613e67a446db9d4287929 (patch) | |
| tree | dd8c5ca66075cd89c2638a2b48cf78386a9870a7 /krandr | |
| parent | 818e7abec3d5d3809b6b77293558678371c16b71 (diff) | |
| download | tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'krandr')
| -rw-r--r-- | krandr/randr.cpp | 12 | ||||
| -rw-r--r-- | krandr/randr.h | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/krandr/randr.cpp b/krandr/randr.cpp index dd54f87be..334da5a79 100644 --- a/krandr/randr.cpp +++ b/krandr/randr.cpp @@ -649,7 +649,7 @@ KDE_EXPORT bool RandRScreen::proposeSize(int newSize) return false; } -KDE_EXPORT void RandRScreen::load(KConfig& config) +KDE_EXPORT void RandRScreen::load(TDEConfig& config) { config.setGroup(TQString("Screen%1").arg(m_screen)); @@ -659,7 +659,7 @@ KDE_EXPORT void RandRScreen::load(KConfig& config) proposeRotation(rotationDegreeToIndex(config.readNumEntry("rotation", 0)) + (config.readBoolEntry("reflectX") ? ReflectX : 0) + (config.readBoolEntry("reflectY") ? ReflectY : 0)); } -KDE_EXPORT void RandRScreen::save(KConfig& config) const +KDE_EXPORT void RandRScreen::save(TDEConfig& config) const { config.setGroup(TQString("Screen%1").arg(m_screen)); config.writeEntry("width", currentPixelWidth()); @@ -782,7 +782,7 @@ KDE_EXPORT RandRScreen* RandRDisplay::currentScreen() return m_currentScreen; } -KDE_EXPORT bool RandRDisplay::loadDisplay(KConfig& config, bool loadScreens) +KDE_EXPORT bool RandRDisplay::loadDisplay(TDEConfig& config, bool loadScreens) { if (loadScreens) for (RandRScreen* s = m_screens.first(); s; s = m_screens.next()) @@ -791,19 +791,19 @@ KDE_EXPORT bool RandRDisplay::loadDisplay(KConfig& config, bool loadScreens) return applyOnStartup(config); } -KDE_EXPORT bool RandRDisplay::applyOnStartup(KConfig& config) +KDE_EXPORT bool RandRDisplay::applyOnStartup(TDEConfig& config) { config.setGroup("Display"); return config.readBoolEntry("ApplyOnStartup", false); } -KDE_EXPORT bool RandRDisplay::syncTrayApp(KConfig& config) +KDE_EXPORT bool RandRDisplay::syncTrayApp(TDEConfig& config) { config.setGroup("Display"); return config.readBoolEntry("SyncTrayApp", false); } -KDE_EXPORT void RandRDisplay::saveDisplay(KConfig& config, bool applyOnStartup, bool syncTrayApp) +KDE_EXPORT void RandRDisplay::saveDisplay(TDEConfig& config, bool applyOnStartup, bool syncTrayApp) { Q_ASSERT(!config.isReadOnly()); diff --git a/krandr/randr.h b/krandr/randr.h index b4c830f02..bec5f1b61 100644 --- a/krandr/randr.h +++ b/krandr/randr.h @@ -211,8 +211,8 @@ public: /** * Configuration functions. */ - void load(KConfig& config); - void save(KConfig& config) const; + void load(TDEConfig& config); + void save(TDEConfig& config) const; private: RandRScreenPrivate* d; @@ -271,15 +271,15 @@ public: /** * Loads saved settings. * - * @param config the KConfig object to load from + * @param config the TDEConfig object to load from * @param loadScreens whether to call RandRScreen::load() for each screen * @retuns true if the settings should be applied on KDE startup. */ - bool loadDisplay(KConfig& config, bool loadScreens = true); - void saveDisplay(KConfig& config, bool applyOnStartup, bool syncTrayApp); + bool loadDisplay(TDEConfig& config, bool loadScreens = true); + void saveDisplay(TDEConfig& config, bool applyOnStartup, bool syncTrayApp); - static bool applyOnStartup(KConfig& config); - static bool syncTrayApp(KConfig& config); + static bool applyOnStartup(TDEConfig& config); + static bool syncTrayApp(TDEConfig& config); void applyProposed(bool confirm = true); |