diff options
| author | Timothy Pearson <[email protected]> | 2013-01-19 18:46:26 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-19 18:46:26 -0600 |
| commit | c8fc7b9d459cfe043934f86dd3e0af7bf8ecccf7 (patch) | |
| tree | ba4582053cae58a3f204da2df88d680c84141696 /src/kdiff3.cpp | |
| parent | 4ede6a1bdb01c6143bfdb23593633131c02051ab (diff) | |
| download | kdiff3-c8fc7b9d459cfe043934f86dd3e0af7bf8ecccf7.tar.gz kdiff3-c8fc7b9d459cfe043934f86dd3e0af7bf8ecccf7.zip | |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'src/kdiff3.cpp')
| -rw-r--r-- | src/kdiff3.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |