diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
commit | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch) | |
tree | fb31321c80b12ee8e2237bdcf8c228fe44e67772 /kword | |
parent | fe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff) | |
download | koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kword')
-rw-r--r-- | kword/KWCanvas.cpp | 2 | ||||
-rw-r--r-- | kword/KWCommand.cpp | 2 | ||||
-rw-r--r-- | kword/KWConfig.cpp | 4 | ||||
-rw-r--r-- | kword/KWDocStruct.cpp | 14 | ||||
-rw-r--r-- | kword/KWDocument.cpp | 8 | ||||
-rw-r--r-- | kword/KWFactory.cpp | 2 | ||||
-rw-r--r-- | kword/KWStatisticsDialog.cpp | 4 | ||||
-rw-r--r-- | kword/KWTableStyleManager.cpp | 2 | ||||
-rw-r--r-- | kword/KWTextDocument.cpp | 2 | ||||
-rw-r--r-- | kword/KWTextParag.cpp | 2 | ||||
-rw-r--r-- | kword/KWView.cpp | 2 | ||||
-rw-r--r-- | kword/mailmerge/kabc/KWMailMergeKABC.cpp | 4 |
12 files changed, 24 insertions, 24 deletions
diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 4a469cca..042715b3 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -1779,7 +1779,7 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) // out of document window. Disabled because it conflicts with Shift+Tab inside a table. // else if ( keyev->key() == TQt::Key_BackTab ) // return FALSE; - else if ( keyev->key() == KGlobalSettings::contextMenuKey() ) { + else if ( keyev->key() == TDEGlobalSettings::contextMenuKey() ) { // The popups are not available in readonly mode, since the GUI isn't built... if(!m_doc->isReadWrite()) return TRUE; if (m_mouseMode != MM_EDIT) return TRUE; diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp index 5acb647e..d2adb65c 100644 --- a/kword/KWCommand.cpp +++ b/kword/KWCommand.cpp @@ -155,7 +155,7 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c ) TQDomElement formatElem = layout.namedItem( "FORMAT" ).toElement(); if ( !formatElem.isNull() ) { - KoTextFormat f = parag->loadFormat( formatElem, 0L, TQFont(), KGlobal::locale()->language(),false ); + KoTextFormat f = parag->loadFormat( formatElem, 0L, TQFont(), TDEGlobal::locale()->language(),false ); KoTextFormat * defaultFormat = doc->formatCollection()->format( &f ); // Last paragraph (i.e. only one in all) : some of the text might be from before the paste int endIndex = (item == count-1) ? c->index() : parag->string()->length() - 1; diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index 4fda082d..5959d39d 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -74,7 +74,7 @@ using namespace KSpell2; // little helper stolen from kmail // (Note: KDialogBase should have version of the methods that take a TQString for the icon name) static inline TQPixmap loadIcon( const char * name ) { - return KGlobal::instance()->iconLoader() + return TDEGlobal::instance()->iconLoader() ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); } @@ -911,7 +911,7 @@ void ConfigureDefaultDocPage::slotDefault() m_tabStopWidth->setValue( MM_TO_POINT(15) ); m_createBackupFile->setChecked( true ); // m_directInsertCursor->setChecked( false ); - m_globalLanguage->setCurrentText( KoGlobal::languageFromTag( KGlobal::locale()->language() ) ); + m_globalLanguage->setCurrentText( KoGlobal::languageFromTag( TDEGlobal::locale()->language() ) ); m_autoHyphenation->setChecked( false ); } diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp index 26d99146..cf850d14 100644 --- a/kword/KWDocStruct.cpp +++ b/kword/KWDocStruct.cpp @@ -721,22 +721,22 @@ KWDocStructRootItem::KWDocStructRootItem(TQListView* parent, const TQString& tex { switch ( type ) { case Arrangement: { - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "tree_arrange", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "tree_arrange", KIcon::Small ) ); } break; case TextFrames: { - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "frame_text", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_text", KIcon::Small ) ); } break; case FormulaFrames: { - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "frame_formula", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_formula", KIcon::Small ) ); }break; case Tables: { - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "inline_table", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "inline_table", KIcon::Small ) ); } break; case Pictures: { - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "frame_image", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_image", KIcon::Small ) ); } break; case Embedded: { - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "frame_query", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_query", KIcon::Small ) ); } break; } } @@ -1199,7 +1199,7 @@ KWDocStruct::KWDocStruct(TQWidget* parent, KWDocument* doc, KWGUI* gui) KToolBarButton* eraseButton = new KToolBarButton( "locationbar_erase", 0, searchBar ); m_tree = new KWDocStructTree( this, doc, gui ); - m_tree->setAlternateBackground( KGlobalSettings::alternateBackgroundColor() ); + m_tree->setAlternateBackground( TDEGlobalSettings::alternateBackgroundColor() ); KListViewSearchLine* searchLine = new KListViewSearchLine( searchBar, m_tree ); searchBar->setStretchableWidget( searchLine ); connect( eraseButton, TQT_SIGNAL( clicked() ), searchLine, TQT_SLOT( clear() ) ); diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index d5a82f5d..94651cf8 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -213,7 +213,7 @@ KWDocument::KWDocument(TQWidget *parentWidget, const char *widname, TQObject* pa m_bHasEndNotes = false; m_bInsertDirectCursor=false; - m_globalLanguage = KGlobal::locale()->language(); + m_globalLanguage = TDEGlobal::locale()->language(); m_bGlobalHyphenation = false; m_bGeneratingPreview = false; m_viewModeType="ModeNormal"; @@ -366,7 +366,7 @@ void KWDocument::initConfig() m_bShowDocStruct = false; // off by default for embedded docs, but still toggleable m_pgUpDownMovesCaret = config->readBoolEntry( "PgUpDownMovesCaret", true ); m_bInsertDirectCursor= config->readBoolEntry( "InsertDirectCursor", false ); - m_globalLanguage=config->readEntry("language", KGlobal::locale()->language()); + m_globalLanguage=config->readEntry("language", TDEGlobal::locale()->language()); m_bGlobalHyphenation=config->readBoolEntry("hyphenation", false); setShowGrid( config->readBoolEntry( "ShowGrid" , false )); @@ -2068,8 +2068,8 @@ void KWDocument::loadDefaultFrameStyleTemplates() { const TQString fsfileName( locate("data", "kword/framestyles.xml") ); - kdDebug(30003) << "Data directory: " << KGlobal::dirs()->resourceDirs( "data" ) << endl; - kdDebug(30003) << "Directory searched: " << KGlobal::dirs()->resourceDirs( "data" ) << endl; + kdDebug(30003) << "Data directory: " << TDEGlobal::dirs()->resourceDirs( "data" ) << endl; + kdDebug(30003) << "Directory searched: " << TDEGlobal::dirs()->resourceDirs( "data" ) << endl; kdDebug(30003) << "File framestyles.xml searched at: " << fsfileName << endl; m_frameStyleColl->setDefault( true ); diff --git a/kword/KWFactory.cpp b/kword/KWFactory.cpp index 4c2009f1..5077e45f 100644 --- a/kword/KWFactory.cpp +++ b/kword/KWFactory.cpp @@ -31,7 +31,7 @@ TDEAboutData* KWFactory::s_aboutData = 0; KWFactory::KWFactory( TQObject* parent, const char* name ) : KoFactory( parent, name ) { - // Create our instance, so that it becomes KGlobal::instance if the + // Create our instance, so that it becomes TDEGlobal::instance if the // main app is KWord. (void) instance(); } diff --git a/kword/KWStatisticsDialog.cpp b/kword/KWStatisticsDialog.cpp index cc1bdf0d..e1a371f5 100644 --- a/kword/KWStatisticsDialog.cpp +++ b/kword/KWStatisticsDialog.cpp @@ -110,7 +110,7 @@ void KWStatisticsDialog::slotRefreshValue(bool state) void KWStatisticsDialog::calcGeneral( TQLabel **resultLabel ) { - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); resultLabel[0]->setText( locale->formatNumber( m_doc->pageCount(), 0) ); int table =0; @@ -194,7 +194,7 @@ bool KWStatisticsDialog::calcStats( TQLabel **resultLabel, bool selection, bool } // assign results - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); resultLabel[0]->setText( locale->formatNumber( charsWithSpace, 0) ); resultLabel[1]->setText( locale->formatNumber( charsWithoutSpace, 0 ) ); resultLabel[2]->setText( locale->formatNumber( syllables, 0 ) ); diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp index de0a8b1b..4a9ad5ef 100644 --- a/kword/KWTableStyleManager.cpp +++ b/kword/KWTableStyleManager.cpp @@ -53,7 +53,7 @@ KWTableStylePreview::KWTableStylePreview( const TQString& title, const TQString& { 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 ) ); KoTextParag * parag = m_textdoc->firstParag(); parag->insert( 0, text ); } diff --git a/kword/KWTextDocument.cpp b/kword/KWTextDocument.cpp index a1b0a57a..29252045 100644 --- a/kword/KWTextDocument.cpp +++ b/kword/KWTextDocument.cpp @@ -43,7 +43,7 @@ KWTextDocument::KWTextDocument( KWTextFrameSet * textfs, KoTextFormatCollection } KWTextDocument::KWTextDocument( KoTextZoomHandler * zoomHandler ) - : KoTextDocument( zoomHandler, new KoTextFormatCollection( KGlobalSettings::generalFont() /*unused*/, TQColor(), KGlobal::locale()->language(), false), 0L, false ), + : KoTextDocument( zoomHandler, new KoTextFormatCollection( TDEGlobalSettings::generalFont() /*unused*/, TQColor(), TDEGlobal::locale()->language(), false), 0L, false ), m_textfs( 0 ) { init(); diff --git a/kword/KWTextParag.cpp b/kword/KWTextParag.cpp index 41d1749a..e870c710 100644 --- a/kword/KWTextParag.cpp +++ b/kword/KWTextParag.cpp @@ -70,7 +70,7 @@ void KWTextParag::drawFormattingChars( TQPainter &painter, int start, int len, if ( start + len == length() && (whichFormattingChars & FormattingBreak) && hardFrameBreakAfter() ) { painter.save(); - TQPen pen( KGlobalSettings::linkColor() ); // #101820 + TQPen pen( TDEGlobalSettings::linkColor() ); // #101820 painter.setPen( pen ); //kdDebug() << "KWTextParag::drawFormattingChars start=" << start << " len=" << len << " length=" << length() << endl; // keep in sync with KWTextFrameSet::formatVertically diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 832711d1..d28c3478 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -6006,7 +6006,7 @@ void KWView::documentModified( bool b ) return; if ( b ) - m_sbModifiedLabel->setPixmap( KGlobal::iconLoader()->loadIcon( "action-modified", KIcon::Small ) ); + m_sbModifiedLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "action-modified", KIcon::Small ) ); else m_sbModifiedLabel->setText( " " ); } diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp index 74fc211c..96512f8b 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp @@ -198,7 +198,7 @@ TQString KWMailMergeKABC::getValue( const TQString &name, int record ) const if ( name == "Nick name" ) return addr.nickName(); if ( name == "Birthday" ) - return KGlobal::locale()->formatDate( addr.birthday().date() ); + return TDEGlobal::locale()->formatDate( addr.birthday().date() ); if ( name == "Home address: Street" ) { @@ -375,7 +375,7 @@ TQString KWMailMergeKABC::getValue( const TQString &name, int record ) const if ( name == "productId" ) return addr.productId(); if ( name == "Revision" ) - return KGlobal::locale()->formatDate( addr.revision().date() ); + return TDEGlobal::locale()->formatDate( addr.revision().date() ); if ( name == "sortString" ) return addr.sortString(); if ( name == "URL" ) |