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 /tdm | |
| 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 'tdm')
| -rw-r--r-- | tdm/kfrontend/gentdmconf.c | 2 | ||||
| -rw-r--r-- | tdm/kfrontend/tdmclock.cpp | 2 | ||||
| -rw-r--r-- | tdm/kfrontend/tdmshutdown.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tdm/kfrontend/gentdmconf.c b/tdm/kfrontend/gentdmconf.c index 4605a923a..e81ff11bd 100644 --- a/tdm/kfrontend/gentdmconf.c +++ b/tdm/kfrontend/gentdmconf.c @@ -1014,7 +1014,7 @@ ReadWord( File *file, int EOFatEOL ) goto mloop; } -/* backslashes are double-escaped - for KConfig and for parseArgs */ +/* backslashes are double-escaped - for TDEConfig and for parseArgs */ static const char * joinArgs( StrList *argv ) { diff --git a/tdm/kfrontend/tdmclock.cpp b/tdm/kfrontend/tdmclock.cpp index 2b2a99cea..14d8deeaf 100644 --- a/tdm/kfrontend/tdmclock.cpp +++ b/tdm/kfrontend/tdmclock.cpp @@ -41,7 +41,7 @@ KdmClock::KdmClock( TQWidget *parent, const char *name ) timer->start( 1000 ); // reading rc file - //KConfig *config = kapp->config(); + //TDEConfig *config = kapp->config(); //config->setGroup( "Option" ); mDate = false;//config->readNumEntry( "date", FALSE ); diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp index c93dfbfaa..db598aed2 100644 --- a/tdm/kfrontend/tdmshutdown.cpp +++ b/tdm/kfrontend/tdmshutdown.cpp @@ -472,7 +472,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) { setCaption(i18n("Shutdown TDE")); - bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false); + bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false); TQFrame* lfrm = new TQFrame( this ); TQHBoxLayout* hbuttonbox; |