From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:50 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12. --- knode/kncomposer.cpp | 56 ++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'knode/kncomposer.cpp') diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index ac14f0607..de354ef76 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -13,8 +13,8 @@ */ #include -#include -#include +#include +#include #include #include #include @@ -432,7 +432,7 @@ int KNComposer::listOfResultOfCheckWord( const TQStringList & lst , const TQStri void KNComposer::slotUndo() { - TQWidget* fw = focusWidget(); + TQWidget* fw = tqfocusWidget(); if (!fw) return; if (fw->inherits("KEdit")) @@ -443,7 +443,7 @@ void KNComposer::slotUndo() void KNComposer::slotRedo() { - TQWidget* fw = focusWidget(); + TQWidget* fw = tqfocusWidget(); if (!fw) return; if (fw->inherits("KEdit")) @@ -454,7 +454,7 @@ void KNComposer::slotRedo() void KNComposer::slotCut() { - TQWidget* fw = focusWidget(); + TQWidget* fw = tqfocusWidget(); if (!fw) return; if (fw->inherits("KEdit")) @@ -466,7 +466,7 @@ void KNComposer::slotCut() void KNComposer::slotCopy() { - TQWidget* fw = focusWidget(); + TQWidget* fw = tqfocusWidget(); if (!fw) return; if (fw->inherits("KEdit")) @@ -480,7 +480,7 @@ void KNComposer::slotCopy() void KNComposer::slotPaste() { - TQWidget* fw = focusWidget(); + TQWidget* fw = tqfocusWidget(); if (!fw) return; if (fw->inherits("KEdit")) @@ -492,7 +492,7 @@ void KNComposer::slotPaste() void KNComposer::slotSelectAll() { - TQWidget* fw = focusWidget(); + TQWidget* fw = tqfocusWidget(); if (!fw) return; if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) @@ -969,7 +969,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl ts.setCodec(codec); if (box) - temp = TQString::fromLatin1(",----[ %1 ]\n").arg(boxTitle); + temp = TQString::tqfromLatin1(",----[ %1 ]\n").tqarg(boxTitle); if (box && (v_iew->e_dit->wordWrap()!=TQMultiLineEdit::NoWrap)) { int wrapAt = v_iew->e_dit->wrapColumnOrWidth(); @@ -993,7 +993,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl } if (box) - temp += TQString::fromLatin1("`----"); + temp += TQString::tqfromLatin1("`----"); if(clear) v_iew->e_dit->setText(temp); @@ -1374,18 +1374,18 @@ void KNComposer::slotUpdateStatusBar() else overwriteDesc = i18n(" INS "); - statusBar()->changeItem(i18n(" Type: %1 ").arg(typeDesc), 1); - statusBar()->changeItem(i18n(" Charset: %1 ").arg(TQString(c_harset)), 2); + statusBar()->changeItem(i18n(" Type: %1 ").tqarg(typeDesc), 1); + statusBar()->changeItem(i18n(" Charset: %1 ").tqarg(TQString(c_harset)), 2); statusBar()->changeItem(overwriteDesc, 3); - statusBar()->changeItem(i18n(" Column: %1 ").arg(v_iew->e_dit->currentColumn() + 1), 4); - statusBar()->changeItem(i18n(" Line: %1 ").arg(v_iew->e_dit->currentLine() + 1), 5); + statusBar()->changeItem(i18n(" Column: %1 ").tqarg(v_iew->e_dit->currentColumn() + 1), 4); + statusBar()->changeItem(i18n(" Line: %1 ").tqarg(v_iew->e_dit->currentLine() + 1), 5); } void KNComposer::slotUpdateCursorPos() { - statusBar()->changeItem(i18n(" Column: %1 ").arg(v_iew->e_dit->currentColumn() + 1), 4); - statusBar()->changeItem(i18n(" Line: %1 ").arg(v_iew->e_dit->currentLine() + 1), 5); + statusBar()->changeItem(i18n(" Column: %1 ").tqarg(v_iew->e_dit->currentColumn() + 1), 4); + statusBar()->changeItem(i18n(" Line: %1 ").tqarg(v_iew->e_dit->currentLine() + 1), 5); } @@ -1447,7 +1447,7 @@ void KNComposer::slotGroupsChanged(const TQString &t) split.init(t.latin1(), ","); splitOk=split.first(); while(splitOk) { - v_iew->f_up2->insertItem(TQString::fromLatin1(split.string())); + v_iew->f_up2->insertItem(TQString::tqfromLatin1(split.string())); splitOk=split.next(); } v_iew->f_up2->insertItem(""); @@ -1781,10 +1781,10 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) KConfig *config = knGlobals.config(); KConfigGroupSaver saver(config, "VISUAL_APPEARANCE"); - TQColor defaultColor1( kapp->palette().active().text()); // defaults from kmreaderwin.cpp - TQColor defaultColor2( kapp->palette().active().text() ); - TQColor defaultColor3( kapp->palette().active().text() ); - TQColor defaultForeground( kapp->palette().active().text() ); + TQColor defaultColor1( kapp->tqpalette().active().text()); // defaults from kmreaderwin.cpp + TQColor defaultColor2( kapp->tqpalette().active().text() ); + TQColor defaultColor3( kapp->tqpalette().active().text() ); + TQColor defaultForeground( kapp->tqpalette().active().text() ); TQColor col1 = config->readColorEntry( "ForegroundColor", &defaultForeground ); TQColor col2 = config->readColorEntry( "quote3Color", &defaultColor3 ); TQColor col3 = config->readColorEntry( "quote2Color", &defaultColor2 ); @@ -1998,7 +1998,7 @@ KNComposer::Editor::Editor(KNComposer::ComposerView *_composerView, KNComposer * spell = 0L; installEventFilter(this); KCursor::setAutoHideCursor( this, true, true ); - m_bound = TQRegExp( TQString::fromLatin1("[\\s\\W]") ); + m_bound = TQRegExp( TQString::tqfromLatin1("[\\s\\W]") ); } @@ -2152,7 +2152,7 @@ TQStringList KNComposer::Editor::processedText() void KNComposer::Editor::slotPasteAsQuotation() { - TQString s = TQApplication::clipboard()->text(); + TQString s = TQApplication::tqclipboard()->text(); if (!s.isEmpty()) { for (int i=0; (uint)iaddRowSpacing(0, fontMetrics().lineSpacing()-9); fileL->addWidget(new TQLabel(i18n("Name:"), fileGB) ,1,0); - fileL->addWidget(new TQLabel(TQString("%1").arg(a->name()), fileGB), 1,1, TQt::AlignLeft); + fileL->addWidget(new TQLabel(TQString("%1").tqarg(a->name()), fileGB), 1,1, TQt::AlignLeft); fileL->addWidget(new TQLabel(i18n("Size:"), fileGB), 2,0); fileL->addWidget(new TQLabel(a->contentSize(), fileGB), 2,1, TQt::AlignLeft); @@ -2604,7 +2604,7 @@ KNComposer::AttachmentPropertiesDlg::AttachmentPropertiesDlg(KNAttachment *a, TQ this, TQT_SLOT(slotMimeTypeTextChanged(const TQString&))); //finish GUI - setFixedHeight(sizeHint().height()); + setFixedHeight(tqsizeHint().height()); KNHelper::restoreWindowSize("attProperties", this, TQSize(300,250)); setHelp("anc-knode-editor-advanced"); } -- cgit v1.2.1