diff options
Diffstat (limited to 'lib/kotext')
34 files changed, 56 insertions, 56 deletions
diff --git a/lib/kotext/DateFormatWidget.cpp b/lib/kotext/DateFormatWidget.cpp index 49749f91d..f72bbbd36 100644 --- a/lib/kotext/DateFormatWidget.cpp +++ b/lib/kotext/DateFormatWidget.cpp @@ -7,8 +7,8 @@ #include <tqlabel.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqlineedit.h> #include <kdebug.h> #include <knuminput.h> diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp index b6268a760..b3d0c7aa6 100644 --- a/lib/kotext/KoAutoFormat.cpp +++ b/lib/kotext/KoAutoFormat.cpp @@ -30,11 +30,11 @@ #include <tdeversion.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> #include <tdeconfig.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kcommand.h> //#include <KoTextFormat.h> #include <kcompletion.h> @@ -169,7 +169,7 @@ KoAutoFormat::KoAutoFormat( KoDocument *_doc, KoVariableCollection *_varCollecti TDELocale klocale(m_doc->instance()->instanceName()); for (int i = 1; i <=7; i++) { - m_cacheNameOfDays.append(klocale.calendar()->weekDayName( i ).lower()); + m_cacheNameOfDays.append(tdelocale.calendar()->weekDayName( i ).lower()); } } @@ -392,7 +392,7 @@ void KoAutoFormat::readAutoCorrectConfig() { Q_ASSERT( m_entries.isEmpty() ); // readConfig is only called once... TDELocale klocale(m_doc->instance()->instanceName()); - TQString kdelang = klocale.languageList().front(); + TQString kdelang = tdelocale.languageList().front(); kdelang.remove( TQRegExp( "@.*" ) ); kdDebug(32500) << "KoAutoFormat: m_autoFormatLanguage=" << m_autoFormatLanguage << " kdelang=" << kdelang << endl; TQString fname; @@ -620,7 +620,7 @@ void KoAutoFormat::saveConfig() TDEConfigGroupSaver cgs( config, "AutoFormat" ); config->writeEntry( "ConvertUpperCase", m_convertUpperCase ); - config->writeEntry( "formatLanguage", m_autoFormatLanguage=="all_languages" ? klocale.languageList().front() : m_autoFormatLanguage); + config->writeEntry( "formatLanguage", m_autoFormatLanguage=="all_languages" ? tdelocale.languageList().front() : m_autoFormatLanguage); config->writeEntry( "ConvertUpperUpper", m_convertUpperUpper ); config->writeEntry( "includeTwoLetterException", m_includeTwoUpperLetterException ); @@ -733,7 +733,7 @@ void KoAutoFormat::saveConfig() begin.appendChild(simpleQuote); TQFile f; if ( m_autoFormatLanguage.isEmpty()) - f.setName(locateLocal("data", "koffice/autocorrect/"+klocale.languageList().front() + ".xml",m_doc->instance())); + f.setName(locateLocal("data", "koffice/autocorrect/"+tdelocale.languageList().front() + ".xml",m_doc->instance())); else f.setName(locateLocal("data", "koffice/autocorrect/"+m_autoFormatLanguage + ".xml",m_doc->instance())); if(!f.open(IO_WriteOnly)) { diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index 60b74bb00..c48236874 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -23,8 +23,8 @@ #include "KoCharSelectDia.h" #include <KoSearchDia.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdelistview.h> #include <kstandarddirs.h> diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp index 3df928a13..6546c51cc 100644 --- a/lib/kotext/KoBgSpellCheck.cpp +++ b/lib/kotext/KoBgSpellCheck.cpp @@ -38,7 +38,7 @@ #include <tdespell2/filter.h> using namespace KSpell2; -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeversion.h> #include <tqtimer.h> diff --git a/lib/kotext/KoChangeCaseDia.cpp b/lib/kotext/KoChangeCaseDia.cpp index cde58f0a7..a7cff7c22 100644 --- a/lib/kotext/KoChangeCaseDia.cpp +++ b/lib/kotext/KoChangeCaseDia.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include <tqwhatsthis.h> diff --git a/lib/kotext/KoCommentDia.cpp b/lib/kotext/KoCommentDia.cpp index e313d5b2c..727c6e5b9 100644 --- a/lib/kotext/KoCommentDia.cpp +++ b/lib/kotext/KoCommentDia.cpp @@ -17,13 +17,13 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include <tqmultilineedit.h> #include "KoCommentDia.h" #include <tqlayout.h> #include <tqpushbutton.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqdatetime.h> #include <tqlabel.h> #include <kdebug.h> diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp index 031a8122a..c500cca40 100644 --- a/lib/kotext/KoCompletionDia.cpp +++ b/lib/kotext/KoCompletionDia.cpp @@ -19,8 +19,8 @@ #include "KoCompletionDia.h" #include "KoAutoFormat.h" -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kinputdialog.h> #include <kcompletion.h> #include <tdeconfig.h> diff --git a/lib/kotext/KoCreateStyleDia.cpp b/lib/kotext/KoCreateStyleDia.cpp index fb7d9b9d8..93c3dafd1 100644 --- a/lib/kotext/KoCreateStyleDia.cpp +++ b/lib/kotext/KoCreateStyleDia.cpp @@ -17,13 +17,13 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include <tqlabel.h> #include <tqlineedit.h> #include "KoCreateStyleDia.h" -#include <kmessagebox.h> +#include <tdemessagebox.h> KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *parent, const char *name ) : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true ) diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp index dd32a80eb..a331596a3 100644 --- a/lib/kotext/KoCustomVariablesDia.cpp +++ b/lib/kotext/KoCustomVariablesDia.cpp @@ -20,7 +20,7 @@ #include "KoCustomVariablesDia.h" #include "KoCustomVariablesDia.moc" -#include <klocale.h> +#include <tdelocale.h> #include <kbuttonbox.h> #include <tqcombobox.h> diff --git a/lib/kotext/KoDecorationTab.cpp b/lib/kotext/KoDecorationTab.cpp index 73e0789e5..93b24a53d 100644 --- a/lib/kotext/KoDecorationTab.cpp +++ b/lib/kotext/KoDecorationTab.cpp @@ -23,7 +23,7 @@ #include <kcolorbutton.h> #include <kpushbutton.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqbuttongroup.h> diff --git a/lib/kotext/KoFontDia.cpp b/lib/kotext/KoFontDia.cpp index 1d82214c9..fbde50285 100644 --- a/lib/kotext/KoFontDia.cpp +++ b/lib/kotext/KoFontDia.cpp @@ -25,7 +25,7 @@ #include "KoRichText.h" #include <kcolordialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqgroupbox.h> diff --git a/lib/kotext/KoFontDiaPreview.cpp b/lib/kotext/KoFontDiaPreview.cpp index f61306b07..adf7594dc 100644 --- a/lib/kotext/KoFontDiaPreview.cpp +++ b/lib/kotext/KoFontDiaPreview.cpp @@ -21,7 +21,7 @@ #include "KoGlobal.h" #include "KoTextFormat.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqfontmetrics.h> #include <tqrect.h> diff --git a/lib/kotext/KoImportStyleDia.cpp b/lib/kotext/KoImportStyleDia.cpp index 6d9d57d65..1e048939e 100644 --- a/lib/kotext/KoImportStyleDia.cpp +++ b/lib/kotext/KoImportStyleDia.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include <tqlayout.h> #include <tqlineedit.h> diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index 200b1f327..b62a148fd 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -33,7 +33,7 @@ #include <kcolorbutton.h> #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <knumvalidator.h> #include <KoGlobal.h> #include <tqgroupbox.h> diff --git a/lib/kotext/KoParagLayout.cpp b/lib/kotext/KoParagLayout.cpp index 7fd214be7..1978d88c1 100644 --- a/lib/kotext/KoParagLayout.cpp +++ b/lib/kotext/KoParagLayout.cpp @@ -27,8 +27,8 @@ #include <KoDom.h> #include <KoGenStyles.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqdom.h> #include <tqbuffer.h> diff --git a/lib/kotext/KoParagStyle.cpp b/lib/kotext/KoParagStyle.cpp index fcae882c3..2af7cecb0 100644 --- a/lib/kotext/KoParagStyle.cpp +++ b/lib/kotext/KoParagStyle.cpp @@ -25,7 +25,7 @@ #include <KoXmlNS.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdom.h> diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp index d9d6c1dfa..9121c59f4 100644 --- a/lib/kotext/KoRichText.cpp +++ b/lib/kotext/KoRichText.cpp @@ -45,8 +45,8 @@ #include "KoTextDocument.h" #include <kdebug.h> #include <tdeversion.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqtextengine_p.h> //#define DEBUG_COLLECTION diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp index 52aba2370..55a4c56b0 100644 --- a/lib/kotext/KoSearchDia.cpp +++ b/lib/kotext/KoSearchDia.cpp @@ -30,7 +30,7 @@ #include <kcommand.h> #include <kdebug.h> #include <tdefontcombo.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> #include <tqbuttongroup.h> diff --git a/lib/kotext/KoSpell.cpp b/lib/kotext/KoSpell.cpp index 2a9e5476c..8e96a44f5 100644 --- a/lib/kotext/KoSpell.cpp +++ b/lib/kotext/KoSpell.cpp @@ -29,8 +29,8 @@ #include <tdespell2/broker.h> #include <tdespell2/filter.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqtimer.h> diff --git a/lib/kotext/KoStyleCollection.cpp b/lib/kotext/KoStyleCollection.cpp index fa0818d88..a29dbd84a 100644 --- a/lib/kotext/KoStyleCollection.cpp +++ b/lib/kotext/KoStyleCollection.cpp @@ -27,7 +27,7 @@ #include <KoXmlNS.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdom.h> diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp index 0738f0e37..0a77bb42a 100644 --- a/lib/kotext/KoStyleManager.cpp +++ b/lib/kotext/KoStyleManager.cpp @@ -24,7 +24,7 @@ #include <KoFontDia.h> #include <KoGlobal.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/lib/kotext/KoTextCommand.cpp b/lib/kotext/KoTextCommand.cpp index 875c1e71e..c624514cb 100644 --- a/lib/kotext/KoTextCommand.cpp +++ b/lib/kotext/KoTextCommand.cpp @@ -22,7 +22,7 @@ #include "KoTextParag.h" #include "KoVariable.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // This is automatically called by KCommandHistory's redo action when redo is activated void KoTextCommand::execute() diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp index 0f3d48d23..4648898d0 100644 --- a/lib/kotext/KoTextFormat.cpp +++ b/lib/kotext/KoTextFormat.cpp @@ -25,9 +25,9 @@ #include <KoGenStyles.h> #include <KoXmlNS.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqapplication.h> #include <tqregexp.h> diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index 0b8d9ab59..cae6e9e40 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -31,7 +31,7 @@ #include <KoXmlNS.h> #include <KoDom.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp index c9f0a8310..c4042779f 100644 --- a/lib/kotext/KoTextParag.cpp +++ b/lib/kotext/KoTextParag.cpp @@ -29,10 +29,10 @@ #include <KoGenStyles.h> #include <KoDom.h> #include <KoXmlNS.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <assert.h> //#define DEBUG_PAINT diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index a261d59f4..f6cdf4c46 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -26,14 +26,14 @@ #include "KoBgSpellCheck.h" #include "KoVariable.h" -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdestdaccel.h> #include <kdebug.h> #include <kinstance.h> #include <kdatatool.h> #include <krun.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcommand.h> #include <kbookmarkmanager.h> #include <kbookmark.h> diff --git a/lib/kotext/KoUserStyle.cpp b/lib/kotext/KoUserStyle.cpp index 33de34216..4584735fd 100644 --- a/lib/kotext/KoUserStyle.cpp +++ b/lib/kotext/KoUserStyle.cpp @@ -17,7 +17,7 @@ */ #include "KoUserStyle.h" -#include <klocale.h> +#include <tdelocale.h> KoUserStyle::KoUserStyle( const TQString & name ) : m_name( name ), m_displayName( i18n( "Style name", name.utf8() ) ) diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index 089b09d10..fb1b6c1c0 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -36,9 +36,9 @@ #include <KoXmlNS.h> #include <KoDom.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdialogbase.h> #include <tdeconfig.h> #include <tdeversion.h> diff --git a/lib/kotext/TDEFontDialog_local.cpp b/lib/kotext/TDEFontDialog_local.cpp index fdf7c568d..a5db65230 100644 --- a/lib/kotext/TDEFontDialog_local.cpp +++ b/lib/kotext/TDEFontDialog_local.cpp @@ -45,11 +45,11 @@ #include <kcharsets.h> #include <tdeconfig.h> #include <kdialog.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <tqlineedit.h> #include <tdelistbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kdebug.h> #include <knuminput.h> diff --git a/lib/kotext/TimeFormatWidget.cpp b/lib/kotext/TimeFormatWidget.cpp index 066039696..5bbd3d1fc 100644 --- a/lib/kotext/TimeFormatWidget.cpp +++ b/lib/kotext/TimeFormatWidget.cpp @@ -7,8 +7,8 @@ #include <tqlabel.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlineedit.h> #include <knuminput.h> diff --git a/lib/kotext/kohyphen/kohyphen.cpp b/lib/kotext/kohyphen/kohyphen.cpp index bbb3ebb98..ddc09dc21 100644 --- a/lib/kotext/kohyphen/kohyphen.cpp +++ b/lib/kotext/kohyphen/kohyphen.cpp @@ -24,7 +24,7 @@ #include <tqtextcodec.h> #include <tqstring.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> diff --git a/lib/kotext/kolayouttabbase.ui b/lib/kotext/kolayouttabbase.ui index 646bc7952..cddc47984 100644 --- a/lib/kotext/kolayouttabbase.ui +++ b/lib/kotext/kolayouttabbase.ui @@ -286,7 +286,7 @@ </connections> <includes> <include location="global" impldecl="in declaration">knuminput.h</include> - <include location="global" impldecl="in declaration">klocale.h</include> + <include location="global" impldecl="in declaration">tdelocale.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> <includehints> diff --git a/lib/kotext/tests/KoUserStyleTester.cpp b/lib/kotext/tests/KoUserStyleTester.cpp index 72e5081ce..6a0360aa6 100644 --- a/lib/kotext/tests/KoUserStyleTester.cpp +++ b/lib/kotext/tests/KoUserStyleTester.cpp @@ -24,7 +24,7 @@ #include <KoUserStyleCollection.h> #include <KoUserStyle.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "KoUserStyleTester.h" #include "KoUserStyleTester.moc" diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp index a02866460..74014c2d5 100644 --- a/lib/kotext/tests/kotextformattertest.cpp +++ b/lib/kotext/tests/kotextformattertest.cpp @@ -2,8 +2,8 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "KoTextFormatter.h" #include "KoTextFormat.h" |