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.h | |
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.h')
-rw-r--r-- | konqueror/konq_combo.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/konqueror/konq_combo.h b/konqueror/konq_combo.h index 3650eb9a4..d3bdd436e 100644 --- a/konqueror/konq_combo.h +++ b/konqueror/konq_combo.h @@ -26,7 +26,7 @@ #include <konq_historymgr.h> class KCompletion; -class KConfig; +class TDEConfig; // we use KHistoryCombo _only_ for the up/down keyboard handling, otherwise // KComboBox would do fine. @@ -56,7 +56,7 @@ public: void loadItems(); void saveItems(); - static void setConfig( KConfig * ); + static void setConfig( TDEConfig * ); virtual void popup(); @@ -109,7 +109,7 @@ private: TQPoint m_dragStart; int m_pageSecurity; - static KConfig *s_config; + static TDEConfig *s_config; static const int temporary; // the index of our temporary item }; |