summaryrefslogtreecommitdiffstats
path: root/cervisia/diffdlg.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/diffdlg.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/diffdlg.h')
-rw-r--r--cervisia/diffdlg.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/cervisia/diffdlg.h b/cervisia/diffdlg.h
index 7600af66..7553cdc7 100644
--- a/cervisia/diffdlg.h
+++ b/cervisia/diffdlg.h
@@ -28,7 +28,7 @@
class TQLabel;
class TQCheckBox;
class TQComboBox;
-class KConfig;
+class TDEConfig;
class DiffItem;
class DiffView;
class CvsService_stub;
@@ -41,7 +41,7 @@ class DiffDialog : public KDialogBase
public:
- explicit DiffDialog( KConfig& config, TQWidget *parent=0, const char *name=0,
+ explicit DiffDialog( TDEConfig& config, TQWidget *parent=0, const char *name=0,
bool modal=false );
virtual ~DiffDialog();
@@ -76,7 +76,7 @@ private:
TQPtrList<DiffItem> items;
int markeditem;
- KConfig& partConfig;
+ TDEConfig& partConfig;
TQStringList m_diffOutput;
};