diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:48:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:48:17 -0600 |
| commit | 63f984a752aa6a6a73e3af795b05a5a042833eff (patch) | |
| tree | 89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /filters/kspread/csv | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'filters/kspread/csv')
| -rw-r--r-- | filters/kspread/csv/csvdialog.cpp | 4 | ||||
| -rw-r--r-- | filters/kspread/csv/csvexport.cc | 2 | ||||
| -rw-r--r-- | filters/kspread/csv/csvexportdialog.cpp | 4 | ||||
| -rw-r--r-- | filters/kspread/csv/csvimport.cc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp index d4173bd3..1e721d16 100644 --- a/filters/kspread/csv/csvdialog.cpp +++ b/filters/kspread/csv/csvdialog.cpp @@ -36,9 +36,9 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcharsets.h> CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /*seperator*/) diff --git a/filters/kspread/csv/csvexport.cc b/filters/kspread/csv/csvexport.cc index c7a3b6c0..ceeb8b5e 100644 --- a/filters/kspread/csv/csvexport.cc +++ b/filters/kspread/csv/csvexport.cc @@ -24,7 +24,7 @@ #include <tqtextcodec.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kgenericfactory.h> #include <KoFilterChain.h> #include <KoFilterManager.h> diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp index c136fd91..ebf1523e 100644 --- a/filters/kspread/csv/csvexportdialog.cpp +++ b/filters/kspread/csv/csvexportdialog.cpp @@ -40,10 +40,10 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcharsets.h> using namespace KSpread; diff --git a/filters/kspread/csv/csvimport.cc b/filters/kspread/csv/csvimport.cc index f5c4262a..72cadfa2 100644 --- a/filters/kspread/csv/csvimport.cc +++ b/filters/kspread/csv/csvimport.cc @@ -24,7 +24,7 @@ #include <tqregexp.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <kgenericfactory.h> |