From cc74f360bb40da3d79f58048f8e8611804980aa6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:30:47 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- konqueror/konq_mainwindow.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'konqueror/konq_mainwindow.h') diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h index c0dd75692..fe016b18c 100644 --- a/konqueror/konq_mainwindow.h +++ b/konqueror/konq_mainwindow.h @@ -142,8 +142,8 @@ public: virtual TQWidget *createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id ); virtual void removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id ); - virtual void saveProperties( KConfig *config ); - virtual void readProperties( KConfig *config ); + virtual void saveProperties( TDEConfig *config ); + virtual void readProperties( TDEConfig *config ); void setInitialFrameName( const TQString &name ); @@ -275,7 +275,7 @@ public: */ void removeChildFrame( KonqFrameBase * frame ); - void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 ); + void saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 ); void copyHistory( KonqFrameBase *other ); @@ -727,7 +727,7 @@ private: TQLabel* m_locationLabel; TQGuardedPtr m_combo; - static KConfig *s_comboConfig; + static TDEConfig *s_comboConfig; KURLCompletion *m_pURLCompletion; // just a reference to KonqHistoryManager's completionObject static KCompletion *s_pCompletion; -- cgit v1.2.1