diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 23:21:33 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 23:21:33 -0600 |
commit | 5b28c57424294aa30218a9c11cd6ed1a929409b6 (patch) | |
tree | aaa8c9380d183dfa87857abd34b3ef42bb0de1b5 /arts/builder | |
parent | 120dff5f18d13aab7d2731de84e64c898728dc60 (diff) | |
download | tdemultimedia-5b28c57424294aa30218a9c11cd6ed1a929409b6.tar.gz tdemultimedia-5b28c57424294aa30218a9c11cd6ed1a929409b6.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'arts/builder')
-rw-r--r-- | arts/builder/main.cpp | 4 | ||||
-rw-r--r-- | arts/builder/menumaker.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp index f33d360a..62dcdb43 100644 --- a/arts/builder/main.cpp +++ b/arts/builder/main.cpp @@ -41,13 +41,13 @@ #include <kdebug.h> #include <arts/debug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kapplication.h> #include <kcmdlineargs.h> #include <klocale.h> #include <kinputdialog.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <tdefiledialog.h> #include <ksavefile.h> #include <kmessagebox.h> diff --git a/arts/builder/menumaker.h b/arts/builder/menumaker.h index f1368d73..fa3c0c20 100644 --- a/arts/builder/menumaker.h +++ b/arts/builder/menumaker.h @@ -1,7 +1,7 @@ #ifndef __MENUMAKER_H__ #define __MENUMAKER_H__ -#include <kaction.h> +#include <tdeaction.h> #include <tqobject.h> #include <string> #include <list> |