summaryrefslogtreecommitdiffstats
path: root/cervisia/diffview.cpp
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/diffview.cpp
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/diffview.cpp')
-rw-r--r--cervisia/diffview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp
index 90e82516..c3e43862 100644
--- a/cervisia/diffview.cpp
+++ b/cervisia/diffview.cpp
@@ -53,7 +53,7 @@ int DiffViewItemList::compareItems(TQPtrCollection::Item item1, TQPtrCollection:
const int DiffView::BORDER = 7;
-DiffView::DiffView( KConfig& cfg, bool withlinenos, bool withmarker,
+DiffView::DiffView( TDEConfig& cfg, bool withlinenos, bool withmarker,
TQWidget *parent, const char *name )
: QtTableView(parent, name, WRepaintNoErase)
, partConfig(cfg)
@@ -388,7 +388,7 @@ void DiffView::wheelEvent(TQWheelEvent *e)
}
-DiffZoomWidget::DiffZoomWidget(KConfig& cfg, TQWidget *parent, const char *name)
+DiffZoomWidget::DiffZoomWidget(TDEConfig& cfg, TQWidget *parent, const char *name)
: TQFrame(parent, name)
{
setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );