summaryrefslogtreecommitdiffstats
path: root/kcontrol/konqhtml/htmlopts.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/konqhtml/htmlopts.cpp
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/konqhtml/htmlopts.cpp')
-rw-r--r--kcontrol/konqhtml/htmlopts.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
index 9e199cbe4..153692082 100644
--- a/kcontrol/konqhtml/htmlopts.cpp
+++ b/kcontrol/konqhtml/htmlopts.cpp
@@ -32,8 +32,8 @@ enum AnimationsType { AnimationsAlways=0, AnimationsNever=1, AnimationsLoopOnce=
enum SmoothScrollingType { SmoothScrollingAlways=0, SmoothScrollingNever=1, SmoothScrollingWhenEfficient=2 };
//-----------------------------------------------------------------------------
-KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *parent, const char *)
- : KCModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group)
+KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *parent, const char *)
+ : TDECModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group)
{
int row = 0;
TQGridLayout *lay = new TQGridLayout(this, 10, 2, 0, KDialog::spacingHint());
@@ -230,7 +230,7 @@ void KMiscHTMLOptions::load()
void KMiscHTMLOptions::load( bool useDefaults )
{
- KConfig khtmlrc("khtmlrc", true, false);
+ TDEConfig khtmlrc("khtmlrc", true, false);
khtmlrc.setReadDefaults( useDefaults );
m_pConfig->setReadDefaults( useDefaults );
@@ -290,13 +290,13 @@ void KMiscHTMLOptions::load( bool useDefaults )
m_pShowMMBInTabs->setChecked( m_pConfig->readBoolEntry( "MMBOpensTab", false ) );
m_pDynamicTabbarHide->setChecked( ! (m_pConfig->readBoolEntry( "AlwaysTabbedMode", false )) );
- KConfig config("kbookmarkrc", true, false);
+ TDEConfig config("kbookmarkrc", true, false);
config.setReadDefaults( useDefaults );
config.setGroup("Bookmarks");
m_pAdvancedAddBookmarkCheckBox->setChecked( config.readBoolEntry("AdvancedAddBookmarkDialog", false) );
m_pOnlyMarkedBookmarksCheckBox->setChecked( config.readBoolEntry("FilteredToolbar", false) );
- KConfig kdeglobals("kdeglobals", true, false);
+ TDEConfig kdeglobals("kdeglobals", true, false);
kdeglobals.setReadDefaults( useDefaults );
kdeglobals.setGroup("KDE");
bool smoothScrolling = kdeglobals.readBoolEntry("SmoothScrolling", DEFAULT_SMOOTHSCROLL);
@@ -363,13 +363,13 @@ void KMiscHTMLOptions::save()
m_pConfig->writeEntry( "AlwaysTabbedMode", !(m_pDynamicTabbarHide->isChecked()) );
m_pConfig->sync();
- KConfig config("kbookmarkrc", false, false);
+ TDEConfig config("kbookmarkrc", false, false);
config.setGroup("Bookmarks");
config.writeEntry("AdvancedAddBookmarkDialog", m_pAdvancedAddBookmarkCheckBox->isChecked());
config.writeEntry("FilteredToolbar", m_pOnlyMarkedBookmarksCheckBox->isChecked());
config.sync();
- KConfig kdeglobals("kdeglobals", false, false);
+ TDEConfig kdeglobals("kdeglobals", false, false);
kdeglobals.setGroup("KDE");
switch(m_pSmoothScrollingCombo->currentItem())
{