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 /kapptemplate/kpartapp | |
| 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 'kapptemplate/kpartapp')
| -rw-r--r-- | kapptemplate/kpartapp/app.cpp | 2 | ||||
| -rw-r--r-- | kapptemplate/kpartapp/app_part.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kapptemplate/kpartapp/app.cpp b/kapptemplate/kpartapp/app.cpp index be995d83..e2610d96 100644 --- a/kapptemplate/kpartapp/app.cpp +++ b/kapptemplate/kpartapp/app.cpp @@ -14,7 +14,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp #include <kedittoolbar.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <klibloader.h> diff --git a/kapptemplate/kpartapp/app_part.cpp b/kapptemplate/kpartapp/app_part.cpp index c87f6be5..ee1a90e5 100644 --- a/kapptemplate/kpartapp/app_part.cpp +++ b/kapptemplate/kpartapp/app_part.cpp @@ -5,7 +5,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.cpp #include "${APP_NAME_LC}_part.moc" #include <kinstance.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> #include <tdeparts/genericfactory.h> |