From c8fc7b9d459cfe043934f86dd3e0af7bf8ecccf7 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 19 Jan 2013 18:46:26 -0600
Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

---
 src/kdiff3.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/kdiff3.cpp')

diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp
index ef1a843..b58ddaa 100644
--- a/src/kdiff3.cpp
+++ b/src/kdiff3.cpp
@@ -133,7 +133,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
    m_pOptionDialog->readOptions( isPart() ? m_pKDiff3Part->instance()->config() : kapp->config() );
 
    // Option handling: Only when pParent==0 (no parent)
-   KCmdLineArgs *args = isPart() ? 0 : KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args = isPart() ? 0 : TDECmdLineArgs::parsedArgs();
 
    if (args)
    {
-- 
cgit v1.2.1