diff options
Diffstat (limited to 'nsplugins')
| -rw-r--r-- | nsplugins/nspluginloader.cpp | 2 | ||||
| -rw-r--r-- | nsplugins/plugin_part.cpp | 4 | ||||
| -rw-r--r-- | nsplugins/pluginscan.cpp | 16 | ||||
| -rw-r--r-- | nsplugins/viewer/nsplugin.cpp | 2 | ||||
| -rw-r--r-- | nsplugins/viewer/qxteventloop.cpp | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp index 9cd60d77c..db7e214ec 100644 --- a/nsplugins/nspluginloader.cpp +++ b/nsplugins/nspluginloader.cpp @@ -292,7 +292,7 @@ void NSPluginLoader::scanPlugins() stripped = stripped.right( stripped.length()-p ); // add filetype to list - if ( !stripped.isEmpty() && !_filetype.tqfind(stripped) ) + if ( !stripped.isEmpty() && !_filetype.find(stripped) ) _filetype.insert( stripped, new TQString(mime)); } } diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp index 4eaabd612..354cb1cf5 100644 --- a/nsplugins/plugin_part.cpp +++ b/nsplugins/plugin_part.cpp @@ -90,7 +90,7 @@ TQString PluginLiveConnectExtension::evalJavaScript( const TQString & script ) kdDebug(1432) << "PLUGIN:LiveConnect::evalJavaScript " << script << endl; ArgList args; TQString jscode; - jscode.sprintf("this.__nsplugin=eval(\"%s\")", TQString(script).tqreplace('\\', "\\\\").tqreplace('"', "\\\"").latin1()); + jscode.sprintf("this.__nsplugin=eval(\"%s\")", TQString(script).replace('\\', "\\\\").replace('"', "\\\"").latin1()); //kdDebug(1432) << "String is [" << jscode << "]" << endl; args.push_back(qMakePair(KParts::LiveConnectExtension::TypeString, jscode)); TQString nsplugin("Undefined"); @@ -266,7 +266,7 @@ bool PluginPart::openURL(const KURL &url) TQStringList::Iterator it = _args.begin(); for ( ; it != _args.end(); ) { - int equalPos = (*it).tqfind("="); + int equalPos = (*it).find("="); if (equalPos>0) { TQString name = (*it).left(equalPos).upper(); diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp index 91da2dd52..ce2e238bc 100644 --- a/nsplugins/pluginscan.cpp +++ b/nsplugins/pluginscan.cpp @@ -130,7 +130,7 @@ void deletePluginMimeTypes() } for ( unsigned int i=0; i<dirs.count(); i++ ) { - if ( !dirs[i].tqcontains(".") ) { + if ( !dirs[i].contains(".") ) { // check all mime types for X-KDE-nsplugin flag kdDebug(1433) << " - Looking in " << dirs[i] << endl; @@ -162,7 +162,7 @@ void generateMimeType( TQString mime, TQString extensions, TQString pluginName, // get directory from mime string TQString dir; TQString name; - int pos = mime.tqfindRev('/'); + int pos = mime.findRev('/'); if ( pos<0 ) { kdDebug(1433) << "Invalid MIME type " << mime << endl; kdDebug(1433) << "<- generateMimeType" << endl; @@ -283,7 +283,7 @@ int tryCheck(int write_fd, const TQString &absFile) // remove version info, as it is not used at the moment TQRegExp versionRegExp(";version=[^:]*:"); - mimeInfo.tqreplace( versionRegExp, ":"); + mimeInfo.replace( versionRegExp, ":"); // unload plugin lib kdDebug(1433) << " - unloading plugin" << endl; @@ -318,7 +318,7 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList, for (unsigned int i=0; i<files.count(); i++) { TQString extension; - int j = files[i].tqfindRev('.'); + int j = files[i].findRev('.'); if (j > 0) extension = files[i].mid(j+1); @@ -404,10 +404,10 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList, for ( type=types.begin(); type!=types.end(); ++type ) { kdDebug(1433) << " - type=" << *type << endl; - name = name.tqreplace( ':', "%3A" ); + name = name.replace( ':', "%3A" ); TQString entry = name + ":" + *type; - if ( !mimeInfoList.tqcontains( entry ) ) { + if ( !mimeInfoList.contains( entry ) ) { if (!actuallyUsing) { // note the plugin name cache << "[" << absFile << "]" << endl; @@ -444,7 +444,7 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList, static int depth = 0; // avoid recursion because of symlink circles depth++; for ( unsigned int i=0; i<dirs.count(); i++ ) { - if ( depth<8 && !dirs[i].tqcontains(".") ) + if ( depth<8 && !dirs[i].contains(".") ) scanDirectory( dirs.absFilePath(dirs[i]), mimeInfoList, cache ); } depth--; @@ -620,7 +620,7 @@ int main( int argc, char **argv ) TQString desc = info[3]; // append to global mime type list - if ( !mimeTypes.tqcontains(type) ) { + if ( !mimeTypes.contains(type) ) { kdDebug(1433) << " - mimeType=" << type << endl; mimeTypes.append( type ); diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp index ee3ca2d88..fe2dabfbf 100644 --- a/nsplugins/viewer/nsplugin.cpp +++ b/nsplugins/viewer/nsplugin.cpp @@ -1022,7 +1022,7 @@ void NSPluginInstance::resizePlugin(TQ_INT32 w, TQ_INT32 h) void NSPluginInstance::javascriptResult(TQ_INT32 id, TQString result) { - TQMap<int, Request*>::iterator i = _jsrequests.tqfind( id ); + TQMap<int, Request*>::iterator i = _jsrequests.find( id ); if (i != _jsrequests.end()) { Request *req = i.data(); _jsrequests.remove( i ); diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp index ee115d9f0..4e1d13a21 100644 --- a/nsplugins/viewer/qxteventloop.cpp +++ b/nsplugins/viewer/qxteventloop.cpp @@ -154,12 +154,12 @@ Boolean qmotif_event_dispatcher( XEvent *event ) TQApplication::sendPostedEvents(); TQWidgetIntDict *mapper = &static_d->mapper; - TQWidget* qMotif = mapper->tqfind( event->xany.window ); + TQWidget* qMotif = mapper->find( event->xany.window ); if ( !qMotif && TQWidget::find( event->xany.window) == 0 ) { // event is not for Qt, try Xt Display* dpy = TQPaintDevice::x11AppDisplay(); Widget w = XtWindowToWidget( dpy, event->xany.window ); - while ( w && ! ( qMotif = mapper->tqfind( XtWindow( w ) ) ) ) { + while ( w && ! ( qMotif = mapper->find( XtWindow( w ) ) ) ) { if ( XtIsShell( w ) ) { break; } @@ -352,7 +352,7 @@ void QXtEventLoop::unregisterWidget( TQWidget* w ) void qmotif_socknot_handler( XtPointer pointer, int *, XtInputId *id ) { QXtEventLoop *eventloop = (QXtEventLoop *) pointer; - TQSocketNotifier *socknot = static_d->socknotDict.tqfind( *id ); + TQSocketNotifier *socknot = static_d->socknotDict.find( *id ); if ( ! socknot ) // this shouldn't happen return; eventloop->setSocketNotifierPending( socknot ); |