diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:15:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:15:05 -0600 |
| commit | c6a4ae5cfe980eed21f39d2fc64eb60d8c6da225 (patch) | |
| tree | 8187adcc744dbdad06fd53289e9bd431c3a0f146 | |
| parent | cd8241b126fba01a09d8684dd599f8aec5fec91b (diff) | |
| download | kuickshow-c6a4ae5cfe980eed21f39d2fc64eb60d8c6da225.tar.gz kuickshow-c6a4ae5cfe980eed21f39d2fc64eb60d8c6da225.zip | |
Rename many classes and header files to avoid conflicts with KDE4
| -rw-r--r-- | kuickshow/src/filewidget.cpp | 2 | ||||
| -rw-r--r-- | kuickshow/src/imagewindow.cpp | 2 | ||||
| -rw-r--r-- | kuickshow/src/imagewindow.h | 2 | ||||
| -rw-r--r-- | kuickshow/src/kuickconfigdlg.cpp | 2 | ||||
| -rw-r--r-- | kuickshow/src/kuickshow.cpp | 8 | ||||
| -rw-r--r-- | kuickshow/src/kuickshow.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp index 525397e..52a054b 100644 --- a/kuickshow/src/filewidget.cpp +++ b/kuickshow/src/filewidget.cpp @@ -22,7 +22,7 @@ #include <kglobal.h> #include <kglobalsettings.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kpropertiesdialog.h> #include <kurlcompletion.h> diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp index 6c30592..8948f05 100644 --- a/kuickshow/src/imagewindow.cpp +++ b/kuickshow/src/imagewindow.cpp @@ -51,7 +51,7 @@ #include <kmessagebox.h> #include <kprinter.h> #include <kpropertiesdialog.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kstdguiitem.h> #include <kstandarddirs.h> #include <kglobalsettings.h> diff --git a/kuickshow/src/imagewindow.h b/kuickshow/src/imagewindow.h index bf5427a..fbc8b90 100644 --- a/kuickshow/src/imagewindow.h +++ b/kuickshow/src/imagewindow.h @@ -21,7 +21,7 @@ #include <tqevent.h> -#include <kaction.h> +#include <tdeaction.h> #include <kurl.h> #include "imlibwidget.h" diff --git a/kuickshow/src/kuickconfigdlg.cpp b/kuickshow/src/kuickconfigdlg.cpp index 09951e5..908aadb 100644 --- a/kuickshow/src/kuickconfigdlg.cpp +++ b/kuickshow/src/kuickconfigdlg.cpp @@ -25,7 +25,7 @@ #include <tqkeycode.h> #include <tqvbox.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <tdeconfig.h> #include <kglobal.h> #include <klocale.h> diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp index edd7dfe..57b85fa 100644 --- a/kuickshow/src/kuickshow.cpp +++ b/kuickshow/src/kuickshow.cpp @@ -29,8 +29,8 @@ #include <tqstring.h> #include <kaboutdata.h> -#include <kaccel.h> -#include <kaction.h> +#include <tdeaccel.h> +#include <tdeaction.h> #include <kapplication.h> #include <kcmdlineargs.h> #include <tdeconfig.h> @@ -45,7 +45,7 @@ #include <klocale.h> #include <kmenubar.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kprotocolinfo.h> #include <kpropertiesdialog.h> #include <kprotocolinfo.h> @@ -53,7 +53,7 @@ #include <kstdaction.h> #include <kstandarddirs.h> #include <kstartupinfo.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <kurlcombobox.h> #include <kurlcompletion.h> #include <kurldrag.h> diff --git a/kuickshow/src/kuickshow.h b/kuickshow/src/kuickshow.h index 33f5a9f..79d0588 100644 --- a/kuickshow/src/kuickshow.h +++ b/kuickshow/src/kuickshow.h @@ -25,7 +25,7 @@ #include <tqvaluelist.h> #include <tdefileitem.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kurl.h> #include <Imlib.h> |