summaryrefslogtreecommitdiffstats
path: root/konqueror/konq_frame.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:30:47 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /konqueror/konq_frame.h
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/konq_frame.h')
-rw-r--r--konqueror/konq_frame.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/konqueror/konq_frame.h b/konqueror/konq_frame.h
index 7f3226faf..0b5ea4771 100644
--- a/konqueror/konq_frame.h
+++ b/konqueror/konq_frame.h
@@ -46,7 +46,7 @@ class KonqFrame;
class KonqFrameContainerBase;
class KonqFrameContainer;
class KonqFrameTabs;
-class KConfig;
+class TDEConfig;
class KSeparator;
class KProgress;
class KAction;
@@ -154,7 +154,7 @@ class KonqFrameBase
public:
virtual ~KonqFrameBase() {}
- virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0) = 0;
+ virtual void saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0) = 0;
virtual void copyHistory( KonqFrameBase *other ) = 0;
@@ -242,7 +242,7 @@ public:
void setView( KonqView* child );
virtual void listViews( ChildViewList *viewList );
- virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 );
+ virtual void saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 );
virtual void copyHistory( KonqFrameBase *other );
virtual void printFrameInfo( const TQString& spaces );
@@ -357,7 +357,7 @@ public:
virtual void listViews( ChildViewList *viewList );
- virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 );
+ virtual void saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 );
virtual void copyHistory( KonqFrameBase *other );
KonqFrameBase* firstChild() { return m_pFirstChild; }