summaryrefslogtreecommitdiffstats
path: root/cervisia/resolvedlg.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:49 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:49 -0600
commitf8069e2ea048f2657cc417d83820576ec55c181b (patch)
treecbc5bf540866934a91e0f33b260fc7a25e191fad /cervisia/resolvedlg.h
parente6aaa3624cc6179b82a9bfff1760e742a669064c (diff)
downloadtdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.tar.gz
tdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'cervisia/resolvedlg.h')
-rw-r--r--cervisia/resolvedlg.h6
1 files changed, 3 insertions, 3 deletions
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;
};