summaryrefslogtreecommitdiffstats
path: root/lib/kotext
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kotext')
-rw-r--r--lib/kotext/KFontDialog_local.cpp8
-rw-r--r--lib/kotext/KoAutoFormatDia.cpp2
-rw-r--r--lib/kotext/KoCommentDia.cpp4
-rw-r--r--lib/kotext/KoParagDia.cpp4
-rw-r--r--lib/kotext/KoParagLayout.cpp2
-rw-r--r--lib/kotext/KoTextFormat.cpp4
-rw-r--r--lib/kotext/KoTextParag.cpp2
-rw-r--r--lib/kotext/KoVariable.cpp38
-rw-r--r--lib/kotext/tests/kotextformattertest.cpp4
9 files changed, 34 insertions, 34 deletions
diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp
index 8be2f699..1dbed289 100644
--- a/lib/kotext/KFontDialog_local.cpp
+++ b/lib/kotext/KFontDialog_local.cpp
@@ -293,7 +293,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name,
row ++;
sampleEdit = new TQLineEdit( page, "sampleEdit");
- TQFont tmpFont( KGlobalSettings::generalFont().family(), 64, TQFont::Black );
+ TQFont tmpFont( TDEGlobalSettings::generalFont().family(), 64, TQFont::Black );
sampleEdit->setFont(tmpFont);
sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog"));
sampleEdit->setMinimumHeight( sampleEdit->fontMetrics().lineSpacing() );
@@ -327,12 +327,12 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name,
vbox->addWidget( xlfdEdit );
// lets initialize the display if possible
- setFont( KGlobalSettings::generalFont(), usingFixed );
+ setFont( TDEGlobalSettings::generalFont(), usingFixed );
// check or uncheck or gray out the "relative" checkbox
if( sizeIsRelativeState && sizeIsRelativeCheckBox )
setSizeIsRelative( *sizeIsRelativeState );
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfigGroupSaver saver(config, TQString::fromLatin1("General"));
showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false));
}
@@ -725,7 +725,7 @@ void KFontChooser_local::setFamilyList( TQStringList list )
familyListBox->blockSignals( true );
familyListBox->clear();
familyListBox->insertStringList( list );
- setFont( KGlobalSettings::generalFont(), usingFixed );
+ setFont( TDEGlobalSettings::generalFont(), usingFixed );
familyListBox->blockSignals( false );
}
diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp
index 74b35908..eacf63a3 100644
--- a/lib/kotext/KoAutoFormatDia.cpp
+++ b/lib/kotext/KoAutoFormatDia.cpp
@@ -512,7 +512,7 @@ void KoAutoFormatDia::setupTab3()
{
if ( !(*it).contains("autocorrect"))
{
- TQString readableName = KGlobal::locale()->twoAlphaToCountryName((*it).left((*it).length()-4));
+ TQString readableName = TDEGlobal::locale()->twoAlphaToCountryName((*it).left((*it).length()-4));
TQString tmp;
if ( readableName.isEmpty() )
tmp =(*it).left((*it).length()-4);
diff --git a/lib/kotext/KoCommentDia.cpp b/lib/kotext/KoCommentDia.cpp
index 9882e6de..e313d5b2 100644
--- a/lib/kotext/KoCommentDia.cpp
+++ b/lib/kotext/KoCommentDia.cpp
@@ -64,8 +64,8 @@ TQString KoCommentDia::commentText()
void KoCommentDia::slotAddAuthorName()
{
- TQString date = KGlobal::locale()->formatDate( TQDate::currentDate() );
- TQString time = KGlobal::locale()->formatTime( TQTime::currentTime() );
+ TQString date = TDEGlobal::locale()->formatDate( TQDate::currentDate() );
+ TQString time = TDEGlobal::locale()->formatTime( TQTime::currentTime() );
TQString result = TQString("--------%1 ,%2, %3------\n").arg(authorName).arg(date).arg(time);
m_multiLine->insertLine( result, m_multiLine->numLines() );
}
diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp
index 0e38c8b5..200b1f32 100644
--- a/lib/kotext/KoParagDia.cpp
+++ b/lib/kotext/KoParagDia.cpp
@@ -794,7 +794,7 @@ KoStylePreview::KoStylePreview( const TQString& title, const TQString& text, TQW
setMinimumHeight(80);
m_zoomHandler = new KoTextZoomHandler;
TQFont font = KoGlobal::defaultFont();
- m_textdoc = new KoTextDocument( m_zoomHandler, new KoTextFormatCollection( font, TQColor(), KGlobal::locale()->language(), false ) );
+ m_textdoc = new KoTextDocument( m_zoomHandler, new KoTextFormatCollection( font, TQColor(), TDEGlobal::locale()->language(), false ) );
m_textdoc->setFlow( new MyFlow(this, m_zoomHandler) );
//m_textdoc->setWidth( KoTextZoomHandler::ptToLayoutUnitPt( 1000 ) );
@@ -1827,7 +1827,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram
sAlignChar = new TQLineEdit( bgAlign);
sAlignChar->setMaximumSize( TQSize( 60, 32767 ) );
- sAlignChar->setText(TQString(KGlobal::locale()->decimalSymbol()[0]));
+ sAlignChar->setText(TQString(TDEGlobal::locale()->decimalSymbol()[0]));
Layout8->addWidget( sAlignChar );
TQSpacerItem* spacer_2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
Layout8->addItem( spacer_2 );
diff --git a/lib/kotext/KoParagLayout.cpp b/lib/kotext/KoParagLayout.cpp
index 37fbbfb5..7fd214be 100644
--- a/lib/kotext/KoParagLayout.cpp
+++ b/lib/kotext/KoParagLayout.cpp
@@ -164,7 +164,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& layout, const TQDomElement&
tab.ptWidth = getAttribute( element, "width", 0.5 );
TQString alignCharStr = element.attribute("alignchar");
if ( alignCharStr.isEmpty() )
- tab.alignChar = KGlobal::locale()->decimalSymbol()[0];
+ tab.alignChar = TDEGlobal::locale()->decimalSymbol()[0];
else
tab.alignChar = alignCharStr[0];
tabList.append( tab );
diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp
index 2554d4ee..0f3d48d2 100644
--- a/lib/kotext/KoTextFormat.cpp
+++ b/lib/kotext/KoTextFormat.cpp
@@ -67,7 +67,7 @@ KoTextFormat::KoTextFormat()
m_strikeOutType = S_NONE;
m_underlineStyle = U_SOLID;
m_strikeOutStyle = S_SOLID;
- m_language = KGlobal::locale()->language();
+ m_language = TDEGlobal::locale()->language();
d->m_bHyphenation = false;
d->m_underLineWidth = 1.0;
d->m_shadowDistanceX = 0;
@@ -1678,7 +1678,7 @@ KoTextFormatCollection::KoTextFormatCollection()
#ifdef DEBUG_COLLECTION
kdDebug(32500) << "KoTextFormatCollection::KoTextFormatCollection " << this << endl;
#endif
- defFormat = new KoTextFormat( TQApplication::font(), TQColor(), KGlobal::locale()->language(), false );
+ defFormat = new KoTextFormat( TQApplication::font(), TQColor(), TDEGlobal::locale()->language(), false );
lastFormat = cres = 0;
cflags = -1;
cKey.setAutoDelete( TRUE );
diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp
index cc1aecb9..c9f0a831 100644
--- a/lib/kotext/KoTextParag.cpp
+++ b/lib/kotext/KoTextParag.cpp
@@ -3163,7 +3163,7 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
return;
painter.save();
//TQPen pen( cg.color( TQColorGroup::Highlight ) );
- TQPen pen( KGlobalSettings::linkColor() ); // #101820
+ TQPen pen( TDEGlobalSettings::linkColor() ); // #101820
painter.setPen( pen );
//kdDebug() << "KWTextParag::drawFormattingChars start=" << start << " len=" << len << " length=" << length() << endl;
if ( start + len == length() && ( whichFormattingChars & FormattingEndParag ) )
diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp
index 489752f0..6b040905 100644
--- a/lib/kotext/KoVariable.cpp
+++ b/lib/kotext/KoVariable.cpp
@@ -235,18 +235,18 @@ TQString KoVariableDateFormat::convert( const TQVariant& data ) const
return i18n("No date set"); // e.g. old KWord documents
if (m_strFormat.lower() == "locale" || m_strFormat.isEmpty())
- return KGlobal::locale()->formatDate( dateTime.date(), false );
+ return TDEGlobal::locale()->formatDate( dateTime.date(), false );
else if ( m_strFormat.lower() == "localeshort" )
- return KGlobal::locale()->formatDate( dateTime.date(), true );
+ return TDEGlobal::locale()->formatDate( dateTime.date(), true );
else if ( m_strFormat.lower() == "localedatetime" )
- return KGlobal::locale()->formatDateTime( dateTime, false );
+ return TDEGlobal::locale()->formatDateTime( dateTime, false );
else if ( m_strFormat.lower() == "localedatetimeshort" )
- return KGlobal::locale()->formatDateTime( dateTime, true );
+ return TDEGlobal::locale()->formatDateTime( dateTime, true );
TQString tmp ( dateTime.toString(m_strFormat) );
const int month = dateTime.date().month();
- tmp.replace("PPPP", KGlobal::locale()->calendar()->monthNamePossessive(month, false)); //long possessive month name
- tmp.replace("PPP", KGlobal::locale()->calendar()->monthNamePossessive(month, true)); //short possessive month name
+ tmp.replace("PPPP", TDEGlobal::locale()->calendar()->monthNamePossessive(month, false)); //long possessive month name
+ tmp.replace("PPP", TDEGlobal::locale()->calendar()->monthNamePossessive(month, true)); //short possessive month name
return tmp;
}
@@ -350,7 +350,7 @@ TQString KoVariableTimeFormat::convert( const TQVariant & time ) const
}
if( m_strFormat.lower() == "locale" || m_strFormat.isEmpty() )
- return KGlobal::locale()->formatTime( time.toTime() );
+ return TDEGlobal::locale()->formatTime( time.toTime() );
return time.toTime().toString(m_strFormat);
}
@@ -1198,11 +1198,11 @@ void KoDateVariable::resize()
TQString oldLanguage;
if ( !fmt->language().isEmpty())
{
- oldLanguage=KGlobal::locale()->language();
- bool changeLanguage = KGlobal::locale()->setLanguage( fmt->language() );
+ oldLanguage=TDEGlobal::locale()->language();
+ bool changeLanguage = TDEGlobal::locale()->setLanguage( fmt->language() );
KoVariable::resize();
if ( changeLanguage )
- KGlobal::locale()->setLanguage( oldLanguage );
+ TDEGlobal::locale()->setLanguage( oldLanguage );
}
else
KoVariable::resize();
@@ -1315,13 +1315,13 @@ void KoDateVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& context )
value.lower() == "localedatetimeshort" )
{
if ( value.lower() == "locale" || value.isEmpty())
- value = KGlobal::locale()->dateFormat();
+ value = TDEGlobal::locale()->dateFormat();
else if ( value.lower() == "localeshort" )
- value = KGlobal::locale()->dateFormatShort();
+ value = TDEGlobal::locale()->dateFormatShort();
else if ( value.lower() == "localedatetime" )
- value = TQString( "%1 %2" ).arg( KGlobal::locale()->dateFormat() ).arg( KGlobal::locale()->timeFormat() );
+ value = TQString( "%1 %2" ).arg( TDEGlobal::locale()->dateFormat() ).arg( TDEGlobal::locale()->timeFormat() );
else if ( value.lower() == "localedatetimeshort" )
- value = TQString( "%1 %2" ).arg( KGlobal::locale()->dateFormatShort() ).arg( KGlobal::locale()->timeFormat() );
+ value = TQString( "%1 %2" ).arg( TDEGlobal::locale()->dateFormatShort() ).arg( TDEGlobal::locale()->timeFormat() );
klocaleFormat = true;
}
writer.addAttribute( "style:data-style-name", KoOasisStyles::saveOasisDateStyle(context.mainStyles(), value, klocaleFormat ) );
@@ -1466,11 +1466,11 @@ void KoTimeVariable::resize()
KoTextFormat * fmt = format();
if ( !fmt->language().isEmpty() )
{
- TQString oldLanguage = KGlobal::locale()->language();
- bool changeLanguage = KGlobal::locale()->setLanguage( fmt->language() );
+ TQString oldLanguage = TDEGlobal::locale()->language();
+ bool changeLanguage = TDEGlobal::locale()->setLanguage( fmt->language() );
KoVariable::resize();
if ( changeLanguage )
- KGlobal::locale()->setLanguage( oldLanguage );
+ TDEGlobal::locale()->setLanguage( oldLanguage );
}
else
KoVariable::resize();
@@ -1570,7 +1570,7 @@ void KoTimeVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& context )
bool klocaleFormat = false;
if ( value.lower() == "locale" )
{
- value = KGlobal::locale()->timeFormat();
+ value = TDEGlobal::locale()->timeFormat();
klocaleFormat = true;
}
writer.addAttribute( "style:data-style-name", KoOasisStyles::saveOasisTimeStyle(context.mainStyles(), m_varFormat->formatProperties(), klocaleFormat ) );
@@ -2517,7 +2517,7 @@ TQString KoNoteVariable::fieldCode()
TQString KoNoteVariable::createdNote() const
{
- return KGlobal::locale()->formatDate( m_createdNoteDate, false );
+ return TDEGlobal::locale()->formatDate( m_createdNoteDate, false );
}
void KoNoteVariable::loadOasis( const TQDomElement &elem, KoOasisContext& /*context*/ )
diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp
index 38aab237..c75d8c89 100644
--- a/lib/kotext/tests/kotextformattertest.cpp
+++ b/lib/kotext/tests/kotextformattertest.cpp
@@ -205,8 +205,8 @@ int main (int argc, char ** argv)
TDEApplication app(argc, argv, "KoTextFormatter test");
// Don't let locale settings lead to different hyphenation output
- KGlobal::locale()->setLanguage( TQString::fromLatin1( "en_US" ) );
- KGlobal::locale()->setCountry( TQString::fromLatin1( "C" ) );
+ TDEGlobal::locale()->setLanguage( TQString::fromLatin1( "en_US" ) );
+ TDEGlobal::locale()->setCountry( TQString::fromLatin1( "C" ) );
KoTextFormatterTest test;
//test.speedTest();
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-09 17:49:53 +0000