From cc74f360bb40da3d79f58048f8e8611804980aa6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:30:47 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 konqueror/konq_viewmgr.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'konqueror/konq_viewmgr.h')

diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h
index 9b5c4e5b3..0323bd504 100644
--- a/konqueror/konq_viewmgr.h
+++ b/konqueror/konq_viewmgr.h
@@ -35,7 +35,7 @@
 class TQString;
 class TQStringList;
 class TQTimer;
-class KConfig;
+class TDEConfig;
 class KonqMainWindow;
 class KonqFrameBase;
 class KonqFrameContainer;
@@ -178,7 +178,7 @@ public:
    * @param saveURLs whether to save the URLs in the profile
    * @param saveWindowSize whether to save the size of the window in the profile
    */
-  void saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWindowSize );
+  void saveViewProfile( TDEConfig & cfg, bool saveURLs, bool saveWindowSize );
 
   /**
    * Saves the current view layout to a config file.
@@ -201,7 +201,7 @@ public:
    * @param resetWindow if the profile doesn't have attributes like size or toolbar
    * settings, they will be reset to the defaults
    */
-  void loadViewProfile( KConfig &cfg, const TQString & filename,
+  void loadViewProfile( TDEConfig &cfg, const TQString & filename,
                         const KURL & forcedURL = KURL(),
                         const KonqOpenURLRequest &req = KonqOpenURLRequest(),
                         bool resetWindow = false, bool openURL = true );
@@ -274,7 +274,7 @@ public:
   /**
    *   The widget is the one which you are referring to.
    */
-  static TQSize readConfigSize( KConfig &cfg, TQWidget *widget = NULL);
+  static TQSize readConfigSize( TDEConfig &cfg, TQWidget *widget = NULL);
 
 #ifndef NDEBUG
   void printFullHierarchy( KonqFrameContainerBase * container );
@@ -309,7 +309,7 @@ protected:
    * @param openURL whether to open urls at all (from the profile or using @p defaultURL).
    *  (this is set to false when we have a forcedURL to open)
    */
-  void loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
+  void loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
                  const TQString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage = false );
 
   // Disabled - we do it ourselves
-- 
cgit v1.2.1