diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/konq/desktopbehavior_impl.cpp | |
| 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/konq/desktopbehavior_impl.cpp')
| -rw-r--r-- | kcontrol/konq/desktopbehavior_impl.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index 757385cd0..3ae4cf41b 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -46,8 +46,8 @@ const int customMenu1ID = 5; const int customMenu2ID = 6; -DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, TQWidget *parent, const char * ) - : KCModule( parent, "kcmkonq" ) +DesktopBehaviorModule::DesktopBehaviorModule(TDEConfig *config, TQWidget *parent, const char * ) + : TDECModule( parent, "kcmkonq" ) { TQVBoxLayout* layout = new TQVBoxLayout(this); m_behavior = new DesktopBehavior(config, this); @@ -57,7 +57,7 @@ DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, TQWidget *parent, void DesktopBehaviorModule::changed() { - emit KCModule::changed( true ); + emit TDECModule::changed( true ); } class DesktopBehaviorPreviewItem : public TQCheckListItem @@ -112,7 +112,7 @@ private: static const int choiceCount=7; static const char * s_choices[7] = { "", "WindowListMenu", "DesktopMenu", "AppMenu", "BookmarksMenu", "CustomMenu1", "CustomMenu2" }; -DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * ) +DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char * ) : DesktopBehaviorBase( parent, "kcmkonq" ), g_pConfig(config) { TQString strMouseButton1, strMouseButton3, strButtonTxt1, strButtonTxt3; @@ -315,7 +315,7 @@ void DesktopBehavior::load( bool useDefaults ) g_pConfig->setGroup( "FMSettings" ); toolTipBox->setChecked(g_pConfig->readBoolEntry( "ShowFileTips", true ) ); g_pConfig->setGroup( "Menubar" ); - KConfig config( "kdeglobals" ); + TDEConfig config( "kdeglobals" ); config.setGroup("KDE"); bool globalMenuBar = config.readBoolEntry("macStyle", false); bool desktopMenuBar = g_pConfig->readBoolEntry("ShowMenubar", false); @@ -373,7 +373,7 @@ void DesktopBehavior::save() g_pConfig->writeEntry( "ShowFileTips", toolTipBox->isChecked() ); g_pConfig->setGroup( "Menubar" ); g_pConfig->writeEntry("ShowMenubar", desktopMenuGroup->selectedId() == 1); - KConfig config( "kdeglobals" ); + TDEConfig config( "kdeglobals" ); config.setGroup("KDE"); bool globalMenuBar = desktopMenuGroup->selectedId() == 2; if ( globalMenuBar != config.readBoolEntry("macStyle", false) ) @@ -460,7 +460,7 @@ void DesktopBehavior::editButtonPressed() return; KCustomMenuEditor editor(this); - KConfig cfg(cfgFile, false, false); + TDEConfig cfg(cfgFile, false, false); editor.load(&cfg); if (editor.exec()) |