diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:39:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:39:24 -0600 |
| commit | 9fae0887708c35fc8ad295a03417c07feeb653dc (patch) | |
| tree | 2813e4cd31ce8818d37f1e833e7e5bcca494152d /krusader/UserAction | |
| parent | 02c9636ebca6d98672d0d14528007b48e02d265a (diff) | |
| download | krusader-9fae0887708c35fc8ad295a03417c07feeb653dc.tar.gz krusader-9fae0887708c35fc8ad295a03417c07feeb653dc.zip | |
Remove additional unneeded tq method conversions
Diffstat (limited to 'krusader/UserAction')
| -rw-r--r-- | krusader/UserAction/expander.cpp | 22 | ||||
| -rw-r--r-- | krusader/UserAction/kraction.cpp | 2 | ||||
| -rw-r--r-- | krusader/UserAction/useraction.cpp | 8 |
3 files changed, 16 insertions, 16 deletions
diff --git a/krusader/UserAction/expander.cpp b/krusader/UserAction/expander.cpp index 139b00c..d7825d2 100644 --- a/krusader/UserAction/expander.cpp +++ b/krusader/UserAction/expander.cpp @@ -54,7 +54,7 @@ TQValueList<const exp_placeholder*>& Expander::_placeholder() void exp_placeholder::panelMissingError(const TQString &s, Expander& exp) { - exp.setError( Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Needed panel specification missing in expander %1").tqarg(s)) ); + exp.setError( Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Needed panel specification missing in expander %1").arg(s)) ); } TQStringList exp_placeholder::fileList(const ListPanel* const panel,const TQString& type,const TQString& mask,const bool ommitPath,const bool useUrl,Expander& exp,const TQString& error) @@ -69,7 +69,7 @@ TQStringList exp_placeholder::fileList(const ListPanel* const panel,const TQStri else if ( type == "selected" ) panel->view->getSelectedItems( &items ); else { - setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Bad argument to %1: %2 is not valid item specifier").tqarg(error,type) ) ); + setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Bad argument to %1: %2 is not valid item specifier").arg(error,type) ) ); return TQString(); } if ( !ommitPath ) { // add the current path @@ -397,11 +397,11 @@ TagString exp_Count::expFunc( const ListPanel* panel, const TQStringList& parame else if ( parameter[ 0 ].lower() == "selected" ) n = panel->view->numSelected(); else { - setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Bad argument to Count: %1 is not valid item specifier").tqarg(parameter[0]) )); + setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Bad argument to Count: %1 is not valid item specifier").arg(parameter[0]) )); return TQString(); } - return TagString(TQString("%1").tqarg( n )); + return TagString(TQString("%1").arg( n )); } exp_Filter::exp_Filter() { @@ -503,7 +503,7 @@ TagString exp_ListFile::expFunc( const ListPanel* panel, const TQStringList& par KTempFile tmpFile( locateLocal("tmp", "krusader"), ".itemlist" ); if ( tmpFile.status() != 0 ) { - setError(exp, Error(Error::S_FATAL,Error::C_WORLD, i18n("Expander: tempfile couldn't be opened (%1)" ).tqarg(strerror( tmpFile.status() )) )); + setError(exp, Error(Error::S_FATAL,Error::C_WORLD, i18n("Expander: tempfile couldn't be opened (%1)" ).arg(strerror( tmpFile.status() )) )); return TQString(); } @@ -832,7 +832,7 @@ TagString exp_ColSort::expFunc( const ListPanel* panel, const TQStringList& para */ // krOut << "start: exp_ColSort::expFunc" << endl; - #define MODE_OUT krOut << TQString( "mode: %1" ).tqarg( mode, 0, 2 ) << endl; // displays mode in base-2 + #define MODE_OUT krOut << TQString( "mode: %1" ).arg( mode, 0, 2 ) << endl; // displays mode in base-2 //MODE_OUT if ( parameter.count() <= 1 || ( parameter[1].lower() != "asc" && parameter[1].lower() != "desc" ) ) { //default == toggle @@ -882,7 +882,7 @@ TagString exp_ColSort::expFunc( const ListPanel* panel, const TQStringList& para if ( parameter[0].lower() == "group" ) { mode |= KrViewProperties::Group; } else { - setError(exp, Error(Error::S_WARNING,Error::C_ARGUMENT,i18n("Expander: unknown column specified for %_ColSort(%1)%").tqarg(parameter[0]) )); + setError(exp, Error(Error::S_WARNING,Error::C_ARGUMENT,i18n("Expander: unknown column specified for %_ColSort(%1)%").arg(parameter[0]) )); return TQString(); } @@ -909,7 +909,7 @@ TagString exp_PanelSize::expFunc( const ListPanel* panel, const TQStringList& pa newSize = parameter[0].toInt(); if ( newSize < 0 || newSize > 100 ) { - setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Value %1 out of range for %_PanelSize(percent)%. The first parameter has to be >0 and <100").tqarg(newSize)) ); + setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Value %1 out of range for %_PanelSize(percent)%. The first parameter has to be >0 and <100").arg(newSize)) ); return TQString(); } @@ -1031,7 +1031,7 @@ TagString exp_simpleplaceholder::expFunc( const ListPanel* p, const TagStringLis if((*it).isSimple()) lst.push_back((*it).string()); else { - setError(exp,Error(Error::S_FATAL,Error::C_SYNTAX,i18n("%Each% is not allowed in parameter to %1").tqarg(description()))); + setError(exp,Error(Error::S_FATAL,Error::C_SYNTAX,i18n("%Each% is not allowed in parameter to %1").arg(description()))); return TQString(); } return expFunc(p,lst,useUrl,exp); @@ -1052,7 +1052,7 @@ ListPanel* Expander::getPanel( const char panelIndicator, const exp_placeholder* case '_': return 0; default: - exp.setError(Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Expander: Bad panel specifier %1 in placeholder %2").tqarg(panelIndicator).tqarg(pl->description()))); + exp.setError(Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Expander: Bad panel specifier %1 in placeholder %2").arg(panelIndicator).arg(pl->description()))); return 0; } } @@ -1111,7 +1111,7 @@ TagString Expander::expandCurrent( const TQString& stringToExpand, bool useUrl ) break; } if ( i == placeholderCount() ) { // didn't find an expander - setError(Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Error: unrecognized %%%1%2%% in Expander::expand").tqarg(panelIndicator).tqarg(exp)) ); + setError(Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Error: unrecognized %%%1%2%% in Expander::expand").arg(panelIndicator).arg(exp)) ); return TQString(); } } //else diff --git a/krusader/UserAction/kraction.cpp b/krusader/UserAction/kraction.cpp index 43c2bef..d8b81d6 100644 --- a/krusader/UserAction/kraction.cpp +++ b/krusader/UserAction/kraction.cpp @@ -151,7 +151,7 @@ void KrActionProcDlg::slotUser1() { if ( ! open ) { KMessageBox::error( this, - i18n("Can't open %1 for writing!\nNothing exported.").tqarg(filename), + i18n("Can't open %1 for writing!\nNothing exported.").arg(filename), i18n("Export failed!") ); return; diff --git a/krusader/UserAction/useraction.cpp b/krusader/UserAction/useraction.cpp index 10005de..c6d2963 100644 --- a/krusader/UserAction/useraction.cpp +++ b/krusader/UserAction/useraction.cpp @@ -97,7 +97,7 @@ void UserAction::readFromFile( const TQString& filename, ReadMode mode, KrAction file.close(); delete doc; doc = 0; KMessageBox::error( MAIN_VIEW, - i18n( "The file %1 does not contain valid UserActions.\n" ).tqarg( filename ), // text + i18n( "The file %1 does not contain valid UserActions.\n" ).arg( filename ), // text i18n("UserActions - can't read from file!") // caption ); } @@ -108,7 +108,7 @@ void UserAction::readFromFile( const TQString& filename, ReadMode mode, KrAction // check if the file got the right root-element (ACTION_ROOT) - this finds out if the xml-file read to the DOM is realy an krusader useraction-file if( root.tagName() != ACTION_ROOT ) { KMessageBox::error( MAIN_VIEW, - i18n( "The actionfile's root-element isn't called "ACTION_ROOT", using %1").tqarg( filename ), + i18n( "The actionfile's root-element isn't called "ACTION_ROOT", using %1").arg( filename ), i18n( "UserActions - can't read from file!" ) ); delete doc; doc = 0; @@ -120,7 +120,7 @@ void UserAction::readFromFile( const TQString& filename, ReadMode mode, KrAction } // if ( file.open( IO_ReadOnly ) ) else { KMessageBox::error( MAIN_VIEW, - i18n( "Unable to open actionfile %1").tqarg( filename ), + i18n( "Unable to open actionfile %1").arg( filename ), i18n( "UserActions - can't read from file!" ) ); } @@ -150,7 +150,7 @@ void UserAction::readFromElement( const TQDomElement& element, ReadMode mode, Kr int i = 0; // appent a counter till the name is unique... (this checks every action, not only useractions) while ( krApp->actionCollection()->action( name.latin1() ) ) - name = basename.tqarg( ++i ); + name = basename.arg( ++i ); KrAction* act = new KrAction( krApp->actionCollection(), name.latin1() ); if ( act->xmlRead( e ) ) { |
