diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /nsplugins | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'nsplugins')
| -rw-r--r-- | nsplugins/plugin_part.cpp | 2 | ||||
| -rw-r--r-- | nsplugins/test/testnsplugin.cpp | 2 | ||||
| -rw-r--r-- | nsplugins/test/testnsplugin.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp index ef189d9ea..a7033d852 100644 --- a/nsplugins/plugin_part.cpp +++ b/nsplugins/plugin_part.cpp @@ -22,7 +22,7 @@ #include <dcopclient.h> #include <kaboutdata.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <tdefiledialog.h> diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp index 986595816..6e029e87b 100644 --- a/nsplugins/test/testnsplugin.cpp +++ b/nsplugins/test/testnsplugin.cpp @@ -26,7 +26,7 @@ #include <dcopclient.h> #include <kdebug.h> #include <kstdaction.h> -#include <kaction.h> +#include <tdeaction.h> #include "testnsplugin.h" #include "../NSPluginClassIface_stub.h" diff --git a/nsplugins/test/testnsplugin.h b/nsplugins/test/testnsplugin.h index 0b007aba2..252cea2c8 100644 --- a/nsplugins/test/testnsplugin.h +++ b/nsplugins/test/testnsplugin.h @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqwidget.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqlayout.h> #include <tqptrlist.h> |