diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:57 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:57 -0600 |
commit | 5be945600e2d7776e74663f56c2a25a8f57d7891 (patch) | |
tree | 9be5ab8203c0769df4dc0f314c45e52fa5ecfd8c /languages/cpp/app_templates/kapp | |
parent | e36b30d13d1f89100fae656adfde2b52234d12b6 (diff) | |
download | tdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.tar.gz tdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'languages/cpp/app_templates/kapp')
-rw-r--r-- | languages/cpp/app_templates/kapp/app.cpp | 6 | ||||
-rw-r--r-- | languages/cpp/app_templates/kapp/app.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp index f4c4cba2..9daebf13 100644 --- a/languages/cpp/app_templates/kapp/app.cpp +++ b/languages/cpp/app_templates/kapp/app.cpp @@ -13,7 +13,7 @@ #include <kiconloader.h> #include <tdeversion.h> #include <kstatusbar.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <tdeio/netaccess.h> #include <tdefiledialog.h> #include <tdeconfig.h> @@ -21,8 +21,8 @@ #include <kurldrag.h> #include <kurlrequesterdlg.h> -#include <kstdaccel.h> -#include <kaction.h> +#include <tdestdaccel.h> +#include <tdeaction.h> #include <kstdaction.h> %{APPNAME}::%{APPNAME}() diff --git a/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/kapp/app.h index 007a5db0..9f281120 100644 --- a/languages/cpp/app_templates/kapp/app.h +++ b/languages/cpp/app_templates/kapp/app.h @@ -8,7 +8,7 @@ #endif #include <kapplication.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "%{APPNAMELC}view.h" |