summaryrefslogtreecommitdiffstats
path: root/filters/kspread
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 08:03:36 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 08:03:36 -0600
commit0dda6e85e171acf1a73dc8d3d1f67b4fcc9b1ae7 (patch)
treeb55740ff9d132b25792ca3fd60e37497402b5036 /filters/kspread
parentac04782336b6a026b44df9d51ba9ca008a712da2 (diff)
downloadkoffice-0dda6e85e171acf1a73dc8d3d1f67b4fcc9b1ae7.tar.gz
koffice-0dda6e85e171acf1a73dc8d3d1f67b4fcc9b1ae7.zip
Rename KLocale to enhance compatibility with KDE4
Diffstat (limited to 'filters/kspread')
-rw-r--r--filters/kspread/libkspreadexport/KSpreadLeader.cc4
-rw-r--r--filters/kspread/opencalc/opencalcexport.cc4
-rw-r--r--filters/kspread/opencalc/opencalcexport.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/filters/kspread/libkspreadexport/KSpreadLeader.cc b/filters/kspread/libkspreadexport/KSpreadLeader.cc
index b1b9a0aa..8e300c7d 100644
--- a/filters/kspread/libkspreadexport/KSpreadLeader.cc
+++ b/filters/kspread/libkspreadexport/KSpreadLeader.cc
@@ -186,8 +186,8 @@ KoFilter::ConversionStatus Leader::doSpreadBook(KSpreadDoc *document) {
docSpreadBookProperty["dateformat"] = document->locale()->dateFormat();
docSpreadBookProperty["dateformatshort"] = document->locale()->dateFormatShort();
docSpreadBookProperty["timeformat"] = document->locale()->timeFormat();
- docSpreadBookProperty["defaultlanguage"] = KLocale::defaultLanguage();
- docSpreadBookProperty["defaultcountry"] = KLocale::defaultCountry();
+ docSpreadBookProperty["defaultlanguage"] = TDELocale::defaultLanguage();
+ docSpreadBookProperty["defaultcountry"] = TDELocale::defaultCountry();
docSpreadBookProperty["defaultgridpencolorname"] = document->defaultGridPen().color().name();
docSpreadBookProperty["defaultgridpencolorred"] = TQString::number(document->defaultGridPen().color().red());
docSpreadBookProperty["defaultgridpencolorgreen"] = TQString::number(document->defaultGridPen().color().green());
diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc
index 04e25541..f092d6b1 100644
--- a/filters/kspread/opencalc/opencalcexport.cc
+++ b/filters/kspread/opencalc/opencalcexport.cc
@@ -832,13 +832,13 @@ void OpenCalcExport::exportDefaultCellStyle( TQDomDocument & doc, TQDomElement &
Doc * ksdoc = static_cast<Doc *>(document);
Format * format = new Format( 0, ksdoc->styleManager()->defaultStyle() );
- const KLocale *locale = ksdoc->locale();
+ const TDELocale *locale = ksdoc->locale();
TQString language;
TQString country;
TQString charSet;
TQString l( locale->language() );
- KLocale::splitLocale( l, language, country, charSet );
+ TDELocale::splitLocale( l, language, country, charSet );
TQFont font( format->font() );
m_styles.addFont( font, true );
diff --git a/filters/kspread/opencalc/opencalcexport.h b/filters/kspread/opencalc/opencalcexport.h
index 173c1cd3..837e4934 100644
--- a/filters/kspread/opencalc/opencalcexport.h
+++ b/filters/kspread/opencalc/opencalcexport.h
@@ -28,7 +28,7 @@
class TQDomDocument;
class TQDomElement;
-class KLocale;
+class TDELocale;
class KoStore;
namespace KSpread
@@ -84,7 +84,7 @@ class OpenCalcExport : public KoFilter
TQString convertFormula( TQString const & formula ) const;
private:
/// Pointer to the KSpread locale
- KLocale* m_locale;
+ TDELocale* m_locale;
};
#endif