diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:56 -0600 |
| commit | ece35c015c54312eb13f583cc247cdd9a4051b4d (patch) | |
| tree | 2c0599b8705e881f2b53678f48e97ffe4f616d22 /kpresenter | |
| parent | c260bb1b22af487f2410c2c7f6c35db3fe1d57b9 (diff) | |
| download | koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.tar.gz koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kpresenter')
| -rw-r--r-- | kpresenter/KPrCanvas.cpp | 2 | ||||
| -rw-r--r-- | kpresenter/KPrConfig.cpp | 4 | ||||
| -rw-r--r-- | kpresenter/KPrPresDurationDia.cpp | 2 | ||||
| -rw-r--r-- | kpresenter/KPrSideBar.h | 2 | ||||
| -rw-r--r-- | kpresenter/KPrTextObject.cpp | 2 | ||||
| -rw-r--r-- | kpresenter/KPrView.cpp | 10 | ||||
| -rw-r--r-- | kpresenter/KPrWebPresentation.cpp | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index 358c852b..0089caf8 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -29,7 +29,7 @@ #include <tqpaintdevicemetrics.h> #include <tqwmatrix.h> #include <tqapplication.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqimage.h> #include <tqdatetime.h> #include <tqdropsite.h> diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index 4009382c..5274c357 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -64,13 +64,13 @@ #include <tqlineedit.h> #include "KPrCommand.h" #include <tqvgroupbox.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <klineedit.h> #include <KoRect.h> #include <kmessagebox.h> #include <tdeversion.h> #include <kurlrequesterdlg.h> -#include <klistview.h> +#include <tdelistview.h> #include <tdefiledialog.h> #include <KoEditPath.h> diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp index 2591e4c5..aae5659e 100644 --- a/kpresenter/KPrPresDurationDia.cpp +++ b/kpresenter/KPrPresDurationDia.cpp @@ -26,7 +26,7 @@ #include <tqheader.h> #include <tqvbox.h> #include <tqlayout.h> -#include <klistview.h> +#include <tdelistview.h> #include <kdebug.h> #include <klocale.h> diff --git a/kpresenter/KPrSideBar.h b/kpresenter/KPrSideBar.h index 542e8c39..a1190bdb 100644 --- a/kpresenter/KPrSideBar.h +++ b/kpresenter/KPrSideBar.h @@ -27,7 +27,7 @@ #include <tqvalidator.h> #include <kiconview.h> -#include <klistview.h> +#include <tdelistview.h> class TQListViewItem; class KPrDocument; diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index d0782541..35961bab 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -61,7 +61,7 @@ #include <tqclipboard.h> #include <KoParagCounter.h> -#include <kaction.h> +#include <tdeaction.h> #include <KoVariable.h> #include <KoCustomVariablesDia.h> #include <KoRuler.h> diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index ee68f7a5..f96b095d 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -19,7 +19,7 @@ */ #include <kprinter.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <kglobalsettings.h> #include <tqpainter.h> #include <tqscrollbar.h> @@ -79,7 +79,7 @@ #include <klocale.h> #include <kcolordialog.h> #include <tdeconfig.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kglobal.h> #include <kimageio.h> #include <tdeparts/event.h> @@ -96,7 +96,7 @@ #include <KoTemplateCreateDia.h> #include <kcoloractions.h> #include <tkcoloractions.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqspinbox.h> #include <tqcombobox.h> #include <KoPartSelectAction.h> @@ -144,9 +144,9 @@ #include <KoCommentDia.h> #include "KPrDuplicateObjDia.h" -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <KoDocumentInfo.h> -#include <kaccelgen.h> +#include <tdeaccelgen.h> #include "KPrImportStyleDia.h" #include <kurldrag.h> #include <config.h> diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index 9dd7e2f8..f4bf8fed 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -67,7 +67,7 @@ #include <kcharsets.h> #include <kurlrequester.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <knuminput.h> #include <kcombobox.h> #include <kurl.h> |