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/komparepart | |
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/komparepart')
-rw-r--r-- | kompare/komparepart/kompare_part.cpp | 2 | ||||
-rw-r--r-- | kompare/komparepart/komparelistview.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index e2e2956c..1dfac530 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqwidget.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <tdefiletreeview.h> diff --git a/kompare/komparepart/komparelistview.h b/kompare/komparepart/komparelistview.h index 6124d184..79d318cf 100644 --- a/kompare/komparepart/komparelistview.h +++ b/kompare/komparepart/komparelistview.h @@ -27,7 +27,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klistview.h> +#include <tdelistview.h> namespace Diff2 { class DiffModel; |