diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 23:12:56 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 23:12:56 -0600 |
commit | ece35c015c54312eb13f583cc247cdd9a4051b4d (patch) | |
tree | 2c0599b8705e881f2b53678f48e97ffe4f616d22 /filters | |
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 'filters')
-rw-r--r-- | filters/chalk/pdf/kis_pdf_import_widget.cpp | 2 | ||||
-rw-r--r-- | filters/chalk/pdf/pdfimportwidgetbase.ui | 2 | ||||
-rw-r--r-- | filters/kspread/kexi/kspread_kexiimport.cc | 2 | ||||
-rw-r--r-- | filters/kspread/kexi/kspread_kexiimportdialog.cc | 2 | ||||
-rw-r--r-- | filters/kspread/kexi/kspread_kexiimportdialogbase.ui | 2 | ||||
-rw-r--r-- | filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc | 2 | ||||
-rw-r--r-- | filters/kspread/latex/export/latexexportdia.ui | 4 | ||||
-rw-r--r-- | filters/kword/latex/export/kwordlatexexportdia.cc | 2 | ||||
-rw-r--r-- | filters/kword/latex/export/latexexportdia.ui | 4 | ||||
-rw-r--r-- | filters/xsltfilter/export/xsltexportdia.cc | 2 | ||||
-rw-r--r-- | filters/xsltfilter/import/xsltimportdia.cc | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/filters/chalk/pdf/kis_pdf_import_widget.cpp b/filters/chalk/pdf/kis_pdf_import_widget.cpp index c395d9e9..572efbd5 100644 --- a/filters/chalk/pdf/kis_pdf_import_widget.cpp +++ b/filters/chalk/pdf/kis_pdf_import_widget.cpp @@ -27,7 +27,7 @@ // KDE's headers #include <kdebug.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <knuminput.h> KisPDFImportWidget::KisPDFImportWidget(Poppler::Document* pdfDoc, TQWidget * parent, const char * name) diff --git a/filters/chalk/pdf/pdfimportwidgetbase.ui b/filters/chalk/pdf/pdfimportwidgetbase.ui index e624cec8..7c6c74c8 100644 --- a/filters/chalk/pdf/pdfimportwidgetbase.ui +++ b/filters/chalk/pdf/pdfimportwidgetbase.ui @@ -316,6 +316,6 @@ <includehint>kcombobox.h</includehint> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> </includehints> </UI> diff --git a/filters/kspread/kexi/kspread_kexiimport.cc b/filters/kspread/kexi/kspread_kexiimport.cc index ac725982..0c025525 100644 --- a/filters/kspread/kexi/kspread_kexiimport.cc +++ b/filters/kspread/kexi/kspread_kexiimport.cc @@ -52,7 +52,7 @@ #include <kgenericfactory.h> #include <klocale.h> #include <kmessagebox.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqcolor.h> typedef KGenericFactory<KSpreadKexiImport, KoFilter> KSpreadKexiImportFactory; diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.cc b/filters/kspread/kexi/kspread_kexiimportdialog.cc index 0c91952c..090b4de1 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialog.cc +++ b/filters/kspread/kexi/kspread_kexiimportdialog.cc @@ -32,7 +32,7 @@ #include <kdebug.h> #include <kglobal.h> #include <kpushbutton.h> -#include <klistview.h> +#include <tdelistview.h> #include <kcombobox.h> #include <tqradiobutton.h> #include <tqtextedit.h> diff --git a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui index b58a8678..2286506e 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui +++ b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui @@ -239,6 +239,6 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc index 9c6e0432..07957af9 100644 --- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc +++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc @@ -31,7 +31,7 @@ #include <klocale.h> #include <tdeconfig.h> #include <kstandarddirs.h> -#include <krecentdocument.h> +#include <tderecentdocument.h> #include <ktempfile.h> #include <kurlrequester.h> #include <tdefiledialog.h> diff --git a/filters/kspread/latex/export/latexexportdia.ui b/filters/kspread/latex/export/latexexportdia.ui index 85477aa2..530ec8ca 100644 --- a/filters/kspread/latex/export/latexexportdia.ui +++ b/filters/kspread/latex/export/latexexportdia.ui @@ -668,7 +668,7 @@ <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kcombobox.h</includehint> - <includehint>klistbox.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> + <includehint>tdelistbox.h</includehint> </includehints> </UI> diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc index cbde5f5d..eac7cd6f 100644 --- a/filters/kword/latex/export/kwordlatexexportdia.cc +++ b/filters/kword/latex/export/kwordlatexexportdia.cc @@ -31,7 +31,7 @@ #include <klocale.h> #include <tdeconfig.h> #include <kstandarddirs.h> -#include <krecentdocument.h> +#include <tderecentdocument.h> #include <ktempfile.h> #include <kurlrequester.h> #include <tdefiledialog.h> diff --git a/filters/kword/latex/export/latexexportdia.ui b/filters/kword/latex/export/latexexportdia.ui index 85477aa2..530ec8ca 100644 --- a/filters/kword/latex/export/latexexportdia.ui +++ b/filters/kword/latex/export/latexexportdia.ui @@ -668,7 +668,7 @@ <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kcombobox.h</includehint> - <includehint>klistbox.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> + <includehint>tdelistbox.h</includehint> </includehints> </UI> diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc index 56f7a2e0..923b2dee 100644 --- a/filters/xsltfilter/export/xsltexportdia.cc +++ b/filters/xsltfilter/export/xsltexportdia.cc @@ -30,7 +30,7 @@ #include <tdeconfig.h> #include <tdeversion.h> #include <kstandarddirs.h> -#include <krecentdocument.h> +#include <tderecentdocument.h> #include <ktempfile.h> #include <tdefiledialog.h> #include <kdebug.h> diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc index e232d26e..67d6aec0 100644 --- a/filters/xsltfilter/import/xsltimportdia.cc +++ b/filters/xsltfilter/import/xsltimportdia.cc @@ -31,7 +31,7 @@ #include <klocale.h> #include <kstandarddirs.h> #include <kglobal.h> -#include <krecentdocument.h> +#include <tderecentdocument.h> #include <KoFilterManager.h> #include <ktempfile.h> #include <kdebug.h> |