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

---
 cervisia/resolvedlg.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cervisia/resolvedlg.h')

diff --git a/cervisia/resolvedlg.h b/cervisia/resolvedlg.h
index 71aa91f2..c847e3da 100644
--- a/cervisia/resolvedlg.h
+++ b/cervisia/resolvedlg.h
@@ -31,7 +31,7 @@
 
 class TQLabel;
 class TQTextCodec;
-class KConfig;
+class TDEConfig;
 class ResolveItem;
 
 
@@ -43,7 +43,7 @@ class ResolveDialog : public KDialogBase
 public:
     enum ChooseType { ChA, ChB, ChAB, ChBA, ChEdit };
 
-    explicit ResolveDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit ResolveDialog( TDEConfig& cfg, TQWidget *parent=0, const char *name=0 );
     virtual ~ResolveDialog();
 
     bool parseFile(const TQString &name);
@@ -85,7 +85,7 @@ private:
     TQString fname;
     TQTextCodec *fcodec;
     int markeditem;
-    KConfig& partConfig;
+    TDEConfig& partConfig;
     
     TQString    m_contentMergedVersion;
 };
-- 
cgit v1.2.1