diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-06 19:47:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-06 19:47:40 -0600 |
| commit | ac437bde9b6851a210e83ad7644a0606a5096292 (patch) | |
| tree | 82083211a8e99f51591869034767409f7f5468ff /kompare/main.cpp | |
| parent | 7bc058d1bffbd79bf9d9416f879ccb4873b6045e (diff) | |
| download | tdesdk-ac437bde9b6851a210e83ad7644a0606a5096292.tar.gz tdesdk-ac437bde9b6851a210e83ad7644a0606a5096292.zip | |
Rename KCmd to avoid conflicts with KDE4
Diffstat (limited to 'kompare/main.cpp')
| -rw-r--r-- | kompare/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kompare/main.cpp b/kompare/main.cpp index 5f3cb223..90af6c4e 100644 --- a/kompare/main.cpp +++ b/kompare/main.cpp @@ -34,7 +34,7 @@ static const char description[] = static const char version[] = "3.4"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "c", I18N_NOOP( "This will compare URL1 with URL2" ), 0 }, { "o", I18N_NOOP( "This will open URL1 and expect it to be diff output. URL1 can also be a '-' and then it will read from standard input. Can be used for instance for cvs diff | kompare -o -. Kompare will do a check to see if it can find the original file(s) and then blend the original file(s) into the diffoutput and show that in the viewer. -n disables the check." ), 0 }, @@ -44,7 +44,7 @@ static KCmdLineOptions options[] = { "+[URL1 [URL2]]",0 , 0 }, { "+-", 0, 0 }, // { "", I18N_NOOP( "" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char *argv[]) |