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 /kcontrol/displayconfig | |
| 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 'kcontrol/displayconfig')
| -rw-r--r-- | kcontrol/displayconfig/displayconfig.cpp | 6 | ||||
| -rw-r--r-- | kcontrol/displayconfig/displayconfig.h | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 7a7ccc318..046ad9e16 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -740,7 +740,7 @@ void KDisplayConfig::setRealResolutionSliderValue(int index) { /**** KDisplayConfig ****/ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0) + : TDECModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0) { TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); @@ -1905,13 +1905,13 @@ void KDisplayConfig::processLockoutControls() { base->loadExistingProfile->hide(); // Same as above } -KCModule* KDisplayConfig::addTab( const TQString name, const TQString label ) +TDECModule* KDisplayConfig::addTab( const TQString name, const TQString label ) { // [FIXME] This is incomplete...Apply may not work... TQWidget *page = new TQWidget( base->mainTabContainerWidget, name.latin1() ); TQVBoxLayout *top = new TQVBoxLayout( page, KDialog::marginHint() ); - KCModule *kcm = KCModuleLoader::loadModule( name, page ); + TDECModule *kcm = TDECModuleLoader::loadModule( name, page ); if ( kcm ) { diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h index 62e53209f..af3e971ee 100644 --- a/kcontrol/displayconfig/displayconfig.h +++ b/kcontrol/displayconfig/displayconfig.h @@ -40,13 +40,13 @@ #include "monitorworkspace.h" #include "displayconfigbase.h" -class KConfig; +class TDEConfig; class KPopupMenu; class KListViewItem; typedef TQMap< TQString, TQPtrList< SingleScreenData > > ScreenConfigurationMap; -class KDisplayConfig : public KCModule, public DCOPObject +class KDisplayConfig : public TDECModule, public DCOPObject { K_DCOP Q_OBJECT @@ -70,8 +70,8 @@ k_dcop: private: - KConfig *config; - KCModule *iccTab; + TDEConfig *config; + TDECModule *iccTab; bool _ok; Display *randr_display; ScreenInfo *randr_screen_info; @@ -91,7 +91,7 @@ private: TQString startupProfileName; int realResolutionSliderValue(); void setRealResolutionSliderValue(int index); - KCModule* addTab( const TQString name, const TQString label ); + TDECModule* addTab( const TQString name, const TQString label ); void moveMonitor(DraggableMonitor* monitor, int realx, int realy); bool applyMonitorLayoutRules(void); bool applyMonitorLayoutRules(DraggableMonitor* primary_monitor); |