diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:04 -0600 |
| commit | d1e0cc99a202cef3306b90b8839a6726e89f201e (patch) | |
| tree | a0d01a91644fd94aa6da5d8944e052b67461faad /tdehtml/ecma | |
| parent | 3e3559f2d4f4c4ffa3caa0374928c8a12be29bf3 (diff) | |
| download | tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.tar.gz tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tdehtml/ecma')
| -rw-r--r-- | tdehtml/ecma/kjs_debugwin.cpp | 8 | ||||
| -rw-r--r-- | tdehtml/ecma/kjs_debugwin.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp index ac78526ae..c57b26c7b 100644 --- a/tdehtml/ecma/kjs_debugwin.cpp +++ b/tdehtml/ecma/kjs_debugwin.cpp @@ -47,12 +47,12 @@ #include <kglobal.h> #include <kmessagebox.h> #include <kguiitem.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmenubar.h> -#include <kaction.h> -#include <kactioncollection.h> +#include <tdeaction.h> +#include <tdeactioncollection.h> #include <kglobalsettings.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <tdeconfig.h> #include <tdeconfigbase.h> #include <kapplication.h> diff --git a/tdehtml/ecma/kjs_debugwin.h b/tdehtml/ecma/kjs_debugwin.h index af205d654..be6b31dda 100644 --- a/tdehtml/ecma/kjs_debugwin.h +++ b/tdehtml/ecma/kjs_debugwin.h @@ -34,7 +34,7 @@ #include <tqptrstack.h> #include <tqcheckbox.h> #include <kdialogbase.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqscrollview.h> #include <kjs/debugger.h> |