From bf280726d5d22f33d33e4f9e771220c725249407 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:50:52 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kedit/color.ui | 2 +- kedit/kedit.cpp | 34 +++++++++++++++++----------------- kedit/kedit.h | 2 +- kedit/ktextfiledlg.cpp | 6 +++--- kedit/misc.ui | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) (limited to 'kedit') diff --git a/kedit/color.ui b/kedit/color.ui index 2310c57..bec67d9 100644 --- a/kedit/color.ui +++ b/kedit/color.ui @@ -29,7 +29,7 @@ Expanding - + 41 111 diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp index d5bcba5..4d2d878 100644 --- a/kedit/kedit.cpp +++ b/kedit/kedit.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include @@ -84,7 +84,7 @@ TopLevel::TopLevel (TQWidget *, const char *name) setupEditWidget(); if (!initialGeometrySet()) - resize( TQSize(550, 400).expandedTo(tqminimumSizeHint())); + resize( TQSize(550, 400).expandedTo(minimumSizeHint())); setupGUI(ToolBar | Keys | StatusBar | Create); setAutoSaveSettings(); @@ -265,7 +265,7 @@ void TopLevel::saveProperties(KConfig* config) { TQString name = m_url.url(); if (name.isEmpty()) - name = TQString("kedit%1-%2").tqarg(getpid()).tqarg((long)this); + name = TQString("kedit%1-%2").arg(getpid()).arg((long)this); TQString tmplocation = kapp->tempSaveName(m_url.url()); config->writeEntry("saved_to",tmplocation); saveFile(tmplocation, false, m_url.fileEncoding()); @@ -341,7 +341,7 @@ void TopLevel::insertDate(){ int line, column; TQString string; - TQDate dt = TQDate::tqcurrentDate(); + TQDate dt = TQDate::currentDate(); string = KGlobal::locale()->formatDate(dt); eframe->getCursorPosition(&line,&column); @@ -418,7 +418,7 @@ void TopLevel::spell_started( KSpell *) void TopLevel::spell_progress (unsigned int percent) { TQString s; - s = i18n("Spellcheck: %1% complete").tqarg(percent); + s = i18n("Spellcheck: %1% complete").arg(percent); statusBar()->changeItem (s, ID_GENERAL); } @@ -699,7 +699,7 @@ void TopLevel::file_save() if ( result == KEDIT_OK ){ TQString string; - string = i18n("Wrote: %1").tqarg(m_caption); + string = i18n("Wrote: %1").arg(m_caption); setGeneralStatusField(string); } } @@ -732,7 +732,7 @@ void TopLevel::file_save_as() { int result = KMessageBox::warningContinueCancel( this, i18n( "A file named \"%1\" already exists. " - "Are you sure you want to overwrite it?" ).tqarg( u.prettyURL() ), + "Are you sure you want to overwrite it?" ).arg( u.prettyURL() ), i18n( "Overwrite File?" ), i18n( "Overwrite" ) ); @@ -748,7 +748,7 @@ void TopLevel::file_save_as() { m_url = u; setFileCaption(); - TQString string = i18n("Saved as: %1").tqarg(m_caption); + TQString string = i18n("Saved as: %1").arg(m_caption); setGeneralStatusField(string); recent->addURL( u ); } @@ -872,7 +872,7 @@ void TopLevel::setFileCaption() } TQString encoding = m_url.fileEncoding(); if (!encoding.isEmpty()) - m_caption += TQString(" (%1)").tqarg(encoding); + m_caption += TQString(" (%1)").arg(encoding); } setCaption(m_caption, eframe->isModified()); } @@ -887,8 +887,8 @@ void TopLevel::statusbar_slot(){ TQString linenumber; linenumber = i18n("Line: %1 Col: %2") - .tqarg(eframe->currentLine() + 1) - .tqarg(eframe->currentColumn() +1); + .arg(eframe->currentLine() + 1) + .arg(eframe->currentColumn() +1); statusBar()->changeItem(linenumber,ID_LINE_COLUMN); } @@ -896,8 +896,8 @@ void TopLevel::statusbar_slot(){ void TopLevel::print() { bool aborted = false; - TQString headerLeft = i18n("Date: %1").tqarg(KGlobal::locale()->formatDate(TQDate::tqcurrentDate(),true)); - TQString headerMid = i18n("File: %1").tqarg(m_caption); + TQString headerLeft = i18n("Date: %1").arg(KGlobal::locale()->formatDate(TQDate::currentDate(),true)); + TQString headerMid = i18n("File: %1").arg(m_caption); TQString headerRight; TQFont printFont = eframe->font(); @@ -908,7 +908,7 @@ void TopLevel::print() TQFontMetrics headerFontMetrics(headerFont); KPrinter *printer = new KPrinter; - if(printer->setup(this, i18n("Print %1").tqarg(m_caption))) { + if(printer->setup(this, i18n("Print %1").arg(m_caption))) { // set up KPrinter printer->setFullPage(false); printer->setCreator("KEdit"); @@ -932,7 +932,7 @@ void TopLevel::print() while(true) { - headerRight = TQString("#%1").tqarg(page); + headerRight = TQString("#%1").arg(page); dy = headerFontMetrics.lineSpacing(); TQRect body( 0, dy*2, metrics.width(), metrics.height()-dy*2); @@ -1125,7 +1125,7 @@ void TopLevel::openURL( const KURL& _url, int _mode ) if ( !_url.isValid() ) { TQString string; - string = i18n( "Malformed URL\n%1").tqarg(_url.url()); + string = i18n( "Malformed URL\n%1").arg(_url.url()); KMessageBox::sorry(this, string); return; @@ -1204,7 +1204,7 @@ void TopLevel::timer_slot(){ void TopLevel::set_colors() { - TQPalette mypalette = TQPalette((eframe->tqpalette())); + TQPalette mypalette = TQPalette((eframe->palette())); TQColorGroup ncgrp( mypalette.active() ); diff --git a/kedit/kedit.h b/kedit/kedit.h index 9faba86..83c42aa 100644 --- a/kedit/kedit.h +++ b/kedit/kedit.h @@ -24,7 +24,7 @@ #ifndef _KEDIT_H_ #define _KEDIT_H_ -#include +#include #include #include "version.h" diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp index 32dfc19..027ee2f 100644 --- a/kedit/ktextfiledlg.cpp +++ b/kedit/ktextfiledlg.cpp @@ -65,7 +65,7 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir, i18n("Select Encoding..."), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowEncCombo() ), TQT_TQOBJECT(this), "encoding"); - mEncoding->setIcon( TQString::tqfromLatin1("charset") ); + mEncoding->setIcon( TQString::fromLatin1("charset") ); KToolBar *tb = toolBar(); mEncoding->plug( tb, pathComboIndex() - 1 ); @@ -88,7 +88,7 @@ void KTextFileDialog::slotShowEncCombo() TQComboBox *encCombo; TQVBox *vbox; - // Create widgets, and display using tqgeometry management + // Create widgets, and display using geometry management encDlg = new KDialogBase( this, "Encoding Dialog", true, i18n("Select Encoding"), KDialogBase::Ok | KDialogBase::Cancel ); @@ -96,7 +96,7 @@ void KTextFileDialog::slotShowEncCombo() vbox->setSpacing( KDialog::spacingHint() ); encDlg->setMainWidget( vbox ); label = new TQLabel( vbox ); - label->tqsetAlignment( AlignLeft | AlignVCenter ); + label->setAlignment( AlignLeft | AlignVCenter ); label->setText(i18n("Select encoding for text file: ")); encCombo = new TQComboBox(vbox); diff --git a/kedit/misc.ui b/kedit/misc.ui index 76df775..956790d 100644 --- a/kedit/misc.ui +++ b/kedit/misc.ui @@ -82,7 +82,7 @@ Expanding - + 20 101 -- cgit v1.2.1