diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:49 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:49 -0600 |
commit | f8069e2ea048f2657cc417d83820576ec55c181b (patch) | |
tree | cbc5bf540866934a91e0f33b260fc7a25e191fad /cervisia/diffview.h | |
parent | e6aaa3624cc6179b82a9bfff1760e742a669064c (diff) | |
download | tdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.tar.gz tdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'cervisia/diffview.h')
-rw-r--r-- | cervisia/diffview.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cervisia/diffview.h b/cervisia/diffview.h index f691c0b6..2eff4753 100644 --- a/cervisia/diffview.h +++ b/cervisia/diffview.h @@ -28,7 +28,7 @@ #include <tqptrlist.h> -class KConfig; +class TDEConfig; class DiffViewItem; @@ -47,7 +47,7 @@ class DiffView : public QtTableView public: enum DiffType { Change, Insert, Delete, Neutral, Unchanged, Separator }; - DiffView( KConfig& cfg, bool withlinenos, bool withmarker, + DiffView( TDEConfig& cfg, bool withlinenos, bool withmarker, TQWidget *parent=0, const char *name=0 ); void setPartner(DiffView *other); @@ -98,7 +98,7 @@ private: TQColor diffDeleteColor; int m_tabWidth; - KConfig& partConfig; + TDEConfig& partConfig; }; @@ -108,7 +108,7 @@ class DiffZoomWidget : public TQFrame public: - DiffZoomWidget(KConfig& cfg, TQWidget *parent=0, const char *name=0); + DiffZoomWidget(TDEConfig& cfg, TQWidget *parent=0, const char *name=0); ~DiffZoomWidget(); void setDiffView(DiffView *view); |