diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:31 -0600 |
| commit | bd11bce76f195adf4f3806cef8cf2e0737c99ff2 (patch) | |
| tree | e3c1714d74f67cc51cd04162cd4afa927dd7f7d4 /ark | |
| parent | 2d7591be424ae10d974d01e0e2f781d19ef07cd6 (diff) | |
| download | tdeutils-bd11bce76f195adf4f3806cef8cf2e0737c99ff2.tar.gz tdeutils-bd11bce76f195adf4f3806cef8cf2e0737c99ff2.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'ark')
| -rw-r--r-- | ark/ark_part.cpp | 2 | ||||
| -rw-r--r-- | ark/ark_part.h | 2 | ||||
| -rw-r--r-- | ark/arkwidget.cpp | 6 | ||||
| -rw-r--r-- | ark/filelistview.h | 2 | ||||
| -rw-r--r-- | ark/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | ark/mainwindow.h | 2 | ||||
| -rw-r--r-- | ark/searchbar.cpp | 8 | ||||
| -rw-r--r-- | ark/searchbar.h | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp index 062d1a3..f2e6f01 100644 --- a/ark/ark_part.cpp +++ b/ark/ark_part.cpp @@ -29,7 +29,7 @@ #include "searchbar.h" #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> #include <kaboutdata.h> #include <kxmlguifactory.h> diff --git a/ark/ark_part.h b/ark/ark_part.h index 3ea711e..49af555 100644 --- a/ark/ark_part.h +++ b/ark/ark_part.h @@ -27,7 +27,7 @@ #include <tdeparts/browserextension.h> #include <tdeparts/statusbarextension.h> #include <tdeparts/factory.h> -#include <kaction.h> +#include <tdeaction.h> #include <kprogress.h> #include <tqlabel.h> diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp index 9c5eec8..5f29b97 100644 --- a/ark/arkwidget.cpp +++ b/ark/arkwidget.cpp @@ -55,8 +55,8 @@ #include <tdefiledialog.h> #include <kdirselectdialog.h> #include <kurldrag.h> -#include <klistviewsearchline.h> -#include <ktoolbar.h> +#include <tdelistviewsearchline.h> +#include <tdetoolbar.h> #include <tdeconfigdialog.h> #include <ktrader.h> #include <kurl.h> @@ -66,7 +66,7 @@ #include "general.h" #include "addition.h" #include "extraction.h" -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdialog.h> // ark includes diff --git a/ark/filelistview.h b/ark/filelistview.h index 8cc5140..82ce86d 100644 --- a/ark/filelistview.h +++ b/ark/filelistview.h @@ -32,7 +32,7 @@ #include <tqpair.h> #include <tqvaluelist.h> -#include <klistview.h> +#include <tdelistview.h> #include <tdeio/global.h> class TQString; diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp index 40ccdae..f89a573 100644 --- a/ark/mainwindow.cpp +++ b/ark/mainwindow.cpp @@ -31,13 +31,13 @@ #include <kstatusbar.h> #include <tdefiledialog.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdeparts/componentfactory.h> #include <tdeparts/browserextension.h> #include <kkeydialog.h> #include <kcombobox.h> #include <tdeio/netaccess.h> -#include <kaccel.h> +#include <tdeaccel.h> // ark includes #include "arkapp.h" diff --git a/ark/mainwindow.h b/ark/mainwindow.h index 21952fd..b77dec5 100644 --- a/ark/mainwindow.h +++ b/ark/mainwindow.h @@ -30,7 +30,7 @@ #include <tqtimer.h> // KDE includes -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tdeparts/mainwindow.h> #include <tdeparts/part.h> #include <kprogress.h> diff --git a/ark/searchbar.cpp b/ark/searchbar.cpp index 1d13a58..a1fee6f 100644 --- a/ark/searchbar.cpp +++ b/ark/searchbar.cpp @@ -21,12 +21,12 @@ #include "searchbar.h" -#include <klistviewsearchline.h> -#include <klistview.h> +#include <tdelistviewsearchline.h> +#include <tdelistview.h> #include <kcombobox.h> #include <klocale.h> -#include <kaction.h> -#include <kactioncollection.h> +#include <tdeaction.h> +#include <tdeactioncollection.h> #include <tqlabel.h> #include <tqapplication.h> diff --git a/ark/searchbar.h b/ark/searchbar.h index 52a6d56..c4a1396 100644 --- a/ark/searchbar.h +++ b/ark/searchbar.h @@ -21,7 +21,7 @@ * */ -#include <klistviewsearchline.h> +#include <tdelistviewsearchline.h> #include <tqwidget.h> |