From 75112ed8e227f656f98523b7ffdad5422d9a6f11 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:52:34 -0600 Subject: Remove additional unneeded tq method conversions --- kate/filelistloader/katefll_plugin.cpp | 4 +- kate/filetemplates/plugin/filetemplates.cpp | 14 ++--- kate/insertcommand/plugin_kateinsertcommand.cpp | 2 +- kate/kjswrapper/bindings.cpp | 6 +- kate/kjswrapper/plugin_katekjswrapper.cpp | 4 +- kate/kpybrowser/kpybrowser.cpp | 4 +- kate/kpybrowser/pybrowse_part.cpp | 2 +- kate/make/plugin_katemake.cpp | 8 +-- kate/xmlcheck/plugin_katexmlcheck.cpp | 4 +- kate/xmltools/html4-loose.dtd.xml | 74 ++++++++++++------------- kate/xmltools/html4-strict.dtd.xml | 48 ++++++++-------- kate/xmltools/plugin_katexmltools.cpp | 8 +-- kate/xmltools/pseudo_dtd.cpp | 4 +- kate/xmltools/testcases.xml | 2 +- kate/xmltools/xhtml1-frameset.dtd.xml | 8 +-- kate/xmltools/xhtml1-strict.dtd.xml | 8 +-- kate/xmltools/xhtml1-transitional.dtd.xml | 8 +-- 17 files changed, 104 insertions(+), 104 deletions(-) (limited to 'kate') diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp index a499ef2..5d59d5e 100644 --- a/kate/filelistloader/katefll_plugin.cpp +++ b/kate/filelistloader/katefll_plugin.cpp @@ -190,7 +190,7 @@ void PluginKateFileListLoader::slotSaveList() { /* if (m_oldInitURL!=application()->initPluginManager()->initScript()) { - switch (KMessageBox::questionYesNoCancel(0,i18n("Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the File List Loader. Do you still want to save the list to %1?").tqarg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard())) + switch (KMessageBox::questionYesNoCancel(0,i18n("Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the File List Loader. Do you still want to save the list to %1?").arg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard())) { case KMessageBox::Yes: save(); break; case KMessageBox::No: slotSaveListAs(); break; @@ -203,7 +203,7 @@ void PluginKateFileListLoader::slotSaveList() { /*if (m_saveURL!=application()->initPluginManager()->initScript()) { - switch (KMessageBox::questionYesNoCancel(0,i18n("Kate has been reinitialized by another plugin other than the File List Loader. Do you still want to save the list to %1?").tqarg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard())) + switch (KMessageBox::questionYesNoCancel(0,i18n("Kate has been reinitialized by another plugin other than the File List Loader. Do you still want to save the list to %1?").arg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard())) { case KMessageBox::Yes: save(); break; case KMessageBox::No: slotSaveListAs(); break; diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp index 6f51e9b..56a0dc8 100644 --- a/kate/filetemplates/plugin/filetemplates.cpp +++ b/kate/filetemplates/plugin/filetemplates.cpp @@ -381,7 +381,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) if ( ! file.open( IO_ReadOnly ) ) { KMessageBox::sorry( application()->activeMainWindow()->viewManager()->activeView(), - i18n("Error opening the file
%1
for reading. The document will not be created.").tqarg(filename), + i18n("Error opening the file
%1
for reading. The document will not be created.").arg(filename), i18n("Template Plugin"), 0 ); KIO::NetAccess::removeTempFile( tmpfile ); return; @@ -479,7 +479,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) count++; if ( docname.contains( "%1" ) ) - docname = docname.tqarg( count ); + docname = docname.arg( count ); doc->setDocName( docname ); @@ -795,12 +795,12 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft "edit the data in the KDE email information."), page ) ); cbRRealname = new TQCheckBox( i18n("Replace full name '%1' with the " - "'%{fullname}' macro").tqarg( sFullname ), page ); + "'%{fullname}' macro").arg( sFullname ), page ); cbRRealname->setEnabled( ! sFullname.isEmpty() ); lo->addWidget( cbRRealname ); cbREmail = new TQCheckBox( i18n("Replace email address '%1' with the " - "'%email' macro").tqarg( sEmail ), page); + "'%email' macro").arg( sEmail ), page); cbREmail->setEnabled( ! sEmail.isEmpty() ); lo->addWidget( cbREmail ); @@ -922,7 +922,7 @@ void KateTemplateWizard::accept() if ( KMessageBox::warningContinueCancel( this, i18n( "

The file
'%1'
already exists; if you " "do not want to overwrite it, change the template file name to " - "something else.").tqarg( templateUrl.prettyURL() ), + "something else.").arg( templateUrl.prettyURL() ), i18n("File Exists"), i18n("Overwrite") ) == KMessageBox::Cancel ) return; @@ -976,7 +976,7 @@ void KateTemplateWizard::accept() { KMessageBox::sorry( this, i18n( "Error opening the file
%1
for reading. " - "The document will not be created").tqarg(u.prettyURL()), + "The document will not be created").arg(u.prettyURL()), i18n("Template Plugin"), 0 ); KIO::NetAccess::removeTempFile( tmpfile ); @@ -1055,7 +1055,7 @@ void KateTemplateWizard::accept() { KMessageBox::sorry( this, i18n( "Unable to save the template to '%1'.\n\nThe template will be opened, " - "so you can save it from the editor.").tqarg( templateUrl.prettyURL() ), + "so you can save it from the editor.").arg( templateUrl.prettyURL() ), i18n("Save Failed") ); kft->application()->activeMainWindow()->viewManager()->openURL( KURL() ); diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp index f88f0ba..c94c24f 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.cpp +++ b/kate/insertcommand/plugin_kateinsertcommand.cpp @@ -208,7 +208,7 @@ void PluginKateInsertCommand::slotShowWaitDlg() { if ( sh->isRunning() ) { wdlg = new WaitDlg( (TQWidget*)kv, i18n( - "Executing command:\n%1\n\nPress 'Cancel' to abort.").tqarg(cmd) ); + "Executing command:\n%1\n\nPress 'Cancel' to abort.").arg(cmd) ); connect(wdlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotAbort()) ); } if ( sh->isRunning() ) // we may have finished while creating the dialog. diff --git a/kate/kjswrapper/bindings.cpp b/kate/kjswrapper/bindings.cpp index 9f49bcb..34bd1b0 100644 --- a/kate/kjswrapper/bindings.cpp +++ b/kate/kjswrapper/bindings.cpp @@ -178,7 +178,7 @@ KJS::Value DocumentManager::call( KJS::ExecState *exec, KJS::Object &self, const kdDebug()<<"calling illegal method of DocumentManager"<setException( err ); return KJS::Undefined(); @@ -310,7 +310,7 @@ KJS::Value Kate::JS::Application::call( KJS::ExecState *exec, KJS::Object &self, } - TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc); + TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); @@ -458,7 +458,7 @@ KJS::Value Kate::JS::MainWindow::call( KJS::ExecState *exec, KJS::Object &self, default: return KJS::Undefined(); } - TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc); + TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); diff --git a/kate/kjswrapper/plugin_katekjswrapper.cpp b/kate/kjswrapper/plugin_katekjswrapper.cpp index d0cd8e5..ac7a9a3 100644 --- a/kate/kjswrapper/plugin_katekjswrapper.cpp +++ b/kate/kjswrapper/plugin_katekjswrapper.cpp @@ -86,7 +86,7 @@ PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* parent, const char* name, w->show(); //w->show();*/ kdDebug()<<"m_scriptname="<runFile(locate("appdata",TQString("plugins/%1/%2.js").tqarg(m_scriptname).tqarg(m_scriptname))); + m_part->runFile(locate("appdata",TQString("plugins/%1/%2.js").arg(m_scriptname).arg(m_scriptname))); //"/home/jowenn/development/kde/cvs/tdeaddons/kate/kjswrapper/samples/test1.js"); } @@ -343,7 +343,7 @@ void PluginKateKJSWrapper::addView(Kate::MainWindow *win) if (exec->hadException()) kdDebug()<<"void PluginKateKJSWrapper::addView(Kate::MainWindow *win): exec had an exception - 2"<setInstance (new KInstance("kate")); - view->setXMLFile(TQString("plugins/%1/%2.rc").tqarg(m_scriptname).tqarg(m_scriptname)); + view->setXMLFile(TQString("plugins/%1/%2.rc").arg(m_scriptname).arg(m_scriptname)); win->guiFactory()->addClient (view); } diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp index 34c9167..183e1e7 100644 --- a/kate/kpybrowser/kpybrowser.cpp +++ b/kate/kpybrowser/kpybrowser.cpp @@ -286,7 +286,7 @@ KPyBrowser::parseText (TQString & pytext) line = &(*iter); if (class_rx.search(*line) >= 0) { - //KMessageBox::information(this, *line, TQString("Found class on line %1").tqarg(line_no)); + //KMessageBox::information(this, *line, TQString("Found class on line %1").arg(line_no)); //strip out the beginning class and ending colon class_sig = line->stripWhiteSpace ().mid (6); class_sig = class_sig.left (class_sig.length () - 1); @@ -318,7 +318,7 @@ KPyBrowser::parseText (TQString & pytext) } if ((function_rx.search(*line) >= 0)) { - //KMessageBox::information(this, *line, TQString("Found function on line %1").tqarg(line_no)); + //KMessageBox::information(this, *line, TQString("Found function on line %1").arg(line_no)); function_sig = line->stripWhiteSpace ().mid (4); function_sig = function_sig.left (function_sig.find (":")); paren_i = function_sig.find ("("); diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp index 4cd379c..4b8490c 100644 --- a/kate/kpybrowser/pybrowse_part.cpp +++ b/kate/kpybrowser/pybrowse_part.cpp @@ -104,7 +104,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line) if (apiline == -1) { KMessageBox::information(0, - i18n("Could not find method/class %1.").tqarg(name), i18n("Selection")); + i18n("Could not find method/class %1.").arg(name), i18n("Selection")); } else { diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp index 8b116f1..b71422a 100644 --- a/kate/make/plugin_katemake.cpp +++ b/kate/make/plugin_katemake.cpp @@ -192,7 +192,7 @@ protected: TQString ErrorMessage::caption() const { - return TQString::fromLatin1("%1:%2").tqarg(text(COL_FILE)).tqarg(line()); + return TQString::fromLatin1("%1:%2").arg(text(COL_FILE)).arg(line()); } TQString ErrorMessage::fancyMessage() const @@ -557,7 +557,7 @@ void PluginKateMakeView::slotClicked(TQListViewItem *item) << globalPos.x() << "," << globalPos.y() << endl; #if 0 KPassivePopup::message( - TQString::fromLatin1("%1:%2").tqarg(filename).tqarg(lineno), + TQString::fromLatin1("%1:%2").arg(filename).arg(lineno), msg, this); #else @@ -644,7 +644,7 @@ bool PluginKateMakeView::slotValidate() KMessageBox::sorry(0, i18n("The file %1 is not a local file. " "Non-local files cannot be compiled.") - .tqarg(url.path())); + .arg(url.path())); return false; } @@ -662,7 +662,7 @@ bool PluginKateMakeView::slotValidate() make = KStandardDirs::findExe("make"); *m_proc << make; if( make.isEmpty() || ! m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) ) { - KMessageBox::error(0, i18n("Error: Failed to run %1.").tqarg(make.isEmpty() ? + KMessageBox::error(0, i18n("Error: Failed to run %1.").arg(make.isEmpty() ? "make" : make)); return false; } diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp index b1a0ea3..94ffe2c 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.cpp +++ b/kate/xmlcheck/plugin_katexmlcheck.cpp @@ -120,7 +120,7 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow setResizeMode(TQListView::LastColumn); connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotClicked(TQListViewItem *))); -/* TODO?: tqinvalidate the listview when document has changed +/* TODO?: invalidate the listview when document has changed Kate::View *kv = application()->activeMainWindow()->viewManager()->activeView(); if( ! kv ) { kdDebug() << "Warning: no Kate::View" << endl; @@ -280,7 +280,7 @@ bool PluginKateXMLCheckView::slotValidate() if( m_tmp_file->status() != 0 ) { kdDebug() << "Error (slotValidate()): could not create '" << m_tmp_file->name() << "': " << m_tmp_file->status() << endl; KMessageBox::error(0, i18n("Error: Could not create " - "temporary file '%1'.").tqarg(m_tmp_file->name())); + "temporary file '%1'.").arg(m_tmp_file->name())); delete m_tmp_file; m_tmp_file=0L; return false; diff --git a/kate/xmltools/html4-loose.dtd.xml b/kate/xmltools/html4-loose.dtd.xml index 03505ae..f7b48d0 100644 --- a/kate/xmltools/html4-loose.dtd.xml +++ b/kate/xmltools/html4-loose.dtd.xml @@ -689,11 +689,11 @@ type="param" > align (left|center|right|justify|char) #IMPLIED - char CDATA #IMPLIED -- tqalignment char, e.g. char=':' -- - charoff CDATA #IMPLIED -- offset for tqalignment char -- + char CDATA #IMPLIED -- alignment char, e.g. char=':' -- + charoff CDATA #IMPLIED -- offset for alignment char -- align (left|center|right|justify|char) #IMPLIED - char %Character; #IMPLIED -- tqalignment char, e.g. char=':' -- - charoff %Length; #IMPLIED -- offset for tqalignment char -- + char %Character; #IMPLIED -- alignment char, e.g. char=':' -- + charoff %Length; #IMPLIED -- offset for alignment char -- -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- @@ -5170,8 +5170,8 @@ -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- - %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- %reserved; -- reserved for possible future use -- -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- @@ -11742,7 +11742,7 @@ %attrs; -- %coreattrs, %i18n, %events -- - tqshape %Shape; rect -- controls interpretation of coords -- + shape %Shape; rect -- controls interpretation of coords -- coords %Coords; #IMPLIED -- comma-separated list of lengths -- href %URI; #IMPLIED -- URI for linked resource -- target %FrameTarget; #IMPLIED -- render in this frame -- @@ -11817,7 +11817,7 @@ type="#IMPLIED" value="CDATA" default=""/> - -- table row -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- bgcolor %Color; #IMPLIED -- background color for row -- align (left|center|right|justify|char) #IMPLIED - char CDATA #IMPLIED -- tqalignment char, e.g. char=':' -- - charoff CDATA #IMPLIED -- offset for tqalignment char -- + char CDATA #IMPLIED -- alignment char, e.g. char=':' -- + charoff CDATA #IMPLIED -- offset for alignment char -- align (left|center|right|justify|char) #IMPLIED - char %Character; #IMPLIED -- tqalignment char, e.g. char=':' -- - charoff %Length; #IMPLIED -- offset for tqalignment char -- + char %Character; #IMPLIED -- alignment char, e.g. char=':' -- + charoff %Length; #IMPLIED -- offset for alignment char -- -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- - -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- %attrs; -- %coreattrs, %i18n, %events -- - tqshape %Shape; rect -- controls interpretation of coords -- + shape %Shape; rect -- controls interpretation of coords -- coords %Coords; #IMPLIED -- comma-separated list of lengths -- href %URI; #IMPLIED -- URI for linked resource -- nohref (nohref) #IMPLIED -- this region has no action -- @@ -9694,7 +9694,7 @@ type="#IMPLIED" value="CDATA" default=""/> - -- table row -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- ' ) { tag.truncate( pos ); break; diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp index 99de846..b13c35f 100644 --- a/kate/xmltools/pseudo_dtd.cpp +++ b/kate/xmltools/pseudo_dtd.cpp @@ -46,7 +46,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd ) if ( ! doc.setContent( metaDtd) ) { KMessageBox::error(0, i18n("The file '%1' could not be parsed. " - "Please check that the file is well-formed XML.").tqarg( metaDtdUrl ), + "Please check that the file is well-formed XML.").arg( metaDtdUrl ), i18n( "XML Plugin Error") ); return; } @@ -57,7 +57,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd ) "Please check that the file is of this type:\n" "-//Norman Walsh//DTD DTDParse V2.0//EN\n" "You can produce such files with dtdparse. " - "See the Kate Plugin documentation for more information.").tqarg( metaDtdUrl ), + "See the Kate Plugin documentation for more information.").arg( metaDtdUrl ), i18n("XML Plugin Error") ); return; } diff --git a/kate/xmltools/testcases.xml b/kate/xmltools/testcases.xml index e66fc60..aa1e7dd 100644 --- a/kate/xmltools/testcases.xml +++ b/kate/xmltools/testcases.xml @@ -40,7 +40,7 @@ the current cursor position, replacing the old value: center, char, justify, left, right baseline, bottom, middle, top -- "foobar" should be replaced - circle, default, poly, rect + circle, default, poly, rect (no predefined values) 6. Type "&". A list with named entities should appear. Select one and diff --git a/kate/xmltools/xhtml1-frameset.dtd.xml b/kate/xmltools/xhtml1-frameset.dtd.xml index 73bf4bc..6530334 100644 --- a/kate/xmltools/xhtml1-frameset.dtd.xml +++ b/kate/xmltools/xhtml1-frameset.dtd.xml @@ -7533,7 +7533,7 @@ %attrs; %focus; - tqshape %Shape; "rect" + shape %Shape; "rect" coords %Coords; #IMPLIED href %URI; #IMPLIED nohref (nohref) #IMPLIED @@ -7608,7 +7608,7 @@ type="#IMPLIED" value="CDATA" default=""/> - @@ -12097,7 +12097,7 @@ type="#IMPLIED" value="CDATA" default=""/> - %attrs; %focus; - tqshape %Shape; "rect" + shape %Shape; "rect" coords %Coords; #IMPLIED href %URI; #IMPLIED nohref (nohref) #IMPLIED @@ -6260,7 +6260,7 @@ type="#IMPLIED" value="CDATA" default=""/> - - %attrs; %focus; - tqshape %Shape; "rect" + shape %Shape; "rect" coords %Coords; #IMPLIED href %URI; #IMPLIED nohref (nohref) #IMPLIED @@ -7675,7 +7675,7 @@ type="#IMPLIED" value="CDATA" default=""/> - @@ -12036,7 +12036,7 @@ type="#IMPLIED" value="CDATA" default=""/> -