diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:07 -0600 |
| commit | e46eba349e7029d919b213b7130086503d1e042e (patch) | |
| tree | c99ad6970d22aa80d905a7129d87aa627ae26801 /kompare/libdiff2 | |
| parent | df726f3e9706e8264827dc1dc8338225c3b6434f (diff) | |
| download | tdesdk-e46eba349e7029d919b213b7130086503d1e042e.tar.gz tdesdk-e46eba349e7029d919b213b7130086503d1e042e.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kompare/libdiff2')
| -rw-r--r-- | kompare/libdiff2/komparemodellist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp index 8e667800..8bb6cf83 100644 --- a/kompare/libdiff2/komparemodellist.cpp +++ b/kompare/libdiff2/komparemodellist.cpp @@ -25,7 +25,7 @@ #include <tqtextcodec.h> #include <tqvaluelist.h> -#include <kaction.h> +#include <tdeaction.h> #include <kcharsets.h> #include <kdebug.h> #include <kdirwatch.h> @@ -959,7 +959,7 @@ bool KompareModelList::blendFile( DiffModel* model, const TQString& fileContents TQStringList::ConstIterator lEnd = lines.end(); DiffHunkList* hunks = model->hunks(); - kdDebug(8101) << "Hunks in hunklist: " << hunks->count() << endl; + kdDebug(8101) << "Hunks in huntdelist: " << hunks->count() << endl; DiffHunkListIterator hunkIt = hunks->begin(); DiffHunk* newHunk = 0; |