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 /konqueror/konq_combo.cc | |
| 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 'konqueror/konq_combo.cc')
| -rw-r--r-- | konqueror/konq_combo.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index 4edce07ad..c252cd0dc 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -36,7 +36,7 @@ #include "konq_combo.h" -KConfig * KonqCombo::s_config = 0L; +TDEConfig * KonqCombo::s_config = 0L; const int KonqCombo::temporary = 0; static TQString titleOfURL( const TQString& urlStr ) @@ -103,7 +103,7 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name ) Q_ASSERT( s_config ); - KConfigGroupSaver cs( s_config, "Location Bar" ); + TDEConfigGroupSaver cs( s_config, "Location Bar" ); setMaxCount( s_config->readNumEntry("Maximum of URLs in combo", 20 )); // We should also connect the completionBox' highlighted signal to @@ -594,7 +594,7 @@ void KonqCombo::slotActivated( const TQString& text ) m_modifier = Qt::NoButton; } -void KonqCombo::setConfig( KConfig *kc ) +void KonqCombo::setConfig( TDEConfig *kc ) { s_config = kc; } |