diff options
Diffstat (limited to 'kbabel/commonui/toolaction.cpp')
| -rw-r--r-- | kbabel/commonui/toolaction.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kbabel/commonui/toolaction.cpp b/kbabel/commonui/toolaction.cpp index 20dac847..ebb52bb4 100644 --- a/kbabel/commonui/toolaction.cpp +++ b/kbabel/commonui/toolaction.cpp @@ -18,11 +18,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -34,8 +34,8 @@ #include <kdebug.h> ToolAction::ToolAction( const TQString & text, const KShortcut& cut, const KDataToolInfo & info, const TQString & command, - TQObject * parent, const char * name ) - : KAction( text, info.iconName() == "unknown" ? TQString::null : info.iconName(), cut, parent, name ), + TQObject * tqparent, const char * name ) + : KAction( text, info.iconName() == "unknown" ? TQString() : info.iconName(), cut, tqparent, name ), m_command( command ), m_info( info ) { @@ -46,7 +46,7 @@ void ToolAction::slotActivated() emit toolActivated( m_info, m_command ); } -TQPtrList<KAction> ToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* parent, const TQString& namePrefix ) +TQPtrList<KAction> ToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* tqparent, const TQString& namePrefix ) { TQPtrList<KAction> actionList; if ( tools.isEmpty() ) @@ -69,12 +69,12 @@ TQPtrList<KAction> ToolAction::dataToolActionList( const TQValueList<KDataToolIn TQStringList::ConstIterator sit = shortcuts.begin(); for (; uit != userCommands.end() && cit != commands.end(); ++uit, ++cit) { - if( !excludeCommand == command.contains(*cit) ) + if( !excludeCommand == command.tqcontains(*cit) ) { TQString sc=*sit; - ToolAction * action = new ToolAction( *uit, (sc.isEmpty()?TQString::null:sc), *entry, *cit - , parent + ToolAction * action = new ToolAction( *uit, (sc.isEmpty()?TQString():sc), *entry, *cit + , tqparent , TQString(namePrefix+(*entry).service()->library()+"_"+(*cit)).utf8() ); connect( action, TQT_SIGNAL( toolActivated( const KDataToolInfo &, const TQString & ) ), receiver, slot ); @@ -96,7 +96,7 @@ TQValueList<KDataToolInfo> ToolAction::validationTools() for( TQValueList<KDataToolInfo>::ConstIterator entry = tools.begin(); entry != tools.end(); ++entry ) { - if( (*entry).commands().contains("validate") ) + if( (*entry).commands().tqcontains("validate") ) { result.append( *entry ); } |