From c663b6440964f6ac48027143ac9e63298991f9d0 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:33:34 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- konqueror/KonqMainWindowIface.cc | 22 +- konqueror/KonqMainWindowIface.h | 18 +- konqueror/KonqViewIface.cc | 20 +- konqueror/KonqViewIface.h | 22 +- konqueror/KonquerorIface.cc | 100 +- konqueror/KonquerorIface.h | 54 +- konqueror/about/konq_aboutpage.cc | 160 +-- konqueror/about/konq_aboutpage.h | 38 +- konqueror/client/kfmclient.cc | 144 +-- konqueror/client/kfmclient.h | 6 +- konqueror/delayedinitializer.cc | 10 +- konqueror/delayedinitializer.h | 6 +- konqueror/iconview/konq_iconview.cc | 286 ++--- konqueror/iconview/konq_iconview.h | 46 +- konqueror/keditbookmarks/actionsimpl.cpp | 160 +-- konqueror/keditbookmarks/actionsimpl.h | 2 +- konqueror/keditbookmarks/bookmarkinfo.cpp | 94 +- konqueror/keditbookmarks/bookmarkinfo.h | 16 +- konqueror/keditbookmarks/bookmarkiterator.cpp | 12 +- konqueror/keditbookmarks/bookmarkiterator.h | 10 +- konqueror/keditbookmarks/commands.cpp | 180 ++-- konqueror/keditbookmarks/commands.h | 148 +-- konqueror/keditbookmarks/dcop.cpp | 16 +- konqueror/keditbookmarks/dcop.h | 4 +- konqueror/keditbookmarks/exporters.cpp | 12 +- konqueror/keditbookmarks/exporters.h | 8 +- konqueror/keditbookmarks/favicons.cpp | 10 +- konqueror/keditbookmarks/favicons.h | 6 +- konqueror/keditbookmarks/importers.cpp | 58 +- konqueror/keditbookmarks/importers.h | 70 +- konqueror/keditbookmarks/kbookmarkmerger.cpp | 18 +- konqueror/keditbookmarks/kebsearchline.cpp | 14 +- konqueror/keditbookmarks/kebsearchline.h | 14 +- konqueror/keditbookmarks/listview.cpp | 250 ++--- konqueror/keditbookmarks/listview.h | 96 +- konqueror/keditbookmarks/main.cpp | 34 +- konqueror/keditbookmarks/testlink.cpp | 116 +- konqueror/keditbookmarks/testlink.h | 28 +- konqueror/keditbookmarks/toplevel.cpp | 64 +- konqueror/keditbookmarks/toplevel.h | 34 +- konqueror/keditbookmarks/updater.cpp | 48 +- konqueror/keditbookmarks/updater.h | 10 +- konqueror/konq_actions.cc | 102 +- konqueror/konq_actions.h | 52 +- konqueror/konq_combo.cc | 238 ++--- konqueror/konq_combo.h | 44 +- konqueror/konq_extensionmanager.cc | 24 +- konqueror/konq_extensionmanager.h | 2 +- konqueror/konq_factory.cc | 42 +- konqueror/konq_factory.h | 18 +- konqueror/konq_frame.cc | 202 ++-- konqueror/konq_frame.h | 124 +-- konqueror/konq_guiclients.cc | 88 +- konqueror/konq_guiclients.h | 20 +- konqueror/konq_main.cc | 46 +- konqueror/konq_mainwindow.cc | 1104 ++++++++++---------- konqueror/konq_mainwindow.h | 170 +-- konqueror/konq_mainwindow_p.h | 6 +- konqueror/konq_misc.cc | 54 +- konqueror/konq_misc.h | 28 +- konqueror/konq_openurlrequest.h | 16 +- konqueror/konq_profiledlg.cc | 82 +- konqueror/konq_profiledlg.h | 26 +- konqueror/konq_run.cc | 16 +- konqueror/konq_run.h | 10 +- konqueror/konq_tabs.cc | 182 ++-- konqueror/konq_tabs.h | 48 +- konqueror/konq_view.cc | 330 +++--- konqueror/konq_view.h | 98 +- konqueror/konq_viewmgr.cc | 244 ++--- konqueror/konq_viewmgr.h | 64 +- konqueror/kttsplugin/khtmlkttsd.cpp | 44 +- konqueror/kttsplugin/khtmlkttsd.h | 2 +- konqueror/listview/konq_infolistviewitem.cc | 54 +- konqueror/listview/konq_infolistviewitem.h | 12 +- konqueror/listview/konq_infolistviewwidget.cc | 70 +- konqueror/listview/konq_infolistviewwidget.h | 12 +- konqueror/listview/konq_listview.cc | 112 +- konqueror/listview/konq_listview.h | 20 +- konqueror/listview/konq_listviewitems.cc | 74 +- konqueror/listview/konq_listviewitems.h | 18 +- konqueror/listview/konq_listviewwidget.cc | 314 +++--- konqueror/listview/konq_listviewwidget.h | 104 +- konqueror/listview/konq_textviewitem.cc | 28 +- konqueror/listview/konq_textviewitem.h | 12 +- konqueror/listview/konq_textviewwidget.cc | 16 +- konqueror/listview/konq_textviewwidget.h | 12 +- konqueror/listview/konq_treeviewitem.cc | 8 +- konqueror/listview/konq_treeviewitem.h | 6 +- konqueror/listview/konq_treeviewwidget.cc | 40 +- konqueror/listview/konq_treeviewwidget.h | 14 +- konqueror/preloader/preloader.cc | 26 +- konqueror/preloader/preloader.h | 20 +- .../remoteencodingplugin/kremoteencodingplugin.cpp | 48 +- .../remoteencodingplugin/kremoteencodingplugin.h | 8 +- konqueror/shellcmdplugin/kshellcmddialog.cpp | 20 +- konqueror/shellcmdplugin/kshellcmddialog.h | 4 +- konqueror/shellcmdplugin/kshellcmdexecutor.cpp | 24 +- konqueror/shellcmdplugin/kshellcmdexecutor.h | 12 +- konqueror/shellcmdplugin/kshellcmdplugin.cpp | 12 +- konqueror/shellcmdplugin/kshellcmdplugin.h | 2 +- konqueror/sidebar/konqsidebar.cpp | 28 +- konqueror/sidebar/konqsidebar.h | 16 +- konqueror/sidebar/konqsidebarplugin.cpp | 6 +- konqueror/sidebar/konqsidebarplugin.h | 38 +- konqueror/sidebar/sidebar_widget.cpp | 354 +++---- konqueror/sidebar/sidebar_widget.h | 108 +- konqueror/sidebar/test/konqsidebartest.cpp | 2 +- konqueror/sidebar/test/konqsidebartest.h | 14 +- .../trees/bookmark_module/bookmark_item.cpp | 8 +- .../sidebar/trees/bookmark_module/bookmark_item.h | 6 +- .../trees/bookmark_module/bookmark_module.cpp | 134 +-- .../trees/bookmark_module/bookmark_module.h | 30 +- .../sidebar/trees/dirtree_module/dirtree_item.cpp | 38 +- .../sidebar/trees/dirtree_module/dirtree_item.h | 18 +- .../trees/dirtree_module/dirtree_module.cpp | 90 +- .../sidebar/trees/dirtree_module/dirtree_module.h | 12 +- .../sidebar/trees/history_module/history_item.cpp | 42 +- .../sidebar/trees/history_module/history_item.h | 26 +- .../trees/history_module/history_module.cpp | 76 +- .../sidebar/trees/history_module/history_module.h | 32 +- .../trees/history_module/history_settings.cpp | 22 +- .../trees/history_module/history_settings.h | 12 +- .../sidebar/trees/history_module/kcmhistory.cpp | 88 +- .../sidebar/trees/history_module/kcmhistory.h | 8 +- konqueror/sidebar/trees/konq_sidebartree.cpp | 254 ++--- konqueror/sidebar/trees/konq_sidebartree.h | 86 +- konqueror/sidebar/trees/konq_sidebartreeitem.cpp | 4 +- konqueror/sidebar/trees/konq_sidebartreeitem.h | 22 +- konqueror/sidebar/trees/konq_sidebartreemodule.h | 4 +- .../sidebar/trees/konq_sidebartreetoplevelitem.cpp | 30 +- .../sidebar/trees/konq_sidebartreetoplevelitem.h | 20 +- konqueror/sidebar/trees/konqsidebar_tree.cpp | 68 +- konqueror/sidebar/trees/konqsidebar_tree.h | 26 +- konqueror/sidebar/web_module/web_module.cpp | 70 +- konqueror/sidebar/web_module/web_module.h | 70 +- 136 files changed, 4477 insertions(+), 4477 deletions(-) (limited to 'konqueror') diff --git a/konqueror/KonqMainWindowIface.cc b/konqueror/KonqMainWindowIface.cc index 00233d883..462c08aed 100644 --- a/konqueror/KonqMainWindowIface.cc +++ b/konqueror/KonqMainWindowIface.cc @@ -45,27 +45,27 @@ KonqMainWindowIface::~KonqMainWindowIface() delete m_dcopActionProxy; } -void KonqMainWindowIface::openURL( QString url ) +void KonqMainWindowIface::openURL( TQString url ) { m_pMainWindow->openFilteredURL( url ); } -void KonqMainWindowIface::newTab( QString url ) +void KonqMainWindowIface::newTab( TQString url ) { m_pMainWindow->openFilteredURL( url, true ); } -void KonqMainWindowIface::openURL( QString url, bool tempFile ) +void KonqMainWindowIface::openURL( TQString url, bool tempFile ) { m_pMainWindow->openFilteredURL( url, false, tempFile ); } -void KonqMainWindowIface::newTab( QString url, bool tempFile ) +void KonqMainWindowIface::newTab( TQString url, bool tempFile ) { m_pMainWindow->openFilteredURL( url, true, tempFile ); } -void KonqMainWindowIface::newTabASN( QString url, const QCString& startup_id, bool tempFile ) +void KonqMainWindowIface::newTabASN( TQString url, const TQCString& startup_id, bool tempFile ) { KStartupInfo::setNewStartupId( m_pMainWindow, startup_id ); m_pMainWindow->openFilteredURL( url, true, tempFile ); @@ -129,7 +129,7 @@ DCOPRef KonqMainWindowIface::part(int viewNumber) return (*it)->dcopObject()->part(); } -DCOPRef KonqMainWindowIface::action( const QCString &name ) +DCOPRef KonqMainWindowIface::action( const TQCString &name ) { return DCOPRef( kapp->dcopClient()->appId(), m_dcopActionProxy->actionObjectId( name ) ); } @@ -137,16 +137,16 @@ DCOPRef KonqMainWindowIface::action( const QCString &name ) QCStringList KonqMainWindowIface::actions() { QCStringList res; - QValueList lst = m_dcopActionProxy->actions(); - QValueList::ConstIterator it = lst.begin(); - QValueList::ConstIterator end = lst.end(); + TQValueList lst = m_dcopActionProxy->actions(); + TQValueList::ConstIterator it = lst.begin(); + TQValueList::ConstIterator end = lst.end(); for (; it != end; ++it ) res.append( (*it)->name() ); return res; } -QMap KonqMainWindowIface::actionMap() +TQMap KonqMainWindowIface::actionMap() { return m_dcopActionProxy->actionMap(); } @@ -156,7 +156,7 @@ QCStringList KonqMainWindowIface::functionsDynamic() return DCOPObject::functionsDynamic() + KDCOPPropertyProxy::functions( m_pMainWindow ); } -bool KonqMainWindowIface::processDynamic( const QCString &fun, const QByteArray &data, QCString &replyType, QByteArray &replyData ) +bool KonqMainWindowIface::processDynamic( const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData ) { if ( KDCOPPropertyProxy::isPropertyRequest( fun, m_pMainWindow ) ) return KDCOPPropertyProxy::processPropertyRequest( fun, data, replyType, replyData, m_pMainWindow ); diff --git a/konqueror/KonqMainWindowIface.h b/konqueror/KonqMainWindowIface.h index 334307cb0..fc853e536 100644 --- a/konqueror/KonqMainWindowIface.h +++ b/konqueror/KonqMainWindowIface.h @@ -22,7 +22,7 @@ #define __KonqMainWindowIface_h__ #include -#include +#include #include #include @@ -42,13 +42,13 @@ public: k_dcop: - void openURL( QString url ); - void newTab( QString url ); + void openURL( TQString url ); + void newTab( TQString url ); - void openURL( QString url, bool tempFile ); - void newTab( QString url, bool tempFile ); + void openURL( TQString url, bool tempFile ); + void newTab( TQString url, bool tempFile ); - void newTabASN( QString url, const QCString& startup_id, bool tempFile ); + void newTabASN( TQString url, const TQCString& startup_id, bool tempFile ); void splitViewHorizontally(); void splitViewVertically(); @@ -71,9 +71,9 @@ k_dcop: DCOPRef view(int viewNumber); DCOPRef part(int partNumber); - DCOPRef action( const QCString &name ); + DCOPRef action( const TQCString &name ); QCStringList actions(); - QMap actionMap(); + TQMap actionMap(); /** * Used by kfmclient when searching a window to open a tab within @@ -82,7 +82,7 @@ k_dcop: public: virtual QCStringList functionsDynamic(); - virtual bool processDynamic( const QCString &fun, const QByteArray &data, QCString &replyType, QByteArray &replyData ); + virtual bool processDynamic( const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData ); private: diff --git a/konqueror/KonqViewIface.cc b/konqueror/KonqViewIface.cc index 0aeffda1a..8219fc861 100644 --- a/konqueror/KonqViewIface.cc +++ b/konqueror/KonqViewIface.cc @@ -25,7 +25,7 @@ #include #include -KonqViewIface::KonqViewIface( KonqView * view, const QCString& name ) +KonqViewIface::KonqViewIface( KonqView * view, const TQCString& name ) : DCOPObject( name ), m_pView ( view ) { } @@ -34,14 +34,14 @@ KonqViewIface::~KonqViewIface() { } -void KonqViewIface::openURL( QString url, const QString & locationBarURL, const QString & nameFilter ) +void KonqViewIface::openURL( TQString url, const TQString & locationBarURL, const TQString & nameFilter ) { KURL u(url); m_pView->openURL( u, locationBarURL, nameFilter ); } -bool KonqViewIface::changeViewMode( const QString &serviceType, - const QString &serviceName ) +bool KonqViewIface::changeViewMode( const TQString &serviceType, + const TQString &serviceName ) { return m_pView->changeViewMode( serviceType, serviceName ); } @@ -57,22 +57,22 @@ void KonqViewIface::stop() m_pView->stop(); } -QString KonqViewIface::url() +TQString KonqViewIface::url() { return m_pView->url().url(); } -QString KonqViewIface::locationBarURL() +TQString KonqViewIface::locationBarURL() { return m_pView->locationBarURL(); } -QString KonqViewIface::serviceType() +TQString KonqViewIface::serviceType() { return m_pView->serviceType(); } -QStringList KonqViewIface::serviceTypes() +TQStringList KonqViewIface::serviceTypes() { return m_pView->serviceTypes(); } @@ -86,9 +86,9 @@ DCOPRef KonqViewIface::part() if ( !part ) return res; - QVariant dcopProperty = part->property( "dcopObjectId" ); + TQVariant dcopProperty = part->property( "dcopObjectId" ); - if ( dcopProperty.type() != QVariant::CString ) + if ( dcopProperty.type() != TQVariant::CString ) return res; res.setRef( kapp->dcopClient()->appId(), dcopProperty.toCString() ); diff --git a/konqueror/KonqViewIface.h b/konqueror/KonqViewIface.h index 43630f7f5..aa79de719 100644 --- a/konqueror/KonqViewIface.h +++ b/konqueror/KonqViewIface.h @@ -22,7 +22,7 @@ #define __KonqViewIface_h__ #include -#include +#include #include class KonqView; @@ -35,7 +35,7 @@ class KonqViewIface : virtual public DCOPObject K_DCOP public: - KonqViewIface( KonqView * view, const QCString& name ); + KonqViewIface( KonqView * view, const TQCString& name ); ~KonqViewIface(); k_dcop: @@ -44,9 +44,9 @@ k_dcop: * Displays another URL, but without changing the view mode * (Make sure the part can display this URL) */ - void openURL( QString url, - const QString & locationBarURL, - const QString & nameFilter ); + void openURL( TQString url, + const TQString & locationBarURL, + const TQString & nameFilter ); /** Reload */ void reload(); @@ -57,8 +57,8 @@ k_dcop: * @param serviceName allows to enforce a particular service to be chosen, * @see KonqFactory. */ - bool changeViewMode( const QString &serviceType, - const QString &serviceName ); + bool changeViewMode( const TQString &serviceType, + const TQString &serviceName ); /** * Call this to prevent next openURL() call from changing history lists @@ -74,23 +74,23 @@ k_dcop: /** * Retrieve view's URL */ - QString url(); + TQString url(); /** * Get view's location bar URL, i.e. the one that the view signals * It can be different from url(), for instance if we display a index.html */ - QString locationBarURL(); + TQString locationBarURL(); /** * @return the servicetype this view is currently displaying */ - QString serviceType(); + TQString serviceType(); /** * @return the servicetypes this view is capable to display */ - QStringList serviceTypes(); + TQStringList serviceTypes(); /** * @return the part embedded into this view diff --git a/konqueror/KonquerorIface.cc b/konqueror/KonquerorIface.cc index 3656512f7..ce7850967 100644 --- a/konqueror/KonquerorIface.cc +++ b/konqueror/KonquerorIface.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "konq_settingsxt.h" // these DCOP calls come from outside, so any windows created by these @@ -50,7 +50,7 @@ KonquerorIface::~KonquerorIface() { } -DCOPRef KonquerorIface::openBrowserWindow( const QString &url ) +DCOPRef KonquerorIface::openBrowserWindow( const TQString &url ) { qt_x_user_time = 0; KonqMainWindow *res = KonqMisc::createSimpleWindow( KURL(url) ); @@ -59,24 +59,24 @@ DCOPRef KonquerorIface::openBrowserWindow( const QString &url ) return res->dcopObject(); } -DCOPRef KonquerorIface::openBrowserWindowASN( const QString &url, const QCString& startup_id ) +DCOPRef KonquerorIface::openBrowserWindowASN( const TQString &url, const TQCString& startup_id ) { kapp->setStartupId( startup_id ); return openBrowserWindow( url ); } -DCOPRef KonquerorIface::createNewWindow( const QString &url ) +DCOPRef KonquerorIface::createNewWindow( const TQString &url ) { - return createNewWindow( url, QString::null, false ); + return createNewWindow( url, TQString::null, false ); } -DCOPRef KonquerorIface::createNewWindowASN( const QString &url, const QCString& startup_id, bool tempFile ) +DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQCString& startup_id, bool tempFile ) { kapp->setStartupId( startup_id ); - return createNewWindow( url, QString::null, tempFile ); + return createNewWindow( url, TQString::null, tempFile ); } -DCOPRef KonquerorIface::createNewWindowWithSelection( const QString &url, QStringList filesToSelect ) +DCOPRef KonquerorIface::createNewWindowWithSelection( const TQString &url, TQStringList filesToSelect ) { qt_x_user_time = 0; KonqMainWindow *res = KonqMisc::createNewWindow( KURL(url), KParts::URLArgs(), false, filesToSelect ); @@ -85,50 +85,50 @@ DCOPRef KonquerorIface::createNewWindowWithSelection( const QString &url, QStrin return res->dcopObject(); } -DCOPRef KonquerorIface::createNewWindowWithSelectionASN( const QString &url, QStringList filesToSelect, const QCString &startup_id ) +DCOPRef KonquerorIface::createNewWindowWithSelectionASN( const TQString &url, TQStringList filesToSelect, const TQCString &startup_id ) { kapp->setStartupId( startup_id ); return createNewWindowWithSelection( url, filesToSelect ); } -DCOPRef KonquerorIface::createNewWindow( const QString &url, const QString &mimetype, bool tempFile ) +DCOPRef KonquerorIface::createNewWindow( const TQString &url, const TQString &mimetype, bool tempFile ) { qt_x_user_time = 0; KParts::URLArgs args; args.serviceType = mimetype; // Filter the URL, so that "kfmclient openURL gg:foo" works also when konq is already running KURL finalURL = KonqMisc::konqFilteredURL( 0, url ); - KonqMainWindow *res = KonqMisc::createNewWindow( finalURL, args, false, QStringList(), tempFile ); + KonqMainWindow *res = KonqMisc::createNewWindow( finalURL, args, false, TQStringList(), tempFile ); if ( !res ) return DCOPRef(); return res->dcopObject(); } -DCOPRef KonquerorIface::createNewWindowASN( const QString &url, const QString &mimetype, - const QCString& startup_id, bool tempFile ) +DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQString &mimetype, + const TQCString& startup_id, bool tempFile ) { kapp->setStartupId( startup_id ); return createNewWindow( url, mimetype, tempFile ); } -DCOPRef KonquerorIface::createBrowserWindowFromProfile( const QString &path ) +DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString &path ) { qt_x_user_time = 0; - kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( const QString &path ) " << endl; + kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( const TQString &path ) " << endl; kdDebug(1202) << path << endl; - KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, QString::null ); + KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, TQString::null ); if ( !res ) return DCOPRef(); return res->dcopObject(); } -DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const QString &path, const QCString& startup_id ) +DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path, const TQCString& startup_id ) { kapp->setStartupId( startup_id ); return createBrowserWindowFromProfile( path ); } -DCOPRef KonquerorIface::createBrowserWindowFromProfile( const QString & path, const QString &filename ) +DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString & path, const TQString &filename ) { qt_x_user_time = 0; kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( path, filename ) " << endl; @@ -139,14 +139,14 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfile( const QString & path, co return res->dcopObject(); } -DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const QString &path, const QString &filename, - const QCString& startup_id ) +DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path, const TQString &filename, + const TQCString& startup_id ) { kapp->setStartupId( startup_id ); return createBrowserWindowFromProfile( path, filename ); } -DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const QString & path, const QString &filename, const QString &url ) +DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString & path, const TQString &filename, const TQString &url ) { qt_x_user_time = 0; KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KURL(url) ); @@ -155,14 +155,14 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const QString & pa return res->dcopObject(); } -DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const QString & path, const QString &filename, const QString &url, - const QCString& startup_id ) +DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString & path, const TQString &filename, const TQString &url, + const TQCString& startup_id ) { kapp->setStartupId( startup_id ); return createBrowserWindowFromProfileAndURL( path, filename, url ); } -DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const QString &path, const QString &filename, const QString &url, const QString &mimetype ) +DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString &path, const TQString &filename, const TQString &url, const TQString &mimetype ) { qt_x_user_time = 0; KParts::URLArgs args; @@ -173,8 +173,8 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const QString &pat return res->dcopObject(); } -DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const QString & path, const QString &filename, const QString &url, const QString &mimetype, - const QCString& startup_id ) +DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString & path, const TQString &filename, const TQString &url, const TQString &mimetype, + const TQCString& startup_id ) { kapp->setStartupId( startup_id ); return createBrowserWindowFromProfileAndURL( path, filename, url, mimetype ); @@ -186,10 +186,10 @@ void KonquerorIface::reparseConfiguration() KGlobal::config()->reparseConfiguration(); KonqFMSettings::reparseConfiguration(); - QPtrList *mainWindows = KonqMainWindow::mainWindowList(); + TQPtrList *mainWindows = KonqMainWindow::mainWindowList(); if ( mainWindows ) { - QPtrListIterator it( *mainWindows ); + TQPtrListIterator it( *mainWindows ); for (; it.current(); ++it ) it.current()->reparseConfiguration(); } @@ -197,47 +197,47 @@ void KonquerorIface::reparseConfiguration() void KonquerorIface::updateProfileList() { - QPtrList *mainWindows = KonqMainWindow::mainWindowList(); + TQPtrList *mainWindows = KonqMainWindow::mainWindowList(); if ( !mainWindows ) return; - QPtrListIterator it( *mainWindows ); + TQPtrListIterator it( *mainWindows ); for (; it.current(); ++it ) it.current()->viewManager()->profileListDirty( false ); } -QString KonquerorIface::crashLogFile() +TQString KonquerorIface::crashLogFile() { return KonqMainWindow::s_crashlog_file->name(); } -QValueList KonquerorIface::getWindows() +TQValueList KonquerorIface::getWindows() { - QValueList lst; - QPtrList *mainWindows = KonqMainWindow::mainWindowList(); + TQValueList lst; + TQPtrList *mainWindows = KonqMainWindow::mainWindowList(); if ( mainWindows ) { - QPtrListIterator it( *mainWindows ); + TQPtrListIterator it( *mainWindows ); for (; it.current(); ++it ) lst.append( DCOPRef( kapp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) ); } return lst; } -void KonquerorIface::addToCombo( QString url, QCString objId ) +void KonquerorIface::addToCombo( TQString url, TQCString objId ) { KonqMainWindow::comboAction( KonqMainWindow::ComboAdd, url, objId ); } -void KonquerorIface::removeFromCombo( QString url, QCString objId ) +void KonquerorIface::removeFromCombo( TQString url, TQCString objId ) { KonqMainWindow::comboAction( KonqMainWindow::ComboRemove, url, objId ); } -void KonquerorIface::comboCleared( QCString objId ) +void KonquerorIface::comboCleared( TQCString objId ) { KonqMainWindow::comboAction( KonqMainWindow::ComboClear, - QString::null, objId ); + TQString::null, objId ); } bool KonquerorIface::processCanBeReused( int screen ) @@ -246,31 +246,31 @@ bool KonquerorIface::processCanBeReused( int screen ) return false; // this instance run on different screen, and Qt apps can't migrate if( KonqMainWindow::isPreloaded()) return false; // will be handled by preloading related code instead - QPtrList* windows = KonqMainWindow::mainWindowList(); + TQPtrList* windows = KonqMainWindow::mainWindowList(); if( windows == NULL ) return true; - QStringList allowed_parts = KonqSettings::safeParts(); + TQStringList allowed_parts = KonqSettings::safeParts(); bool all_parts_allowed = false; - if( allowed_parts.count() == 1 && allowed_parts.first() == QString::fromLatin1( "SAFE" )) + if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "SAFE" )) { allowed_parts.clear(); // is duplicated in client/kfmclient.cc - allowed_parts << QString::fromLatin1( "konq_iconview.desktop" ) - << QString::fromLatin1( "konq_multicolumnview.desktop" ) - << QString::fromLatin1( "konq_sidebartng.desktop" ) - << QString::fromLatin1( "konq_infolistview.desktop" ) - << QString::fromLatin1( "konq_treeview.desktop" ) - << QString::fromLatin1( "konq_detailedlistview.desktop" ); + allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" ) + << TQString::fromLatin1( "konq_multicolumnview.desktop" ) + << TQString::fromLatin1( "konq_sidebartng.desktop" ) + << TQString::fromLatin1( "konq_infolistview.desktop" ) + << TQString::fromLatin1( "konq_treeview.desktop" ) + << TQString::fromLatin1( "konq_detailedlistview.desktop" ); } - else if( allowed_parts.count() == 1 && allowed_parts.first() == QString::fromLatin1( "ALL" )) + else if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "ALL" )) { allowed_parts.clear(); all_parts_allowed = true; } if( all_parts_allowed ) return true; - for( QPtrListIterator it1( *windows ); + for( TQPtrListIterator it1( *windows ); it1 != NULL; ++it1 ) { diff --git a/konqueror/KonquerorIface.h b/konqueror/KonquerorIface.h index ba5fd41dd..508feda85 100644 --- a/konqueror/KonquerorIface.h +++ b/konqueror/KonquerorIface.h @@ -22,10 +22,10 @@ #define __KonquerorIface_h__ #include -#include +#include #include -#include +#include /** * DCOP interface for konqueror */ @@ -42,55 +42,55 @@ k_dcop: /** * Opens a new window for the given @p url (using createSimpleWindow, i.e. a single view) */ - DCOPRef openBrowserWindow( const QString &url ); + DCOPRef openBrowserWindow( const TQString &url ); /** * Like @ref openBrowserWindow , with setting the application startup notification ( ASN ) * property on the window. */ - DCOPRef openBrowserWindowASN( const QString &url, const QCString &startup_id ); + DCOPRef openBrowserWindowASN( const TQString &url, const TQCString &startup_id ); /** * Opens a new window for the given @p url (using createNewWindow, i.e. with an appropriate profile) */ - DCOPRef createNewWindow( const QString &url ); + DCOPRef createNewWindow( const TQString &url ); /** * Like @ref createNewWindow , with setting the application startup notification ( ASN ) * property on the window. */ - DCOPRef createNewWindowASN( const QString &url, const QCString &startup_id, bool tempFile ); + DCOPRef createNewWindowASN( const TQString &url, const TQCString &startup_id, bool tempFile ); /** * Opens a new window like @ref createNewWindow, then selects the given @p filesToSelect */ - DCOPRef createNewWindowWithSelection( const QString &url, QStringList filesToSelect ); + DCOPRef createNewWindowWithSelection( const TQString &url, TQStringList filesToSelect ); /** * Like @ref createNewWindowWithSelection, with setting the application startup notification ( ASN ) * property on the window. */ - DCOPRef createNewWindowWithSelectionASN( const QString &url, QStringList filesToSelect, const QCString &startup_id ); + DCOPRef createNewWindowWithSelectionASN( const TQString &url, TQStringList filesToSelect, const TQCString &startup_id ); /** * Opens a new window for the given @p url (using createNewWindow, i.e. with an appropriate profile) * @param mimetype to speed it up. */ - DCOPRef createNewWindow( const QString &url, const QString & mimetype, bool tempFile ); + DCOPRef createNewWindow( const TQString &url, const TQString & mimetype, bool tempFile ); /** * Like @ref createNewWindow , with setting the application startup notification ( ASN ) * property on the window. */ - DCOPRef createNewWindowASN( const QString &url, const QString & mimetype, - const QCString &startup_id, bool tempFile ); + DCOPRef createNewWindowASN( const TQString &url, const TQString & mimetype, + const TQCString &startup_id, bool tempFile ); /** * As the name says, this creates a window from a profile. * Used for instance by khelpcenter. */ - DCOPRef createBrowserWindowFromProfile( const QString &path ); + DCOPRef createBrowserWindowFromProfile( const TQString &path ); /** * Like @ref createBrowserWindowFromProfile , with setting the application startup * notification ( ASN ) property on the window. */ - DCOPRef createBrowserWindowFromProfileASN( const QString &path, const QCString &startup_id ); + DCOPRef createBrowserWindowFromProfileASN( const TQString &path, const TQCString &startup_id ); /** * As the name says, this creates a window from a profile. @@ -98,13 +98,13 @@ k_dcop: * @param path full path to the profile file * @param filename name of the profile file, if under the profiles dir */ - DCOPRef createBrowserWindowFromProfile( const QString &path, const QString &filename ); + DCOPRef createBrowserWindowFromProfile( const TQString &path, const TQString &filename ); /** * Like @ref createBrowserWindowFromProfile , with setting the application startup * notification ( ASN ) property on the window. */ - DCOPRef createBrowserWindowFromProfileASN( const QString &path, const QString &filename, - const QCString &startup_id ); + DCOPRef createBrowserWindowFromProfileASN( const TQString &path, const TQString &filename, + const TQCString &startup_id ); /** * Creates a window from a profile and a URL. @@ -114,13 +114,13 @@ k_dcop: * @param filename name of the profile file, if under the profiles dir * @param url the URL to open */ - DCOPRef createBrowserWindowFromProfileAndURL( const QString &path, const QString &filename, const QString &url ); + DCOPRef createBrowserWindowFromProfileAndURL( const TQString &path, const TQString &filename, const TQString &url ); /** * Like @ref createBrowserWindowFromProfileAndURL , with setting the application startup * notification ( ASN ) property on the window. */ - DCOPRef createBrowserWindowFromProfileAndURLASN( const QString &path, const QString &filename, const QString &url, - const QCString &startup_id ); + DCOPRef createBrowserWindowFromProfileAndURLASN( const TQString &path, const TQString &filename, const TQString &url, + const TQCString &startup_id ); /** * Creates a window the fastest way : the caller has to provide @@ -130,13 +130,13 @@ k_dcop: * @param url the URL to open * @param mimetype the mimetype that the URL we want to open has */ - DCOPRef createBrowserWindowFromProfileAndURL( const QString &path, const QString &filename, const QString &url, const QString &mimetype ); + DCOPRef createBrowserWindowFromProfileAndURL( const TQString &path, const TQString &filename, const TQString &url, const TQString &mimetype ); /** * Like @ref createBrowserWindowFromProfileAndURL , with setting the application startup * notification ( ASN ) property on the window. */ - DCOPRef createBrowserWindowFromProfileAndURLASN( const QString &path, const QString &filename, const QString &url, const QString &mimetype, - const QCString& startup_id ); + DCOPRef createBrowserWindowFromProfileAndURLASN( const TQString &path, const TQString &filename, const TQString &url, const TQString &mimetype, + const TQCString& startup_id ); /** * Called by kcontrol when the global configuration changes @@ -146,12 +146,12 @@ k_dcop: /** * @return the name of the instance's crash log file */ - QString crashLogFile(); + TQString crashLogFile(); /** * @return a list of references to all the windows */ - QValueList getWindows(); + TQValueList getWindows(); /** * Called internally as broadcast when the user adds/removes/renames a view profile @@ -161,17 +161,17 @@ k_dcop: /** * Called internally as broadcast when a URL is to be added to the combobox. */ - ASYNC addToCombo( QString, QCString ); + ASYNC addToCombo( TQString, TQCString ); /** * Called internall as broadcast when a URL has to be removed from the combo. */ - ASYNC removeFromCombo( QString, QCString ); + ASYNC removeFromCombo( TQString, TQCString ); /** * Called internally as a broadcast when the combobox was cleared. */ - ASYNC comboCleared( QCString ); + ASYNC comboCleared( TQCString ); /** * Used by kfmclient when the 'minimize memory usage' setting is set diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index 8a5385697..c9c83fd4f 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -1,6 +1,6 @@ #include "konq_aboutpage.h" -#include +#include #include #include @@ -16,19 +16,19 @@ #include #include -#include -#include +#include +#include K_EXPORT_COMPONENT_FACTORY( konq_aboutpage, KonqAboutPageFactory ) KInstance *KonqAboutPageFactory::s_instance = 0; -QString *KonqAboutPageFactory::s_launch_html = 0; -QString *KonqAboutPageFactory::s_intro_html = 0; -QString *KonqAboutPageFactory::s_specs_html = 0; -QString *KonqAboutPageFactory::s_tips_html = 0; -QString *KonqAboutPageFactory::s_plugins_html = 0; +TQString *KonqAboutPageFactory::s_launch_html = 0; +TQString *KonqAboutPageFactory::s_intro_html = 0; +TQString *KonqAboutPageFactory::s_specs_html = 0; +TQString *KonqAboutPageFactory::s_tips_html = 0; +TQString *KonqAboutPageFactory::s_plugins_html = 0; -KonqAboutPageFactory::KonqAboutPageFactory( QObject *parent, const char *name ) +KonqAboutPageFactory::KonqAboutPageFactory( TQObject *parent, const char *name ) : KParts::Factory( parent, name ) { s_instance = new KInstance( "konqaboutpage" ); @@ -50,9 +50,9 @@ KonqAboutPageFactory::~KonqAboutPageFactory() s_plugins_html = 0; } -KParts::Part *KonqAboutPageFactory::createPartObject( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char *, const QStringList & ) +KParts::Part *KonqAboutPageFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, + const char *, const TQStringList & ) { //KonqFrame *frame = dynamic_cast( parentWidget ); //if ( !frame ) return 0; @@ -61,32 +61,32 @@ KParts::Part *KonqAboutPageFactory::createPartObject( QWidget *parentWidget, con parentWidget, widgetName, parent, name ); } -QString KonqAboutPageFactory::loadFile( const QString& file ) +TQString KonqAboutPageFactory::loadFile( const TQString& file ) { - QString res; + TQString res; if ( file.isEmpty() ) return res; - QFile f( file ); + TQFile f( file ); if ( !f.open( IO_ReadOnly ) ) return res; - QTextStream t( &f ); + TQTextStream t( &f ); res = t.read(); // otherwise all embedded objects are referenced as about:/... - QString basehref = QString::fromLatin1("\n"); - QRegExp reg(""); + TQString::fromLatin1("/\">\n"); + TQRegExp reg(""); reg.setCaseSensitive(FALSE); res.replace(reg, "\n\t" + basehref); return res; } -QString KonqAboutPageFactory::launch() +TQString KonqAboutPageFactory::launch() { // FIXME: only regenerate launch page if kuriikwsfilterrc changed. /* @@ -94,21 +94,21 @@ QString KonqAboutPageFactory::launch() return *s_launch_html; */ - QString res = loadFile( locate( "data", "konqueror/about/launch.html" )); + TQString res = loadFile( locate( "data", "konqueror/about/launch.html" )); if ( res.isEmpty() ) return res; KIconLoader *iconloader = KGlobal::iconLoader(); int iconSize = iconloader->currentSize(KIcon::Desktop); - QString home_icon_path = iconloader->iconPath("kfm_home", KIcon::Desktop ); - QString storage_icon_path = iconloader->iconPath("system", KIcon::Desktop ); - QString remote_icon_path = iconloader->iconPath("network", KIcon::Desktop ); - QString wastebin_icon_path = iconloader->iconPath("trashcan_full", KIcon::Desktop ); - QString applications_icon_path = iconloader->iconPath("kmenu", KIcon::Desktop ); - QString settings_icon_path = iconloader->iconPath("kcontrol", KIcon::Desktop ); - QString help_icon_path = iconloader->iconPath("khelpcenter", KIcon::Desktop ); - QString home_folder = QDir::homeDirPath(); - QString continue_icon_path = QApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); + TQString home_icon_path = iconloader->iconPath("kfm_home", KIcon::Desktop ); + TQString storage_icon_path = iconloader->iconPath("system", KIcon::Desktop ); + TQString remote_icon_path = iconloader->iconPath("network", KIcon::Desktop ); + TQString wastebin_icon_path = iconloader->iconPath("trashcan_full", KIcon::Desktop ); + TQString applications_icon_path = iconloader->iconPath("kmenu", KIcon::Desktop ); + TQString settings_icon_path = iconloader->iconPath("kcontrol", KIcon::Desktop ); + TQString help_icon_path = iconloader->iconPath("khelpcenter", KIcon::Desktop ); + TQString home_folder = TQDir::homeDirPath(); + TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) @@ -117,15 +117,15 @@ QString KonqAboutPageFactory::launch() res = res.arg( "" ); // Try to split page in three. If it succeeds, insert the default search into the middle part. - QStringList parts = QStringList::split( "", res ); + TQStringList parts = TQStringList::split( "", res ); if ( parts.count() == 3 ) { KConfig config( "kuriikwsfilterrc", true /*read-only*/, false /*no KDE globals*/ ); config.setGroup( "General" ); - QString name = config.readEntry("DefaultSearchEngine"); + TQString name = config.readEntry("DefaultSearchEngine"); KService::Ptr service = - KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(name)); + KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(name)); if ( service ) { - QString searchBar = parts[1]; + TQString searchBar = parts[1]; searchBar = searchBar .arg( iconSize ).arg( iconSize ) .arg( service->name() ) @@ -176,24 +176,24 @@ QString KonqAboutPageFactory::launch() ; i18n("Search the Web");//i18n for possible future use - s_launch_html = new QString( res ); + s_launch_html = new TQString( res ); return res; } -QString KonqAboutPageFactory::intro() +TQString KonqAboutPageFactory::intro() { if ( s_intro_html ) return *s_intro_html; - QString res = loadFile( locate( "data", "konqueror/about/intro.html" )); + TQString res = loadFile( locate( "data", "konqueror/about/intro.html" )); if ( res.isEmpty() ) return res; KIconLoader *iconloader = KGlobal::iconLoader(); - QString back_icon_path = QApplication::reverseLayout()?iconloader->iconPath("forward", KIcon::Small ):iconloader->iconPath("back", KIcon::Small ); - QString gohome_icon_path = iconloader->iconPath("gohome", KIcon::Small ); - QString continue_icon_path = QApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); + TQString back_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("forward", KIcon::Small ):iconloader->iconPath("back", KIcon::Small ); + TQString gohome_icon_path = iconloader->iconPath("gohome", KIcon::Small ); + TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) @@ -234,19 +234,19 @@ QString KonqAboutPageFactory::intro() ; - s_intro_html = new QString( res ); + s_intro_html = new TQString( res ); return res; } -QString KonqAboutPageFactory::specs() +TQString KonqAboutPageFactory::specs() { if ( s_specs_html ) return *s_specs_html; KIconLoader *iconloader = KGlobal::iconLoader(); - QString res = loadFile( locate( "data", "konqueror/about/specs.html" )); - QString continue_icon_path = QApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); + TQString res = loadFile( locate( "data", "konqueror/about/specs.html" )); + TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); if ( res.isEmpty() ) return res; @@ -316,36 +316,36 @@ QString KonqAboutPageFactory::specs() ; - s_specs_html = new QString( res ); + s_specs_html = new TQString( res ); return res; } -QString KonqAboutPageFactory::tips() +TQString KonqAboutPageFactory::tips() { if ( s_tips_html ) return *s_tips_html; - QString res = loadFile( locate( "data", "konqueror/about/tips.html" )); + TQString res = loadFile( locate( "data", "konqueror/about/tips.html" )); if ( res.isEmpty() ) return res; KIconLoader *iconloader = KGlobal::iconLoader(); - QString viewmag_icon_path = + TQString viewmag_icon_path = iconloader->iconPath("viewmag", KIcon::Small ); - QString history_icon_path = + TQString history_icon_path = iconloader->iconPath("history", KIcon::Small ); - QString openterm_icon_path = + TQString openterm_icon_path = iconloader->iconPath("openterm", KIcon::Small ); - QString locationbar_erase_rtl_icon_path = + TQString locationbar_erase_rtl_icon_path = iconloader->iconPath("clear_left", KIcon::Small ); - QString locationbar_erase_icon_path = + TQString locationbar_erase_icon_path = iconloader->iconPath("locationbar_erase", KIcon::Small ); - QString window_fullscreen_icon_path = + TQString window_fullscreen_icon_path = iconloader->iconPath("window_fullscreen", KIcon::Small ); - QString view_left_right_icon_path = + TQString view_left_right_icon_path = iconloader->iconPath("view_left_right", KIcon::Small ); - QString continue_icon_path = QApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); + TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) @@ -372,7 +372,7 @@ QString KonqAboutPageFactory::tips() .arg( i18n( "When you want to paste a new address into the Location toolbar you might want to " "clear the current entry by pressing the black arrow with the white cross " " in the toolbar.") - .arg(QApplication::reverseLayout() ? locationbar_erase_rtl_icon_path : locationbar_erase_icon_path)) + .arg(TQApplication::reverseLayout() ? locationbar_erase_rtl_icon_path : locationbar_erase_icon_path)) .arg( i18n( "To create a link on your desktop pointing to the current page, " "simply drag the \"Location\" label that is to the left of the Location toolbar, drop it on to " "the desktop, and choose \"Link\"." ) ) @@ -401,18 +401,18 @@ QString KonqAboutPageFactory::tips() ; - s_tips_html = new QString( res ); + s_tips_html = new TQString( res ); return res; } -QString KonqAboutPageFactory::plugins() +TQString KonqAboutPageFactory::plugins() { if ( s_plugins_html ) return *s_plugins_html; - QString res = loadFile( locate( "data", kapp->reverseLayout() ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" )) + TQString res = loadFile( locate( "data", kapp->reverseLayout() ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" )) .arg(i18n("Installed Plugins")) .arg(i18n("PluginDescriptionFileTypes")) .arg(i18n("Installed")) @@ -420,19 +420,19 @@ QString KonqAboutPageFactory::plugins() if ( res.isEmpty() ) return res; - s_plugins_html = new QString( res ); + s_plugins_html = new TQString( res ); return res; } KonqAboutPage::KonqAboutPage( //KonqMainWindow * - QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name ) + TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name ) : KHTMLPart( parentWidget, widgetName, parent, name, BrowserViewGUI ) { //m_mainWindow = mainWindow; - QTextCodec* codec = KGlobal::locale()->codecForEncoding(); + TQTextCodec* codec = KGlobal::locale()->codecForEncoding(); if (codec) setCharset(codec->name(), true); else @@ -453,9 +453,9 @@ bool KonqAboutPage::openURL( const KURL &u ) if ( u.url() == "about:plugins" ) serve( KonqAboutPageFactory::plugins(), "plugins" ); else if ( !u.query().isEmpty() ) { - QMap< QString, QString > queryItems = u.queryItems( 0 ); - QMap< QString, QString >::ConstIterator query = queryItems.begin(); - QString newUrl; + TQMap< TQString, TQString > queryItems = u.queryItems( 0 ); + TQMap< TQString, TQString >::ConstIterator query = queryItems.begin(); + TQString newUrl; if (query.key() == "strigi") { newUrl = KURIFilter::self()->filteredURI( query.key() + ":?q=" + query.data() ); } else { @@ -473,66 +473,66 @@ bool KonqAboutPage::openFile() return true; } -void KonqAboutPage::saveState( QDataStream &stream ) +void KonqAboutPage::saveState( TQDataStream &stream ) { stream << m_htmlDoc; stream << m_what; } -void KonqAboutPage::restoreState( QDataStream &stream ) +void KonqAboutPage::restoreState( TQDataStream &stream ) { stream >> m_htmlDoc; stream >> m_what; serve( m_htmlDoc, m_what ); } -void KonqAboutPage::serve( const QString& html, const QString& what ) +void KonqAboutPage::serve( const TQString& html, const TQString& what ) { m_what = what; - begin( KURL( QString("about:%1").arg(what) ) ); + begin( KURL( TQString("about:%1").arg(what) ) ); write( html ); end(); m_htmlDoc = html; } -void KonqAboutPage::urlSelected( const QString &url, int button, int state, const QString &target, KParts::URLArgs _args ) +void KonqAboutPage::urlSelected( const TQString &url, int button, int state, const TQString &target, KParts::URLArgs _args ) { KURL u( url ); if ( u.protocol() == "exec" ) { - QStringList args = QStringList::split( QChar( ' ' ), url.mid( 6 ) ); - QString executable = args[ 0 ]; + TQStringList args = TQStringList::split( TQChar( ' ' ), url.mid( 6 ) ); + TQString executable = args[ 0 ]; args.remove( args.begin() ); KApplication::kdeinitExec( executable, args ); return; } - if ( url == QString::fromLatin1("launch.html") ) + if ( url == TQString::fromLatin1("launch.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::launch(), "konqueror" ); return; } - else if ( url == QString::fromLatin1("intro.html") ) + else if ( url == TQString::fromLatin1("intro.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::intro(), "konqueror" ); return; } - else if ( url == QString::fromLatin1("specs.html") ) + else if ( url == TQString::fromLatin1("specs.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::specs(), "konqueror" ); return; } - else if ( url == QString::fromLatin1("tips.html") ) + else if ( url == TQString::fromLatin1("tips.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::tips(), "konqueror" ); return; } - else if ( url == QString::fromLatin1("config:/disable_overview") ) + else if ( url == TQString::fromLatin1("config:/disable_overview") ) { if ( KMessageBox::questionYesNo( widget(), i18n("Do you want to disable showing " @@ -540,10 +540,10 @@ void KonqAboutPage::urlSelected( const QString &url, int button, int state, cons i18n("Faster Startup?"),i18n("Disable"),i18n("Keep") ) == KMessageBox::Yes ) { - QString profile = locateLocal("data", "konqueror/profiles/webbrowsing"); + TQString profile = locateLocal("data", "konqueror/profiles/webbrowsing"); KSaveFile file( profile ); if ( file.status() == 0 ) { - QCString content = "[Profile]\n" + TQCString content = "[Profile]\n" "Name=Web-Browser"; fputs( content.data(), file.fstream() ); file.close(); diff --git a/konqueror/about/konq_aboutpage.h b/konqueror/about/konq_aboutpage.h index 9ec77b5d5..c72a85250 100644 --- a/konqueror/about/konq_aboutpage.h +++ b/konqueror/about/konq_aboutpage.h @@ -10,26 +10,26 @@ class KInstance; class KonqAboutPageFactory : public KParts::Factory { public: - KonqAboutPageFactory( QObject *parent = 0, const char *name = 0 ); + KonqAboutPageFactory( TQObject *parent = 0, const char *name = 0 ); virtual ~KonqAboutPageFactory(); - virtual KParts::Part *createPartObject( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char *classname, const QStringList &args ); + virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, + const char *classname, const TQStringList &args ); static KInstance *instance() { return s_instance; } - static QString launch(); - static QString intro(); - static QString specs(); - static QString tips(); - static QString plugins(); + static TQString launch(); + static TQString intro(); + static TQString specs(); + static TQString tips(); + static TQString plugins(); private: - static QString loadFile( const QString& file ); + static TQString loadFile( const TQString& file ); static KInstance *s_instance; - static QString *s_launch_html, *s_intro_html, *s_specs_html, *s_tips_html, *s_plugins_html; + static TQString *s_launch_html, *s_intro_html, *s_specs_html, *s_tips_html, *s_plugins_html; }; class KonqAboutPage : public KHTMLPart @@ -37,27 +37,27 @@ class KonqAboutPage : public KHTMLPart Q_OBJECT public: KonqAboutPage( /*KonqMainWindow *mainWindow,*/ - QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name ); + TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name ); ~KonqAboutPage(); virtual bool openURL( const KURL &url ); virtual bool openFile(); - virtual void saveState( QDataStream &stream ); - virtual void restoreState( QDataStream &stream ); + virtual void saveState( TQDataStream &stream ); + virtual void restoreState( TQDataStream &stream ); protected: - virtual void urlSelected( const QString &url, int button, int state, const QString &target, KParts::URLArgs args = KParts::URLArgs() ); + virtual void urlSelected( const TQString &url, int button, int state, const TQString &target, KParts::URLArgs args = KParts::URLArgs() ); private: - void serve( const QString&, const QString& ); + void serve( const TQString&, const TQString& ); KHTMLPart *m_doc; //KonqMainWindow *m_mainWindow; - QString m_htmlDoc; - QString m_what; + TQString m_htmlDoc; + TQString m_what; }; #endif diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index f60c48dbe..5df26bb68 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include "kfmclient.h" #include "KonquerorIface_stub.h" @@ -55,7 +55,7 @@ static const char description[] = I18N_NOOP("KDE tool for opening URLs from the static const char version[] = "2.0"; -QCString clientApp::startup_id_str; +TQCString clientApp::startup_id_str; bool clientApp::m_ok = true; bool s_interactive = true; @@ -174,58 +174,58 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) will be done (oh well), if there's no URL, no reusing will be done either (also because the webbrowsing profile doesn't have any URL listed). */ -static bool startNewKonqueror( QString url, QString mimetype, const QString& profile ) +static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& profile ) { - KConfig cfg( QString::fromLatin1( "konquerorrc" ), true ); + KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); cfg.setGroup( "Reusing" ); - QStringList allowed_parts; + TQStringList allowed_parts; // is duplicated in ../KonquerorIface.cc - allowed_parts << QString::fromLatin1( "konq_iconview.desktop" ) - << QString::fromLatin1( "konq_multicolumnview.desktop" ) - << QString::fromLatin1( "konq_sidebartng.desktop" ) - << QString::fromLatin1( "konq_infolistview.desktop" ) - << QString::fromLatin1( "konq_treeview.desktop" ) - << QString::fromLatin1( "konq_detailedlistview.desktop" ); + allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" ) + << TQString::fromLatin1( "konq_multicolumnview.desktop" ) + << TQString::fromLatin1( "konq_sidebartng.desktop" ) + << TQString::fromLatin1( "konq_infolistview.desktop" ) + << TQString::fromLatin1( "konq_treeview.desktop" ) + << TQString::fromLatin1( "konq_detailedlistview.desktop" ); if( cfg.hasKey( "SafeParts" ) - && cfg.readEntry( "SafeParts" ) != QString::fromLatin1( "SAFE" )) + && cfg.readEntry( "SafeParts" ) != TQString::fromLatin1( "SAFE" )) allowed_parts = cfg.readListEntry( "SafeParts" ); - if( allowed_parts.count() == 1 && allowed_parts.first() == QString::fromLatin1( "ALL" )) + if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "ALL" )) return false; // all parts allowed if( url.isEmpty()) { if( profile.isEmpty()) return true; - QString profilepath = locate( "data", QString::fromLatin1("konqueror/profiles/") + profile ); + TQString profilepath = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profile ); if( profilepath.isEmpty()) return true; KConfig cfg( profilepath, true ); cfg.setDollarExpansion( true ); cfg.setGroup( "Profile" ); - QMap< QString, QString > entries = cfg.entryMap( QString::fromLatin1( "Profile" )); - QRegExp urlregexp( QString::fromLatin1( "^View[0-9]*_URL$" )); - QStringList urls; - for( QMap< QString, QString >::ConstIterator it = entries.begin(); + TQMap< TQString, TQString > entries = cfg.entryMap( TQString::fromLatin1( "Profile" )); + TQRegExp urlregexp( TQString::fromLatin1( "^View[0-9]*_URL$" )); + TQStringList urls; + for( TQMap< TQString, TQString >::ConstIterator it = entries.begin(); it != entries.end(); ++it ) { // don't read value from map, dollar expansion is needed - QString value = cfg.readEntry( it.key()); + TQString value = cfg.readEntry( it.key()); if( urlregexp.search( it.key()) >= 0 && !value.isEmpty()) urls << value; } if( urls.count() != 1 ) return true; url = urls.first(); - mimetype = QString::fromLatin1( "" ); + mimetype = TQString::fromLatin1( "" ); } if( mimetype.isEmpty()) mimetype = KMimeType::findByURL( KURL( url ) )->name(); - KTrader::OfferList offers = KTrader::self()->query( mimetype, QString::fromLatin1( "KParts/ReadOnlyPart" ), - QString::null, QString::null ); + KTrader::OfferList offers = KTrader::self()->query( mimetype, TQString::fromLatin1( "KParts/ReadOnlyPart" ), + TQString::null, TQString::null ); KService::Ptr serv; if( offers.count() > 0 ) serv = offers.first(); - return serv == NULL || !allowed_parts.contains( serv->desktopEntryName() + QString::fromLatin1(".desktop") ); + return serv == NULL || !allowed_parts.contains( serv->desktopEntryName() + TQString::fromLatin1(".desktop") ); } static int currentScreen() @@ -244,30 +244,30 @@ static int currentScreen() } // when reusing a preloaded konqy, make sure your always use a DCOP call which opens a profile ! -static QCString getPreloadedKonqy() +static TQCString getPreloadedKonqy() { - KConfig cfg( QString::fromLatin1( "konquerorrc" ), true ); + KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); cfg.setGroup( "Reusing" ); if( cfg.readNumEntry( "MaxPreloadCount", 1 ) == 0 ) return ""; DCOPRef ref( "kded", "konqy_preloader" ); - QCString ret; + TQCString ret; if( ref.callExt( "getPreloadedKonqy", DCOPRef::NoEventLoop, 3000, currentScreen()).get( ret )) return ret; - return QCString(); + return TQCString(); } -static QCString konqyToReuse( const QString& url, const QString& mimetype, const QString& profile ) +static TQCString konqyToReuse( const TQString& url, const TQString& mimetype, const TQString& profile ) { // prefer(?) preloaded ones - QCString ret = getPreloadedKonqy(); + TQCString ret = getPreloadedKonqy(); if( !ret.isEmpty()) return ret; if( startNewKonqueror( url, mimetype, profile )) return ""; - QCString appObj; - QByteArray data; - QDataStream str( data, IO_WriteOnly ); + TQCString appObj; + TQByteArray data; + TQDataStream str( data, IO_WriteOnly ); str << currentScreen(); if( !KApplication::dcopClient()->findObject( "konqueror*", "KonquerorIface", "processCanBeReused( int )", data, ret, appObj, false, 3000 ) ) @@ -285,7 +285,7 @@ void clientApp::sendASNChange() data.addPid( 0 ); // say there's another process for this ASN with unknown PID data.setHostname(); // ( no need to bother to get this konqy's PID ) Display* dpy = qt_xdisplay(); - if( dpy == NULL ) // we may be running without QApplication here + if( dpy == NULL ) // we may be running without TQApplication here dpy = XOpenDisplay( NULL ); if( dpy != NULL ) KStartupInfo::sendChangeX( dpy, id, data ); @@ -293,15 +293,15 @@ void clientApp::sendASNChange() XCloseDisplay( dpy ); } -bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, const QString & mimetype) +bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, const TQString & mimetype) { kdDebug( 1202 ) << "clientApp::createNewWindow " << url.url() << " mimetype=" << mimetype << endl; // check if user wants to use external browser // ###### this option seems to have no GUI and to be redundant with BrowserApplication now. // ###### KDE4: remove - KConfig config( QString::fromLatin1("kfmclientrc")); - config.setGroup( QString::fromLatin1("Settings")); - QString strBrowser = config.readPathEntry("ExternalBrowser"); + KConfig config( TQString::fromLatin1("kfmclientrc")); + config.setGroup( TQString::fromLatin1("Settings")); + TQString strBrowser = config.readPathEntry("ExternalBrowser"); if (!strBrowser.isEmpty()) { if ( tempFile ) @@ -312,7 +312,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co return true; } - if (url.protocol().startsWith(QString::fromLatin1("http"))) + if (url.protocol().startsWith(TQString::fromLatin1("http"))) { config.setGroup("General"); if (!config.readEntry("BrowserApplication").isEmpty()) @@ -321,20 +321,20 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co KStartupInfo::appStarted(); KRun * run = new KRun( url, 0, 0, false, false /* no progress window */ ); // TODO pass tempFile [needs support in the KRun ctor] - QObject::connect( run, SIGNAL( finished() ), &app, SLOT( delayedQuit() )); - QObject::connect( run, SIGNAL( error() ), &app, SLOT( delayedQuit() )); + TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() )); + TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() )); app.exec(); return !krun_has_error; } } - KConfig cfg( QString::fromLatin1( "konquerorrc" ), true ); + KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); cfg.setGroup( "FMSettings" ); if ( newTab || cfg.readBoolEntry( "KonquerorTabforExternalURL", false ) ) { - QCString foundApp, foundObj; - QByteArray data; - QDataStream str( data, IO_WriteOnly ); + TQCString foundApp, foundObj; + TQByteArray data; + TQDataStream str( data, IO_WriteOnly ); if( KApplication::dcopClient()->findObject( "konqueror*", "konqueror-mainwindow*", "windowCanBeUsedForTab()", data, foundApp, foundObj, false, 3000 ) ) { @@ -347,7 +347,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co } } - QCString appId = konqyToReuse( url.url(), mimetype, QString::null ); + TQCString appId = konqyToReuse( url.url(), mimetype, TQString::null ); if( !appId.isEmpty()) { kdDebug( 1202 ) << "clientApp::createNewWindow using existing konqueror" << endl; @@ -357,9 +357,9 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co } else { - QString error; + TQString error; /* Well, we can't pass a mimetype through startServiceByDesktopPath ! - if ( KApplication::startServiceByDesktopPath( QString::fromLatin1("konqueror.desktop"), + if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"), url.url(), &error ) > 0 ) { kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl; @@ -383,14 +383,14 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co return true; } -bool clientApp::openProfile( const QString & profileName, const QString & url, const QString & mimetype ) +bool clientApp::openProfile( const TQString & profileName, const TQString & url, const TQString & mimetype ) { - QCString appId = konqyToReuse( url, mimetype, profileName ); + TQCString appId = konqyToReuse( url, mimetype, profileName ); if( appId.isEmpty()) { - QString error; - if ( KApplication::startServiceByDesktopPath( QString::fromLatin1("konqueror.desktop"), - QString::fromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 ) + TQString error; + if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"), + TQString::fromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 ) { kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl; return false; @@ -399,7 +399,7 @@ bool clientApp::openProfile( const QString & profileName, const QString & url, c // so when we arrive here, konq is up and running already, and appId contains the identification } - QString profile = locate( "data", QString::fromLatin1("konqueror/profiles/") + profileName ); + TQString profile = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profileName ); if ( profile.isEmpty() ) { fprintf( stderr, "%s", i18n("Profile %1 not found\n").arg(profileName).local8Bit().data() ); @@ -421,7 +421,7 @@ void clientApp::delayedQuit() { // Quit in 2 seconds. This leaves time for KRun to pop up // "app not found" in KProcessRunner, if that was the case. - QTimer::singleShot( 2000, this, SLOT(deref()) ); + TQTimer::singleShot( 2000, this, TQT_SLOT(deref()) ); // don't access the KRun instance later, it will be deleted after calling slots if( static_cast< const KRun* >( sender())->hasError()) krun_has_error = true; @@ -450,7 +450,7 @@ bool clientApp::doIt() if ( !args->isSet( "ninteractive" ) ) { s_interactive = false; } - QCString command = args->arg(0); + TQCString command = args->arg(0); // read ASN env. variable for non-KApp cases startup_id_str = KStartupInfo::currentStartupIdEnv().id(); @@ -468,7 +468,7 @@ bool clientApp::doIt() if ( argc == 1 ) { KURL url; - url.setPath(QDir::homeDirPath()); + url.setPath(TQDir::homeDirPath()); return createNewWindow( url, command == "newTab", tempFile ); } if ( argc == 2 ) @@ -477,7 +477,7 @@ bool clientApp::doIt() } if ( argc == 3 ) { - return createNewWindow( args->url(1), command == "newTab", tempFile, QString::fromLatin1(args->arg(2)) ); + return createNewWindow( args->url(1), command == "newTab", tempFile, TQString::fromLatin1(args->arg(2)) ); } } else if ( command == "openProfile" ) @@ -489,10 +489,10 @@ bool clientApp::doIt() KApplication::dcopClient()->attach(); } checkArgumentCount(argc, 2, 3); - QString url; + TQString url; if ( argc == 3 ) url = args->url(2).url(); - return openProfile( QString::fromLocal8Bit(args->arg(1)), url ); + return openProfile( TQString::fromLocal8Bit(args->arg(1)), url ); } // the following commands need KApplication @@ -502,8 +502,8 @@ bool clientApp::doIt() { checkArgumentCount(argc, 2, 2); KPropertiesDialog * p = new KPropertiesDialog( args->url(1) ); - QObject::connect( p, SIGNAL( destroyed() ), &app, SLOT( quit() )); - QObject::connect( p, SIGNAL( canceled() ), &app, SLOT( slotDialogCanceled() )); + TQObject::connect( p, TQT_SIGNAL( destroyed() ), &app, TQT_SLOT( quit() )); + TQObject::connect( p, TQT_SIGNAL( canceled() ), &app, TQT_SLOT( slotDialogCanceled() )); app.exec(); return m_ok; } @@ -518,8 +518,8 @@ bool clientApp::doIt() else if ( argc == 2 ) { KRun * run = new KRun( args->url(1), 0, 0, false, false /* no progress window */ ); - QObject::connect( run, SIGNAL( finished() ), &app, SLOT( delayedQuit() )); - QObject::connect( run, SIGNAL( error() ), &app, SLOT( delayedQuit() )); + TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() )); + TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() )); app.exec(); return !krun_has_error; } @@ -527,7 +527,7 @@ bool clientApp::doIt() { KURL::List urls; urls.append( args->url(1) ); - const KTrader::OfferList offers = KTrader::self()->query( QString::fromLocal8Bit( args->arg( 2 ) ), QString::fromLatin1( "Application" ), QString::null, QString::null ); + const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::fromLatin1( "Application" ), TQString::null, TQString::null ); if (offers.isEmpty()) return 1; KService::Ptr serv = offers.first(); return KRun::run( *serv, urls ); @@ -543,7 +543,7 @@ bool clientApp::doIt() KIO::Job * job = KIO::move( srcLst, args->url(argc - 1) ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, SIGNAL( result( KIO::Job * ) ), &app, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), &app, TQT_SLOT( slotResult( KIO::Job * ) ) ); app.exec(); return m_ok; } @@ -569,8 +569,8 @@ bool clientApp::doIt() } if (srcLst.count() == 0) return m_ok; - QString dst = - KFileDialog::getSaveFileName( (argc<2) ? (QString::null) : (args->url(1).filename()) ); + TQString dst = + KFileDialog::getSaveFileName( (argc<2) ? (TQString::null) : (args->url(1).filename()) ); if (dst.isEmpty()) // cancelled return m_ok; // AK - really okay? KURL dsturl; @@ -578,7 +578,7 @@ bool clientApp::doIt() KIO::Job * job = KIO::copy( srcLst, dsturl ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, SIGNAL( result( KIO::Job * ) ), &app, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), &app, TQT_SLOT( slotResult( KIO::Job * ) ) ); app.exec(); return m_ok; } @@ -592,7 +592,7 @@ bool clientApp::doIt() KIO::Job * job = KIO::copy( srcLst, args->url(argc - 1) ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, SIGNAL( result( KIO::Job * ) ), &app, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), &app, TQT_SLOT( slotResult( KIO::Job * ) ) ); app.exec(); return m_ok; } @@ -608,7 +608,7 @@ bool clientApp::doIt() else if ( command == "configure" ) { checkArgumentCount(argc, 1, 1); - QByteArray data; + TQByteArray data; kapp->dcopClient()->send( "*", "KonqMainViewIface", "reparseConfiguration()", data ); // Warning. In case something is added/changed here, keep kcontrol/konq/main.cpp in sync. } @@ -620,7 +620,7 @@ bool clientApp::doIt() } else { - fprintf( stderr, "%s", i18n("Syntax Error: Unknown command '%1'\n").arg(QString::fromLocal8Bit(command)).local8Bit().data() ); + fprintf( stderr, "%s", i18n("Syntax Error: Unknown command '%1'\n").arg(TQString::fromLocal8Bit(command)).local8Bit().data() ); return false; } return true; diff --git a/konqueror/client/kfmclient.h b/konqueror/client/kfmclient.h index 0d13a6e8c..dea4ee883 100644 --- a/konqueror/client/kfmclient.h +++ b/konqueror/client/kfmclient.h @@ -31,10 +31,10 @@ public: static bool doIt(); /** Make konqueror open a window for @p url */ - static bool createNewWindow(const KURL & url, bool newTab, bool tempFile, const QString & mimetype = QString::null); + static bool createNewWindow(const KURL & url, bool newTab, bool tempFile, const TQString & mimetype = TQString::null); /** Make konqueror open a window for @p profile, @p url and @p mimetype */ - static bool openProfile(const QString & profile, const QString & url, const QString & mimetype = QString::null); + static bool openProfile(const TQString & profile, const TQString & url, const TQString & mimetype = TQString::null); protected slots: void slotResult( KIO::Job * ); @@ -44,7 +44,7 @@ protected slots: private: static void sendASNChange(); static bool m_ok; - static QCString startup_id_str; + static TQCString startup_id_str; }; diff --git a/konqueror/delayedinitializer.cc b/konqueror/delayedinitializer.cc index 87d405ac4..c8ab89722 100644 --- a/konqueror/delayedinitializer.cc +++ b/konqueror/delayedinitializer.cc @@ -19,15 +19,15 @@ #include "delayedinitializer.h" -#include +#include -DelayedInitializer::DelayedInitializer( int eventType, QObject *parent, const char *name ) - : QObject( parent, name ), m_eventType( eventType ), m_signalEmitted( false ) +DelayedInitializer::DelayedInitializer( int eventType, TQObject *parent, const char *name ) + : TQObject( parent, name ), m_eventType( eventType ), m_signalEmitted( false ) { parent->installEventFilter( this ); } -bool DelayedInitializer::eventFilter( QObject *receiver, QEvent *event ) +bool DelayedInitializer::eventFilter( TQObject *receiver, TQEvent *event ) { if ( m_signalEmitted || event->type() != m_eventType ) return false; @@ -38,7 +38,7 @@ bool DelayedInitializer::eventFilter( QObject *receiver, QEvent *event ) // Move the emitting of the event to the end of the eventQueue // so we are absolutely sure the event we get here is handled before // the initialize is fired. - QTimer::singleShot( 0, this, SLOT( slotInitialize() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotInitialize() ) ); return false; } diff --git a/konqueror/delayedinitializer.h b/konqueror/delayedinitializer.h index 493ed6dd0..1f9f66470 100644 --- a/konqueror/delayedinitializer.h +++ b/konqueror/delayedinitializer.h @@ -20,15 +20,15 @@ #ifndef __delayedinitializer_h__ #define __delayedinitializer_h__ -#include +#include class DelayedInitializer : public QObject { Q_OBJECT public: - DelayedInitializer( int eventType, QObject *parent, const char *name = 0 ); + DelayedInitializer( int eventType, TQObject *parent, const char *name = 0 ); - virtual bool eventFilter( QObject *receiver, QEvent *event ); + virtual bool eventFilter( TQObject *receiver, TQEvent *event ); signals: void initialize(); diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index 672ac80e8..cf567c33f 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include @@ -43,13 +43,13 @@ #include #include -#include -#include +#include +#include #include -template class QPtrList; -//template class QValueList; +template class TQPtrList; +//template class TQValueList; class KonqIconViewFactory : public KParts::Factory { @@ -72,8 +72,8 @@ public: s_defaultViewProps = 0; } - virtual KParts::Part* createPartObject( QWidget *parentWidget, const char *, - QObject *parent, const char *name, const char*, const QStringList &args ) + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *, + TQObject *parent, const char *name, const char*, const TQStringList &args ) { if( args.count() < 1 ) kdWarning() << "KonqKfmIconView: Missing Parameter" << endl; @@ -158,13 +158,13 @@ void IconViewBrowserExtension::setSaveViewPropertiesLocally( bool value ) m_iconView->m_pProps->setSaveViewPropertiesLocally( value ); } -void IconViewBrowserExtension::setNameFilter( const QString &nameFilter ) +void IconViewBrowserExtension::setNameFilter( const TQString &nameFilter ) { //kdDebug(1202) << "IconViewBrowserExtension::setNameFilter " << nameFilter << endl; m_iconView->m_nameFilter = nameFilter; } -KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const char *name, const QString& mode ) +KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode ) : KonqDirPart( parent, name ) , m_bNeedSetCurrentItem( false ) , m_pEnsureVisible( 0 ) @@ -182,22 +182,22 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const m_pIconView = new KonqIconViewWidget( parentWidget, "qiconview" ); m_pIconView->initConfig( true ); - connect( m_pIconView, SIGNAL(imagePreviewFinished()), - this, SLOT(slotRenderingFinished())); + connect( m_pIconView, TQT_SIGNAL(imagePreviewFinished()), + this, TQT_SLOT(slotRenderingFinished())); // connect up the icon inc/dec signals - connect( m_pIconView, SIGNAL(incIconSize()), - this, SLOT(slotIncIconSize())); - connect( m_pIconView, SIGNAL(decIconSize()), - this, SLOT(slotDecIconSize())); + connect( m_pIconView, TQT_SIGNAL(incIconSize()), + this, TQT_SLOT(slotIncIconSize())); + connect( m_pIconView, TQT_SIGNAL(decIconSize()), + this, TQT_SLOT(slotDecIconSize())); // pass signals to the extension - connect( m_pIconView, SIGNAL( enableAction( const char *, bool ) ), - m_extension, SIGNAL( enableAction( const char *, bool ) ) ); + connect( m_pIconView, TQT_SIGNAL( enableAction( const char *, bool ) ), + m_extension, TQT_SIGNAL( enableAction( const char *, bool ) ) ); // signals from konqdirpart (for BC reasons) - connect( this, SIGNAL( findOpened( KonqDirPart * ) ), SLOT( slotKFindOpened() ) ); - connect( this, SIGNAL( findClosed( KonqDirPart * ) ), SLOT( slotKFindClosed() ) ); + connect( this, TQT_SIGNAL( findOpened( KonqDirPart * ) ), TQT_SLOT( slotKFindOpened() ) ); + connect( this, TQT_SIGNAL( findClosed( KonqDirPart * ) ), TQT_SLOT( slotKFindClosed() ) ); setWidget( m_pIconView ); m_mimeTypeResolver = new KMimeTypeResolver(this); @@ -209,39 +209,39 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const // Don't repaint on configuration changes during construction m_bInit = true; - m_paDotFiles = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, SLOT( slotShowDot() ), + m_paDotFiles = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); // m_paDotFiles->setCheckedState(i18n("Hide &Hidden Files")); m_paDotFiles->setToolTip( i18n( "Toggle displaying of hidden dot files" ) ); - m_paDirectoryOverlays = new KToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, SLOT( slotShowDirectoryOverlays() ), + m_paDirectoryOverlays = new KToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, TQT_SLOT( slotShowDirectoryOverlays() ), actionCollection(), "show_directory_overlays" ); m_pamPreview = new KActionMenu( i18n( "&Preview" ), actionCollection(), "iconview_preview" ); m_paEnablePreviews = new KToggleAction( i18n("Enable Previews"), 0, actionCollection(), "iconview_preview_all" ); m_paEnablePreviews->setCheckedState( i18n("Disable Previews") ); - connect( m_paEnablePreviews, SIGNAL( toggled( bool ) ), this, SLOT( slotPreview( bool ) ) ); + connect( m_paEnablePreviews, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); m_paEnablePreviews->setIcon("thumbnail"); m_pamPreview->insert( m_paEnablePreviews ); m_pamPreview->insert( new KActionSeparator(this) ); KTrader::OfferList plugins = KTrader::self()->query( "ThumbCreator" ); - QMap< QString, KToggleAction* > previewActions; + TQMap< TQString, KToggleAction* > previewActions; for ( KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it ) { if ( KToggleAction*& preview = previewActions[ ( *it )->name() ] ) - preview->setName( QCString( preview->name() ) + ',' + ( *it )->desktopEntryName().latin1() ); + preview->setName( TQCString( preview->name() ) + ',' + ( *it )->desktopEntryName().latin1() ); else { preview = new KToggleAction( (*it)->name(), 0, actionCollection(), (*it)->desktopEntryName().latin1() ); - connect( preview, SIGNAL( toggled( bool ) ), this, SLOT( slotPreview( bool ) ) ); + connect( preview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); m_pamPreview->insert( preview ); m_paPreviewPlugins.append( preview ); } } KToggleAction *soundPreview = new KToggleAction( i18n("Sound Files"), 0, actionCollection(), "audio/" ); - connect( soundPreview, SIGNAL( toggled( bool ) ), this, SLOT( slotPreview( bool ) ) ); + connect( soundPreview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); m_pamPreview->insert( soundPreview ); m_paPreviewPlugins.append( soundPreview ); @@ -265,14 +265,14 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const aSortByType->setChecked( false ); aSortByDate->setChecked( false ); - connect( aSortByNameCS, SIGNAL( toggled( bool ) ), this, SLOT( slotSortByNameCaseSensitive( bool ) ) ); - connect( aSortByNameCI, SIGNAL( toggled( bool ) ), this, SLOT( slotSortByNameCaseInsensitive( bool ) ) ); - connect( aSortBySize, SIGNAL( toggled( bool ) ), this, SLOT( slotSortBySize( bool ) ) ); - connect( aSortByType, SIGNAL( toggled( bool ) ), this, SLOT( slotSortByType( bool ) ) ); - connect( aSortByDate, SIGNAL( toggled( bool ) ), this, SLOT( slotSortByDate( bool ) ) ); + connect( aSortByNameCS, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByNameCaseSensitive( bool ) ) ); + connect( aSortByNameCI, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByNameCaseInsensitive( bool ) ) ); + connect( aSortBySize, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortBySize( bool ) ) ); + connect( aSortByType, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByType( bool ) ) ); + connect( aSortByDate, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByDate( bool ) ) ); //enable menu item representing the saved sorting criterion - QString sortcrit = KonqIconViewFactory::defaultViewProps()->sortCriterion(); + TQString sortcrit = KonqIconViewFactory::defaultViewProps()->sortCriterion(); KRadioAction *sort_action = dynamic_cast(actionCollection()->action(sortcrit.latin1())); if(sort_action!=NULL) sort_action->activate(); @@ -281,8 +281,8 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const m_paSortDirsFirst->setChecked( KonqIconViewFactory::defaultViewProps()->isDirsFirst() ); - connect( aSortDescending, SIGNAL( toggled( bool ) ), this, SLOT( slotSortDescending() ) ); - connect( m_paSortDirsFirst, SIGNAL( toggled( bool ) ), this, SLOT( slotSortDirsFirst() ) ); + connect( aSortDescending, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortDescending() ) ); + connect( m_paSortDirsFirst, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortDirsFirst() ) ); //enable stored settings slotSortDirsFirst(); @@ -302,15 +302,15 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const m_pamSort->insert( aSortDescending ); */ - m_paSelect = new KAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, SLOT( slotSelect() ), + m_paSelect = new KAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), actionCollection(), "select" ); - m_paUnselect = new KAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, SLOT( slotUnselect() ), + m_paUnselect = new KAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), actionCollection(), "unselect" ); - m_paSelectAll = KStdAction::selectAll( this, SLOT( slotSelectAll() ), actionCollection(), "selectall" ); - m_paUnselectAll = new KAction( i18n( "Unselect All" ), CTRL+Key_U, this, SLOT( slotUnselectAll() ), + m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); + m_paUnselectAll = new KAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); m_paInvertSelection = new KAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, - this, SLOT( slotInvertSelection() ), + this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); m_paSelect->setToolTip( i18n( "Allows selecting of file or folder items based on a given mask" ) ); @@ -323,65 +323,65 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const //m_paRightText = new KToggleAction( i18n( "Text at &Right" ), 0, actionCollection(), "textright" ); //m_paBottomText->setExclusiveGroup( "TextPos" ); //m_paRightText->setExclusiveGroup( "TextPos" ); - //connect( m_paBottomText, SIGNAL( toggled( bool ) ), this, SLOT( slotTextBottom( bool ) ) ); - //connect( m_paRightText, SIGNAL( toggled( bool ) ), this, SLOT( slotTextRight( bool ) ) ); + //connect( m_paBottomText, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotTextBottom( bool ) ) ); + //connect( m_paRightText, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotTextRight( bool ) ) ); - connect( m_pIconView, SIGNAL( executed( QIconViewItem * ) ), - this, SLOT( slotReturnPressed( QIconViewItem * ) ) ); - connect( m_pIconView, SIGNAL( returnPressed( QIconViewItem * ) ), - this, SLOT( slotReturnPressed( QIconViewItem * ) ) ); + connect( m_pIconView, TQT_SIGNAL( executed( TQIconViewItem * ) ), + this, TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) ); + connect( m_pIconView, TQT_SIGNAL( returnPressed( TQIconViewItem * ) ), + this, TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) ); - connect( m_pIconView, SIGNAL( onItem( QIconViewItem * ) ), - this, SLOT( slotOnItem( QIconViewItem * ) ) ); + connect( m_pIconView, TQT_SIGNAL( onItem( TQIconViewItem * ) ), + this, TQT_SLOT( slotOnItem( TQIconViewItem * ) ) ); - connect( m_pIconView, SIGNAL( onViewport() ), - this, SLOT( slotOnViewport() ) ); + connect( m_pIconView, TQT_SIGNAL( onViewport() ), + this, TQT_SLOT( slotOnViewport() ) ); - connect( m_pIconView, SIGNAL( mouseButtonPressed(int, QIconViewItem*, const QPoint&)), - this, SLOT( slotMouseButtonPressed(int, QIconViewItem*, const QPoint&)) ); - connect( m_pIconView, SIGNAL( mouseButtonClicked(int, QIconViewItem*, const QPoint&)), - this, SLOT( slotMouseButtonClicked(int, QIconViewItem*, const QPoint&)) ); - connect( m_pIconView, SIGNAL( contextMenuRequested(QIconViewItem*, const QPoint&)), - this, SLOT( slotContextMenuRequested(QIconViewItem*, const QPoint&)) ); + connect( m_pIconView, TQT_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)), + this, TQT_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) ); + connect( m_pIconView, TQT_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)), + this, TQT_SLOT( slotMouseButtonClicked(int, TQIconViewItem*, const TQPoint&)) ); + connect( m_pIconView, TQT_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)), + this, TQT_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) ); // Signals needed to implement the spring loading folders behavior - connect( m_pIconView, SIGNAL( held( QIconViewItem * ) ), - this, SLOT( slotDragHeld( QIconViewItem * ) ) ); - connect( m_pIconView, SIGNAL( dragEntered( bool ) ), - this, SLOT( slotDragEntered( bool ) ) ); - connect( m_pIconView, SIGNAL( dragLeft() ), - this, SLOT( slotDragLeft() ) ); - connect( m_pIconView, SIGNAL( dragMove( bool ) ), - this, SLOT( slotDragMove( bool ) ) ); - connect( m_pIconView, SIGNAL( dragFinished() ), - this, SLOT( slotDragFinished() ) ); + connect( m_pIconView, TQT_SIGNAL( held( TQIconViewItem * ) ), + this, TQT_SLOT( slotDragHeld( TQIconViewItem * ) ) ); + connect( m_pIconView, TQT_SIGNAL( dragEntered( bool ) ), + this, TQT_SLOT( slotDragEntered( bool ) ) ); + connect( m_pIconView, TQT_SIGNAL( dragLeft() ), + this, TQT_SLOT( slotDragLeft() ) ); + connect( m_pIconView, TQT_SIGNAL( dragMove( bool ) ), + this, TQT_SLOT( slotDragMove( bool ) ) ); + connect( m_pIconView, TQT_SIGNAL( dragFinished() ), + this, TQT_SLOT( slotDragFinished() ) ); // Create the directory lister m_dirLister = new KDirLister( true ); setDirLister( m_dirLister ); m_dirLister->setMainWindow(m_pIconView->topLevelWidget()); - connect( m_dirLister, SIGNAL( started( const KURL & ) ), - this, SLOT( slotStarted() ) ); - connect( m_dirLister, SIGNAL( completed() ), this, SLOT( slotCompleted() ) ); - connect( m_dirLister, SIGNAL( canceled( const KURL& ) ), this, SLOT( slotCanceled( const KURL& ) ) ); - connect( m_dirLister, SIGNAL( clear() ), this, SLOT( slotClear() ) ); - connect( m_dirLister, SIGNAL( newItems( const KFileItemList& ) ), - this, SLOT( slotNewItems( const KFileItemList& ) ) ); - connect( m_dirLister, SIGNAL( deleteItem( KFileItem * ) ), - this, SLOT( slotDeleteItem( KFileItem * ) ) ); - connect( m_dirLister, SIGNAL( refreshItems( const KFileItemList& ) ), - this, SLOT( slotRefreshItems( const KFileItemList& ) ) ); - connect( m_dirLister, SIGNAL( redirection( const KURL & ) ), - this, SLOT( slotRedirection( const KURL & ) ) ); - connect( m_dirLister, SIGNAL( itemsFilteredByMime(const KFileItemList& ) ), - SIGNAL( itemsFilteredByMime(const KFileItemList& ) ) ); - connect( m_dirLister, SIGNAL( infoMessage( const QString& ) ), - extension(), SIGNAL( infoMessage( const QString& ) ) ); - connect( m_dirLister, SIGNAL( percent( int ) ), - extension(), SIGNAL( loadingProgress( int ) ) ); - connect( m_dirLister, SIGNAL( speed( int ) ), - extension(), SIGNAL( speedProgress( int ) ) ); + connect( m_dirLister, TQT_SIGNAL( started( const KURL & ) ), + this, TQT_SLOT( slotStarted() ) ); + connect( m_dirLister, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) ); + connect( m_dirLister, TQT_SIGNAL( canceled( const KURL& ) ), this, TQT_SLOT( slotCanceled( const KURL& ) ) ); + connect( m_dirLister, TQT_SIGNAL( clear() ), this, TQT_SLOT( slotClear() ) ); + connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList& ) ), + this, TQT_SLOT( slotNewItems( const KFileItemList& ) ) ); + connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), + this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList& ) ), + this, TQT_SLOT( slotRefreshItems( const KFileItemList& ) ) ); + connect( m_dirLister, TQT_SIGNAL( redirection( const KURL & ) ), + this, TQT_SLOT( slotRedirection( const KURL & ) ) ); + connect( m_dirLister, TQT_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ), + TQT_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ) ); + connect( m_dirLister, TQT_SIGNAL( infoMessage( const TQString& ) ), + extension(), TQT_SIGNAL( infoMessage( const TQString& ) ) ); + connect( m_dirLister, TQT_SIGNAL( percent( int ) ), + extension(), TQT_SIGNAL( loadingProgress( int ) ) ); + connect( m_dirLister, TQT_SIGNAL( speed( int ) ), + extension(), TQT_SIGNAL( speedProgress( int ) ) ); // Now we may react to configuration changes m_bInit = false; @@ -392,10 +392,10 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const m_bUpdateContentsPosAfterListing = false; m_bDirPropertiesChanged = true; m_bPreviewRunningBeforeCloseURL = false; - m_pIconView->setResizeMode( QIconView::Adjust ); + m_pIconView->setResizeMode( TQIconView::Adjust ); - connect( m_pIconView, SIGNAL( selectionChanged() ), - this, SLOT( slotSelectionChanged() ) ); + connect( m_pIconView, TQT_SIGNAL( selectionChanged() ), + this, TQT_SLOT( slotSelectionChanged() ) ); // Respect kcmkonq's configuration for word-wrap icon text. // If we want something else, we have to adapt the configuration or remove it... @@ -429,7 +429,7 @@ const KFileItem * KonqKfmIconView::currentItem() void KonqKfmIconView::slotPreview( bool toggle ) { - QCString name = sender()->name(); // e.g. clipartthumbnail (or audio/, special case) + TQCString name = sender()->name(); // e.g. clipartthumbnail (or audio/, special case) if (name == "iconview_preview_all") { m_pProps->setShowingPreview( toggle ); @@ -453,8 +453,8 @@ void KonqKfmIconView::slotPreview( bool toggle ) } else { - QStringList types = QStringList::split( ',', name ); - for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it ) + TQStringList types = TQStringList::split( ',', name ); + for ( TQStringList::ConstIterator it = types.begin(); it != types.end(); ++it ) { m_pProps->setShowingPreview( *it, toggle ); m_pIconView->setPreviewSettings( m_pProps->previewSettings() ); @@ -471,7 +471,7 @@ void KonqKfmIconView::slotPreview( bool toggle ) bool previewRunning = m_pIconView->isPreviewRunning(); if ( previewRunning ) m_pIconView->stopImagePreview(); - QStringList mimeTypes = serv->property("MimeTypes").toStringList(); + TQStringList mimeTypes = serv->property("MimeTypes").toStringList(); m_pIconView->setIcons( m_pIconView->iconSize(), mimeTypes ); if ( previewRunning ) m_pIconView->startImagePreview( m_pProps->previewSettings(), false ); @@ -502,7 +502,7 @@ void KonqKfmIconView::slotShowDirectoryOverlays() m_pProps->setShowingDirectoryOverlays( show ); - for ( QIconViewItem *item = m_pIconView->firstItem(); item; item = item->nextItem() ) + for ( TQIconViewItem *item = m_pIconView->firstItem(); item; item = item->nextItem() ) { KFileIVI* kItem = static_cast(item); if ( !kItem->item()->isDir() ) continue; @@ -520,15 +520,15 @@ void KonqKfmIconView::slotShowDirectoryOverlays() void KonqKfmIconView::slotSelect() { bool ok; - QString pattern = KInputDialog::getText( QString::null, + TQString pattern = KInputDialog::getText( TQString::null, i18n( "Select files:" ), "*", &ok, m_pIconView ); if ( ok ) { - QRegExp re( pattern, true, true ); + TQRegExp re( pattern, true, true ); m_pIconView->blockSignals( true ); - QIconViewItem *it = m_pIconView->firstItem(); + TQIconViewItem *it = m_pIconView->firstItem(); while ( it ) { if ( re.exactMatch( it->text() ) ) @@ -547,15 +547,15 @@ void KonqKfmIconView::slotSelect() void KonqKfmIconView::slotUnselect() { bool ok; - QString pattern = KInputDialog::getText( QString::null, + TQString pattern = KInputDialog::getText( TQString::null, i18n( "Unselect files:" ), "*", &ok, m_pIconView ); if ( ok ) { - QRegExp re( pattern, true, true ); + TQRegExp re( pattern, true, true ); m_pIconView->blockSignals( true ); - QIconViewItem *it = m_pIconView->firstItem(); + TQIconViewItem *it = m_pIconView->firstItem(); while ( it ) { if ( re.exactMatch( it->text() ) ) @@ -705,7 +705,7 @@ bool KonqKfmIconView::doCloseURL() return true; } -void KonqKfmIconView::slotReturnPressed( QIconViewItem *item ) +void KonqKfmIconView::slotReturnPressed( TQIconViewItem *item ) { if ( !item ) return; @@ -719,7 +719,7 @@ void KonqKfmIconView::slotReturnPressed( QIconViewItem *item ) lmbClicked( fileItem ); } -void KonqKfmIconView::slotDragHeld( QIconViewItem *item ) +void KonqKfmIconView::slotDragHeld( TQIconViewItem *item ) { kdDebug() << "KonqKfmIconView::slotDragHeld()" << endl; @@ -764,7 +764,7 @@ void KonqKfmIconView::slotDragFinished() } -void KonqKfmIconView::slotContextMenuRequested(QIconViewItem* _item, const QPoint& _global) +void KonqKfmIconView::slotContextMenuRequested(TQIconViewItem* _item, const TQPoint& _global) { const KFileItemList items = m_pIconView->selectedFileItems(); if ( items.isEmpty() ) @@ -780,7 +780,7 @@ void KonqKfmIconView::slotContextMenuRequested(QIconViewItem* _item, const QPoin if ( rootItem ) { KURL parentDirURL = rootItem->url(); // Check if parentDirURL applies to the selected items (usually yes, but not with search results) - QPtrListIterator kit( items ); + TQPtrListIterator kit( items ); for ( ; kit.current(); ++kit ) if ( kit.current()->url().directory( 1 ) != rootItem->url().path() ) parentDirURL = KURL(); @@ -792,7 +792,7 @@ void KonqKfmIconView::slotContextMenuRequested(QIconViewItem* _item, const QPoin emit m_extension->popupMenu( 0L, _global, items, KParts::URLArgs(), popupFlags); } -void KonqKfmIconView::slotMouseButtonPressed(int _button, QIconViewItem* _item, const QPoint&) +void KonqKfmIconView::slotMouseButtonPressed(int _button, TQIconViewItem* _item, const TQPoint&) { if ( _button == RightButton && !_item ) { @@ -822,14 +822,14 @@ void KonqKfmIconView::slotMouseButtonPressed(int _button, QIconViewItem* _item, KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowUp; - emit m_extension->popupMenu( 0L, QCursor::pos(), items, KParts::URLArgs(), popupFlags ); + emit m_extension->popupMenu( 0L, TQCursor::pos(), items, KParts::URLArgs(), popupFlags ); if ( delRootItem ) delete item; // we just created it } } -void KonqKfmIconView::slotMouseButtonClicked(int _button, QIconViewItem* _item, const QPoint& ) +void KonqKfmIconView::slotMouseButtonClicked(int _button, TQIconViewItem* _item, const TQPoint& ) { if( _button == MidButton ) mmbClicked( _item ? static_cast(_item)->item() : 0L ); @@ -859,7 +859,7 @@ void KonqKfmIconView::slotCanceled( const KURL& url ) // It could be about the URL we were listing, and openURL() aborted it. if ( m_bLoading && url.equals( m_pIconView->url(), true ) ) { - emit canceled( QString::null ); + emit canceled( TQString::null ); m_bLoading = false; } @@ -962,7 +962,7 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries ) KFileItem* fileItem = item->item(); if ( !m_itemsToSelect.isEmpty() ) { - QStringList::Iterator tsit = m_itemsToSelect.find( fileItem->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.find( fileItem->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); m_pIconView->setSelected( item, true, true ); @@ -979,7 +979,7 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries ) showDirectoryOverlay(item); } - QString key; + TQString key; switch ( m_eSortCriterion ) { @@ -989,7 +989,7 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries ) case Type: key = item->item()->mimetype()+ "\008" +item->text().lower(); break; // ### slows down listing :-( case Date: { - QDateTime dayt; + TQDateTime dayt; dayt.setTime_t(item->item()->time(KIO::UDS_MODIFICATION_TIME )); key = dayt.toString("yyyyMMddhhmmss"); break; @@ -1065,9 +1065,9 @@ void KonqKfmIconView::showDirectoryOverlay(KFileIVI* item) { if (!m_paOutstandingOverlaysTimer) { - m_paOutstandingOverlaysTimer = new QTimer(this); - connect(m_paOutstandingOverlaysTimer, SIGNAL(timeout()), - SLOT(slotDirectoryOverlayStart())); + m_paOutstandingOverlaysTimer = new TQTimer(this); + connect(m_paOutstandingOverlaysTimer, TQT_SIGNAL(timeout()), + TQT_SLOT(slotDirectoryOverlayStart())); } m_paOutstandingOverlaysTimer->start(20, true); } @@ -1086,7 +1086,7 @@ void KonqKfmIconView::slotDirectoryOverlayStart() if (overlay) { - connect( overlay, SIGNAL( finished() ), this, SLOT( slotDirectoryOverlayFinished() ) ); + connect( overlay, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDirectoryOverlayFinished() ) ); overlay->start(); // Watch out, may emit finished() immediately!! return; // Let it run.... } @@ -1115,7 +1115,7 @@ void KonqKfmIconView::slotRefreshItems( const KFileItemList& entries ) kdDebug() << "KonqKfmIconView::slotRefreshItems '" << rit.current()->name() << "' ivi=" << ivi << endl; if (ivi) { - QSize oldSize = ivi->pixmap()->size(); + TQSize oldSize = ivi->pixmap()->size(); if ( ivi->isThumbnail() ) { bNeedPreviewJob = true; ivi->invalidateThumbnail(); @@ -1153,9 +1153,9 @@ void KonqKfmIconView::slotClear() m_pIconView->viewport()->setUpdatesEnabled( false ); if ( !m_pTimeoutRefreshTimer ) { - m_pTimeoutRefreshTimer = new QTimer( this ); - connect( m_pTimeoutRefreshTimer, SIGNAL( timeout() ), - this, SLOT( slotRefreshViewport() ) ); + m_pTimeoutRefreshTimer = new TQTimer( this ); + connect( m_pTimeoutRefreshTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( slotRefreshViewport() ) ); } m_pTimeoutRefreshTimer->start( 700, true ); @@ -1180,7 +1180,7 @@ void KonqKfmIconView::slotClear() void KonqKfmIconView::slotRedirection( const KURL & url ) { - const QString prettyURL = url.pathOrURL(); + const TQString prettyURL = url.pathOrURL(); emit m_extension->setLocationBarURL( prettyURL ); emit setWindowCaption( prettyURL ); m_pIconView->setURL( url ); @@ -1245,7 +1245,7 @@ void KonqKfmIconView::slotRenderingFinished() void KonqKfmIconView::slotRefreshViewport() { kdDebug(1202) << "KonqKfmIconView::slotRefreshViewport()" << endl; - QWidget * vp = m_pIconView->viewport(); + TQWidget * vp = m_pIconView->viewport(); bool prevState = vp->isUpdatesEnabled(); vp->setUpdatesEnabled( true ); vp->repaint(); @@ -1270,7 +1270,7 @@ bool KonqKfmIconView::doOpenURL( const KURL & url ) m_dirLister->setMimeFilter( mimeFilter() ); // This *must* happen before m_dirLister->openURL because it emits - // clear() and QIconView::clear() calls setContentsPos(0,0)! + // clear() and TQIconView::clear() calls setContentsPos(0,0)! KParts::URLArgs args = m_extension->urlArgs(); if ( args.reload ) { @@ -1305,9 +1305,9 @@ bool KonqKfmIconView::doOpenURL( const KURL & url ) m_paEnablePreviews->setChecked( m_pProps->isShowingPreview() ); for ( m_paPreviewPlugins.first(); m_paPreviewPlugins.current(); m_paPreviewPlugins.next() ) { - QStringList types = QStringList::split( ',', m_paPreviewPlugins.current()->name() ); + TQStringList types = TQStringList::split( ',', m_paPreviewPlugins.current()->name() ); bool enabled = false; - for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it ) + for ( TQStringList::ConstIterator it = types.begin(); it != types.end(); ++it ) if ( m_pProps->isShowingPreview( *it ) ) { enabled = true; @@ -1318,7 +1318,7 @@ bool KonqKfmIconView::doOpenURL( const KURL & url ) } } - const QString prettyURL = url.pathOrURL(); + const TQString prettyURL = url.pathOrURL(); emit setWindowCaption( prettyURL ); return true; @@ -1334,7 +1334,7 @@ void KonqKfmIconView::slotKFindClosed() m_dirLister->setAutoUpdate( true ); } -void KonqKfmIconView::slotOnItem( QIconViewItem *item ) +void KonqKfmIconView::slotOnItem( TQIconViewItem *item ) { emit setStatusBarText( static_cast(item)->item()->getStatusBarInfo() ); emitMouseOver( static_cast(item)->item()); @@ -1347,7 +1347,7 @@ void KonqKfmIconView::slotOnViewport() emitMouseOver( 0 ); } -void KonqKfmIconView::setViewMode( const QString &mode ) +void KonqKfmIconView::setViewMode( const TQString &mode ) { if ( mode == m_mode ) return; @@ -1357,13 +1357,13 @@ void KonqKfmIconView::setViewMode( const QString &mode ) m_mode = mode; if (mode=="MultiColumnView") { - m_pIconView->setArrangement(QIconView::TopToBottom); - m_pIconView->setItemTextPos(QIconView::Right); + m_pIconView->setArrangement(TQIconView::TopToBottom); + m_pIconView->setItemTextPos(TQIconView::Right); } else { - m_pIconView->setArrangement(QIconView::LeftToRight); - m_pIconView->setItemTextPos(QIconView::Bottom); + m_pIconView->setArrangement(TQIconView::LeftToRight); + m_pIconView->setItemTextPos(TQIconView::Bottom); } if ( m_bPreviewRunningBeforeCloseURL ) @@ -1380,28 +1380,28 @@ void KonqKfmIconView::setupSortKeys() { case NameCaseSensitive: m_pIconView->setCaseInsensitiveSort( false ); - for ( QIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() ) + for ( TQIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() ) it->setKey( it->text() ); break; case NameCaseInsensitive: m_pIconView->setCaseInsensitiveSort( true ); - for ( QIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() ) + for ( TQIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() ) it->setKey( it->text().lower() ); break; case Size: - for ( QIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() ) + for ( TQIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() ) it->setKey( makeSizeKey( (KFileIVI *)it ) ); break; case Type: // Sort by Type + Name (#17014) - for ( QIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() ) + for ( TQIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() ) it->setKey( static_cast( it )->item()->mimetype() + "\008" + it->text().lower() ); break; case Date: { //Sorts by time of modification (#52750) - QDateTime dayt; - for ( QIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() ) + TQDateTime dayt; + for ( TQIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() ) { dayt.setTime_t(static_cast( it )->item()->time(KIO::UDS_MODIFICATION_TIME)); it->setKey(dayt.toString("yyyyMMddhhmmss")); @@ -1411,7 +1411,7 @@ void KonqKfmIconView::setupSortKeys() } } -QString KonqKfmIconView::makeSizeKey( KFileIVI *item ) +TQString KonqKfmIconView::makeSizeKey( KFileIVI *item ) { return KIO::number( item->item()->size() ).rightJustify( 20, '0' ); } @@ -1428,8 +1428,8 @@ static KStaticDeleter s_springManagerDeleter; SpringLoadingManager::SpringLoadingManager() : m_startPart(0L) { - connect( &m_endTimer, SIGNAL( timeout() ), - this, SLOT( finished() ) ); + connect( &m_endTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( finished() ) ); } @@ -1451,7 +1451,7 @@ bool SpringLoadingManager::exists() void SpringLoadingManager::springLoadTrigger(KonqKfmIconView *view, KFileItem *file, - QIconViewItem *item) + TQIconViewItem *item) { if ( !file || !file->isDir() ) return; @@ -1483,7 +1483,7 @@ void SpringLoadingManager::springLoadTrigger(KonqKfmIconView *view, // Open the folder URL, we don't want to modify the browser // history, hence the use of openURL and setLocationBarURL view->openURL(url); - const QString prettyURL = url.pathOrURL(); + const TQString prettyURL = url.pathOrURL(); emit view->extension()->setLocationBarURL( prettyURL ); } @@ -1526,7 +1526,7 @@ void SpringLoadingManager::finished() KonqKfmIconView *view = static_cast(part); view->openURL(url); - const QString prettyURL = url.pathOrURL(); + const TQString prettyURL = url.pathOrURL(); emit view->extension()->setLocationBarURL( prettyURL ); deleteLater(); diff --git a/konqueror/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h index 7563fedcd..3385cc43a 100644 --- a/konqueror/iconview/konq_iconview.h +++ b/konqueror/iconview/konq_iconview.h @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include #include class KonqPropsView; @@ -46,12 +46,12 @@ class KonqKfmIconView : public KonqDirPart friend class IconViewBrowserExtension; // to access m_pProps Q_OBJECT Q_PROPERTY( bool supportsUndo READ supportsUndo ) - Q_PROPERTY( QString viewMode READ viewMode WRITE setViewMode ) + Q_PROPERTY( TQString viewMode READ viewMode WRITE setViewMode ) public: enum SortCriterion { NameCaseSensitive, NameCaseInsensitive, Size, Type, Date }; - KonqKfmIconView( QWidget *parentWidget, QObject *parent, const char *name, const QString& mode ); + KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode ); virtual ~KonqKfmIconView(); virtual const KFileItem * currentItem(); @@ -62,8 +62,8 @@ public: bool supportsUndo() const { return true; } - void setViewMode( const QString &mode ); - QString viewMode() const { return m_mode; } + void setViewMode( const TQString &mode ); + TQString viewMode() const { return m_mode; } // "Cut" icons : disable those whose URL is in lst, enable the rest virtual void disableIcons( const KURL::List & lst ); @@ -93,16 +93,16 @@ public slots: protected slots: // slots connected to QIconView - void slotReturnPressed( QIconViewItem *item ); - void slotMouseButtonPressed(int, QIconViewItem*, const QPoint&); - void slotMouseButtonClicked(int, QIconViewItem*, const QPoint&); - void slotContextMenuRequested(QIconViewItem*, const QPoint&); - void slotOnItem( QIconViewItem *item ); + void slotReturnPressed( TQIconViewItem *item ); + void slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&); + void slotMouseButtonClicked(int, TQIconViewItem*, const TQPoint&); + void slotContextMenuRequested(TQIconViewItem*, const TQPoint&); + void slotOnItem( TQIconViewItem *item ); void slotOnViewport(); void slotSelectionChanged(); // Slot used for spring loading folders - void slotDragHeld( QIconViewItem *item ); + void slotDragHeld( TQIconViewItem *item ); void slotDragMove( bool accepted ); void slotDragEntered( bool accepted ); void slotDragLeft(); @@ -146,7 +146,7 @@ protected: /** */ void setupSortKeys(); - QString makeSizeKey( KFileIVI *item ); + TQString makeSizeKey( KFileIVI *item ); /** The directory lister for this URL */ KDirLister* m_dirLister; @@ -190,20 +190,20 @@ protected: KFileIVI * m_pEnsureVisible; - QStringList m_itemsToSelect; + TQStringList m_itemsToSelect; SortCriterion m_eSortCriterion; KToggleAction *m_paDotFiles; KToggleAction *m_paDirectoryOverlays; KToggleAction *m_paEnablePreviews; - QPtrList m_paOutstandingOverlays; - QTimer *m_paOutstandingOverlaysTimer; + TQPtrList m_paOutstandingOverlays; + TQTimer *m_paOutstandingOverlaysTimer; /* KToggleAction *m_paImagePreview; KToggleAction *m_paTextPreview; KToggleAction *m_paHTMLPreview;*/ KActionMenu *m_pamPreview; - QPtrList m_paPreviewPlugins; + TQPtrList m_paPreviewPlugins; KActionMenu *m_pamSort; KAction *m_paSelect; @@ -216,13 +216,13 @@ protected: KonqIconViewWidget *m_pIconView; - QTimer *m_pTimeoutRefreshTimer; + TQTimer *m_pTimeoutRefreshTimer; - QPtrDict m_itemDict; // maps KFileItem * -> KFileIVI * + TQPtrDict m_itemDict; // maps KFileItem * -> KFileIVI * KMimeTypeResolver * m_mimeTypeResolver; - QString m_mode; + TQString m_mode; private: void showDirectoryOverlay(KFileIVI* item); @@ -242,7 +242,7 @@ public slots: // Those slots are automatically connected by the shell void reparseConfiguration(); void setSaveViewPropertiesLocally( bool value ); - void setNameFilter( const QString &nameFilter ); + void setNameFilter( const TQString &nameFilter ); void refreshMimeTypes() { m_iconView->iconViewWidget()->refreshMimeTypes(); } @@ -277,7 +277,7 @@ public: static bool exists(); void springLoadTrigger(KonqKfmIconView *view, KFileItem *file, - QIconViewItem *item); + TQIconViewItem *item); void dragLeft(KonqKfmIconView *view); void dragEntered(KonqKfmIconView *view); @@ -292,7 +292,7 @@ private: // Timer allowing to know the user wants to abort the spring loading // and go back to his start url (closing the opened window if needed) - QTimer m_endTimer; + TQTimer m_endTimer; }; diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index f0e8426d9..2aafe885c 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -32,9 +32,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include @@ -80,160 +80,160 @@ void KEBApp::createActions() { // save and quit should probably not be in the toplevel??? (void) KStdAction::quit( - this, SLOT( close() ), actionCollection()); - KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), actionCollection()); + this, TQT_SLOT( close() ), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); (void) KStdAction::configureToolbars( - this, SLOT( slotConfigureToolbars() ), actionCollection()); + this, TQT_SLOT( slotConfigureToolbars() ), actionCollection()); if (m_browser) { (void) KStdAction::open( - actn, SLOT( slotLoad() ), actionCollection()); + actn, TQT_SLOT( slotLoad() ), actionCollection()); (void) KStdAction::saveAs( - actn, SLOT( slotSaveAs() ), actionCollection()); + actn, TQT_SLOT( slotSaveAs() ), actionCollection()); } - (void) KStdAction::cut(actn, SLOT( slotCut() ), actionCollection()); - (void) KStdAction::copy(actn, SLOT( slotCopy() ), actionCollection()); - (void) KStdAction::paste(actn, SLOT( slotPaste() ), actionCollection()); - (void) KStdAction::print(actn, SLOT( slotPrint() ), actionCollection()); + (void) KStdAction::cut(actn, TQT_SLOT( slotCut() ), actionCollection()); + (void) KStdAction::copy(actn, TQT_SLOT( slotCopy() ), actionCollection()); + (void) KStdAction::paste(actn, TQT_SLOT( slotPaste() ), actionCollection()); + (void) KStdAction::print(actn, TQT_SLOT( slotPrint() ), actionCollection()); // settings menu (void) new KToggleAction( i18n("&Show Netscape Bookmarks in Konqueror"), 0, - actn, SLOT( slotShowNS() ), actionCollection(), + actn, TQT_SLOT( slotShowNS() ), actionCollection(), "settings_showNS"); // actions (void) new KAction( i18n("&Delete"), "editdelete", Key_Delete, - actn, SLOT( slotDelete() ), actionCollection(), "delete"); + actn, TQT_SLOT( slotDelete() ), actionCollection(), "delete"); (void) new KAction( i18n("Rename"), "text", Key_F2, - actn, SLOT( slotRename() ), actionCollection(), "rename"); + actn, TQT_SLOT( slotRename() ), actionCollection(), "rename"); (void) new KAction( i18n("C&hange URL"), "text", Key_F3, - actn, SLOT( slotChangeURL() ), actionCollection(), "changeurl"); + actn, TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl"); (void) new KAction( i18n("C&hange Comment"), "text", Key_F4, - actn, SLOT( slotChangeComment() ), actionCollection(), "changecomment"); + actn, TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment"); (void) new KAction( i18n("Chan&ge Icon..."), "icons", 0, - actn, SLOT( slotChangeIcon() ), actionCollection(), "changeicon"); + actn, TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon"); (void) new KAction( i18n("Update Favicon"), 0, - actn, SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon"); + actn, TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon"); (void) new KAction( i18n("Recursive Sort"), 0, - actn, SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort"); + actn, TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort"); (void) new KAction( i18n("&New Folder..."), "folder_new", CTRL+Key_N, - actn, SLOT( slotNewFolder() ), actionCollection(), "newfolder"); + actn, TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder"); (void) new KAction( i18n("&New Bookmark"), "www", 0, - actn, SLOT( slotNewBookmark() ), actionCollection(), "newbookmark"); + actn, TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark"); (void) new KAction( i18n("&Insert Separator"), CTRL+Key_I, - actn, SLOT( slotInsertSeparator() ), actionCollection(), + actn, TQT_SLOT( slotInsertSeparator() ), actionCollection(), "insertseparator"); (void) new KAction( i18n("&Sort Alphabetically"), 0, - actn, SLOT( slotSort() ), actionCollection(), "sort"); + actn, TQT_SLOT( slotSort() ), actionCollection(), "sort"); (void) new KAction( i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0, - actn, SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar"); + actn, TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar"); (void) new KAction( i18n("Show in T&oolbar"), "bookmark_toolbar", 0, - actn, SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar"); + actn, TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar"); (void) new KAction( i18n("Hide in T&oolbar"), "bookmark_toolbar", 0, - actn, SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar"); + actn, TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar"); (void) new KAction( i18n("&Expand All Folders"), 0, - actn, SLOT( slotExpandAll() ), actionCollection(), "expandall"); + actn, TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall"); (void) new KAction( i18n("Collapse &All Folders"), 0, - actn, SLOT( slotCollapseAll() ), actionCollection(), "collapseall" ); + actn, TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" ); (void) new KAction( i18n("&Open in Konqueror"), "fileopen", 0, - actn, SLOT( slotOpenLink() ), actionCollection(), "openlink" ); + actn, TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" ); (void) new KAction( i18n("Check &Status"), "bookmark", 0, - actn, SLOT( slotTestSelection() ), actionCollection(), "testlink" ); + actn, TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" ); (void) new KAction( i18n("Check Status: &All"), 0, - actn, SLOT( slotTestAll() ), actionCollection(), "testall" ); + actn, TQT_SLOT( slotTestAll() ), actionCollection(), "testall" ); (void) new KAction( i18n("Update All &Favicons"), 0, - actn, SLOT( slotUpdateAllFavIcons() ), actionCollection(), + actn, TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(), "updateallfavicons" ); (void) new KAction( i18n("Cancel &Checks"), 0, - actn, SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" ); + actn, TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" ); (void) new KAction( i18n("Cancel &Favicon Updates"), 0, - actn, SLOT( slotCancelFavIconUpdates() ), actionCollection(), + actn, TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(), "cancelfaviconupdates" ); (void) new KAction( i18n("Import &Netscape Bookmarks..."), "netscape", 0, - actn, SLOT( slotImport() ), actionCollection(), "importNS"); + actn, TQT_SLOT( slotImport() ), actionCollection(), "importNS"); (void) new KAction( i18n("Import &Opera Bookmarks..."), "opera", 0, - actn, SLOT( slotImport() ), actionCollection(), "importOpera"); + actn, TQT_SLOT( slotImport() ), actionCollection(), "importOpera"); (void) new KAction( i18n("Import All &Crash Sessions as Bookmarks..."), 0, - actn, SLOT( slotImport() ), actionCollection(), "importCrashes"); + actn, TQT_SLOT( slotImport() ), actionCollection(), "importCrashes"); (void) new KAction( i18n("Import &Galeon Bookmarks..."), 0, - actn, SLOT( slotImport() ), actionCollection(), "importGaleon"); + actn, TQT_SLOT( slotImport() ), actionCollection(), "importGaleon"); (void) new KAction( i18n("Import &KDE2/KDE3 Bookmarks..."), 0, - actn, SLOT( slotImport() ), actionCollection(), "importKDE2"); + actn, TQT_SLOT( slotImport() ), actionCollection(), "importKDE2"); (void) new KAction( i18n("Import &IE Bookmarks..."), 0, - actn, SLOT( slotImport() ), actionCollection(), "importIE"); + actn, TQT_SLOT( slotImport() ), actionCollection(), "importIE"); (void) new KAction( i18n("Import &Mozilla Bookmarks..."), "mozilla", 0, - actn, SLOT( slotImport() ), actionCollection(), "importMoz"); + actn, TQT_SLOT( slotImport() ), actionCollection(), "importMoz"); (void) new KAction( i18n("Export to &Netscape Bookmarks"), "netscape", 0, - actn, SLOT( slotExportNS() ), actionCollection(), "exportNS"); + actn, TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS"); (void) new KAction( i18n("Export to &Opera Bookmarks..."), "opera", 0, - actn, SLOT( slotExportOpera() ), actionCollection(), "exportOpera"); + actn, TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera"); (void) new KAction( i18n("Export to &HTML Bookmarks..."), "html", 0, - actn, SLOT( slotExportHTML() ), actionCollection(), "exportHTML"); + actn, TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML"); (void) new KAction( i18n("Export to &IE Bookmarks..."), 0, - actn, SLOT( slotExportIE() ), actionCollection(), "exportIE"); + actn, TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE"); (void) new KAction( i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0, - actn, SLOT( slotExportMoz() ), actionCollection(), "exportMoz"); + actn, TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz"); } void ActionsImpl::slotLoad() { - QString bookmarksFile - = KFileDialog::getOpenFileName(QString::null, "*.xml", KEBApp::self()); + TQString bookmarksFile + = KFileDialog::getOpenFileName(TQString::null, "*.xml", KEBApp::self()); if (bookmarksFile.isNull()) return; - KEBApp::self()->m_caption = QString::null; + KEBApp::self()->m_caption = TQString::null; KEBApp::self()->m_bookmarksFilename = bookmarksFile; KEBApp::self()->construct(); } void ActionsImpl::slotSaveAs() { KEBApp::self()->bkInfo()->commitChanges(); - QString saveFilename - = KFileDialog::getSaveFileName(QString::null, "*.xml", KEBApp::self()); + TQString saveFilename + = KFileDialog::getSaveFileName(TQString::null, "*.xml", KEBApp::self()); if (!saveFilename.isEmpty()) CurrentMgr::self()->saveAs(saveFilename); } -void CurrentMgr::doExport(ExportType type, const QString & _path) { +void CurrentMgr::doExport(ExportType type, const TQString & _path) { if(KEBApp::self()) KEBApp::self()->bkInfo()->commitChanges(); - QString path(_path); + TQString path(_path); // TODO - add a factory and make all this use the base class if (type == OperaExport) { if (path.isNull()) @@ -245,7 +245,7 @@ void CurrentMgr::doExport(ExportType type, const QString & _path) { } else if (type == HTMLExport) { if (path.isNull()) path = KFileDialog::getSaveFileName( - QDir::homeDirPath(), + TQDir::homeDirPath(), i18n("*.html|HTML Bookmark Listing") ); HTMLExporter exporter; exporter.write(mgr()->root(), path); @@ -274,7 +274,7 @@ void CurrentMgr::doExport(ExportType type, const QString & _path) { void KEBApp::setActionsEnabled(SelcAbilities sa) { KActionCollection * coll = actionCollection(); - QStringList toEnable; + TQStringList toEnable; if (sa.multiSelect || (sa.singleSelect && !sa.root)) toEnable << "edit_copy"; @@ -314,7 +314,7 @@ void KEBApp::setActionsEnabled(SelcAbilities sa) { } } - for ( QStringList::Iterator it = toEnable.begin(); + for ( TQStringList::Iterator it = toEnable.begin(); it != toEnable.end(); ++it ) { coll->action((*it).ascii())->setEnabled(true); @@ -342,7 +342,7 @@ void ActionsImpl::slotCopy() { KEBApp::self()->bkInfo()->commitChanges(); // this is not a command, because it can't be undone Q_ASSERT(ListView::self()->selectedItemsMap().count() != 0); - QValueList bookmarks + TQValueList bookmarks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap()); KBookmarkDrag* data = KBookmarkDrag::newDrag(bookmarks, 0 /* not this ! */); kapp->clipboard()->setData(data, QClipboard::Clipboard); @@ -363,8 +363,8 @@ void ActionsImpl::slotPaste() { void ActionsImpl::slotNewFolder() { KEBApp::self()->bkInfo()->commitChanges(); bool ok; - QString str = KInputDialog::getText( i18n( "Create New Bookmark Folder" ), - i18n( "New folder:" ), QString::null, &ok ); + TQString str = KInputDialog::getText( i18n( "Create New Bookmark Folder" ), + i18n( "New folder:" ), TQString::null, &ok ); if (!ok) return; @@ -379,7 +379,7 @@ void ActionsImpl::slotNewBookmark() { // TODO - make a setCurrentItem(Command *) which uses finaladdress interface CreateCommand * cmd = new CreateCommand( ListView::self()->userAddress(), - QString::null, "www", KURL("http://")); + TQString::null, "www", KURL("http://")); CmdHistory::self()->addCommand(cmd); } @@ -421,32 +421,32 @@ void ActionsImpl::slotExportMoz() { /* -------------------------------------- */ -static QCString s_appId, s_objId; +static TQCString s_appId, s_objId; static KParts::ReadOnlyPart *s_part; void ActionsImpl::slotPrint() { KEBApp::self()->bkInfo()->commitChanges(); s_part = KParts::ComponentFactory ::createPartInstanceFromQuery( - "text/html", QString::null); - s_part->setProperty("pluginsEnabled", QVariant(false, 1)); - s_part->setProperty("javaScriptEnabled", QVariant(false, 1)); - s_part->setProperty("javaEnabled", QVariant(false, 1)); + "text/html", TQString::null); + s_part->setProperty("pluginsEnabled", TQVariant(false, 1)); + s_part->setProperty("javaScriptEnabled", TQVariant(false, 1)); + s_part->setProperty("javaEnabled", TQVariant(false, 1)); // doc->openStream( "text/html", KURL() ); - // doc->writeStream( QCString( "FOO" ) ); + // doc->writeStream( TQCString( "FOO" ) ); // doc->closeStream(); HTMLExporter exporter; KTempFile tmpf(locateLocal("tmp", "print_bookmarks"), ".html"); - QTextStream *tstream = tmpf.textStream(); - tstream->setEncoding(QTextStream::Unicode); + TQTextStream *tstream = tmpf.textStream(); + tstream->setEncoding(TQTextStream::Unicode); (*tstream) << exporter.toString(CurrentMgr::self()->mgr()->root(), true); tmpf.close(); s_appId = kapp->dcopClient()->appId(); s_objId = s_part->property("dcopObjectId").toString().latin1(); - connect(s_part, SIGNAL(completed()), this, SLOT(slotDelayedPrint())); + connect(s_part, TQT_SIGNAL(completed()), this, TQT_SLOT(slotDelayedPrint())); s_part->openURL(KURL( tmpf.name() )); } @@ -508,21 +508,21 @@ void ActionsImpl::slotUpdateFavIcon() { class KBookmarkGroupList : private KBookmarkGroupTraverser { public: KBookmarkGroupList(KBookmarkManager *); - QValueList getList(const KBookmarkGroup &); + TQValueList getList(const KBookmarkGroup &); private: virtual void visit(const KBookmark &) { ; } virtual void visitEnter(const KBookmarkGroup &); virtual void visitLeave(const KBookmarkGroup &) { ; } private: KBookmarkManager *m_manager; - QValueList m_list; + TQValueList m_list; }; KBookmarkGroupList::KBookmarkGroupList( KBookmarkManager *manager ) { m_manager = manager; } -QValueList KBookmarkGroupList::getList( const KBookmarkGroup &grp ) { +TQValueList KBookmarkGroupList::getList( const KBookmarkGroup &grp ) { traverse(grp); return m_list; } @@ -537,9 +537,9 @@ void ActionsImpl::slotRecursiveSort() { Q_ASSERT(bk.isGroup()); KEBMacroCommand *mcmd = new KEBMacroCommand(i18n("Recursive Sort")); KBookmarkGroupList lister(CurrentMgr::self()->mgr()); - QValueList bookmarks = lister.getList(bk.toGroup()); + TQValueList bookmarks = lister.getList(bk.toGroup()); bookmarks << bk.toGroup(); - for (QValueListConstIterator it = bookmarks.begin(); it != bookmarks.end(); ++it) { + for (TQValueListConstIterator it = bookmarks.begin(); it != bookmarks.end(); ++it) { SortCommand *cmd = new SortCommand("", (*it).address()); cmd->execute(); mcmd->addCommand(cmd); @@ -565,8 +565,8 @@ void ActionsImpl::slotDelete() { void ActionsImpl::slotOpenLink() { KEBApp::self()->bkInfo()->commitChanges(); - QValueList bks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap()); - QValueListIterator it; + TQValueList bks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap()); + TQValueListIterator it; for (it = bks.begin(); it != bks.end(); ++it) { if ((*it).isGroup() || (*it).isSeparator()) continue; @@ -601,14 +601,14 @@ void ActionsImpl::slotSetAsToolbar() { void ActionsImpl::slotShowInToolbar() { KEBApp::self()->bkInfo()->commitChanges(); - QValueList bks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap()); + TQValueList bks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap()); KEBMacroCommand *mcmd = CmdGen::setShownInToolbar(bks, true); CmdHistory::self()->addCommand(mcmd); } void ActionsImpl::slotHideInToolbar() { KEBApp::self()->bkInfo()->commitChanges(); - QValueList bks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap()); + TQValueList bks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap()); KEBMacroCommand *mcmd = CmdGen::setShownInToolbar(bks, false); CmdHistory::self()->addCommand(mcmd); } @@ -617,7 +617,7 @@ void ActionsImpl::slotChangeIcon() { KEBApp::self()->bkInfo()->commitChanges(); KBookmark bk = ListView::self()->firstSelected()->bookmark(); KIconDialog dlg(KEBApp::self()); - QString newIcon = dlg.selectIcon(KIcon::Small, KIcon::FileSystem); + TQString newIcon = dlg.selectIcon(KIcon::Small, KIcon::FileSystem); if (newIcon.isEmpty()) return; EditCommand *cmd = new EditCommand( diff --git a/konqueror/keditbookmarks/actionsimpl.h b/konqueror/keditbookmarks/actionsimpl.h index c10b8e12c..11cd70d57 100644 --- a/konqueror/keditbookmarks/actionsimpl.h +++ b/konqueror/keditbookmarks/actionsimpl.h @@ -21,7 +21,7 @@ #ifndef __actionsimpl_h #define __actionsimpl_h -#include +#include class ActionsImpl : public QObject { diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp index 9d2d23f28..edc4a66bb 100644 --- a/konqueror/keditbookmarks/bookmarkinfo.cpp +++ b/konqueror/keditbookmarks/bookmarkinfo.cpp @@ -23,11 +23,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -49,16 +49,16 @@ // SHUFFLE all these functions around, the order is just plain stupid -BookmarkLineEdit::BookmarkLineEdit( QWidget *parent ) +BookmarkLineEdit::BookmarkLineEdit( TQWidget *parent ) : KLineEdit( parent ) { } void BookmarkLineEdit::cut() { - QString select( selectedText() ); + TQString select( selectedText() ); int pos( selectionStart() ); - QString newText( text().remove( pos, select.length() ) ); + TQString newText( text().remove( pos, select.length() ) ); KLineEdit::cut(); setEdited( true ); //KDE 4 setModified( true ); emit textChanged( newText ); @@ -74,22 +74,22 @@ void BookmarkInfoWidget::showBookmark(const KBookmark &bk) { // all read only and blank m_title_le->setReadOnly(true); - m_title_le->setText(QString::null); + m_title_le->setText(TQString::null); m_url_le->setReadOnly(true); - m_url_le->setText(QString::null); + m_url_le->setText(TQString::null); m_comment_le->setReadOnly(true); - m_comment_le->setText(QString::null); + m_comment_le->setText(TQString::null); m_visitdate_le->setReadOnly(true); - m_visitdate_le->setText(QString::null); + m_visitdate_le->setText(TQString::null); m_credate_le->setReadOnly(true); - m_credate_le->setText(QString::null); + m_credate_le->setText(TQString::null); m_visitcount_le->setReadOnly(true); - m_visitcount_le->setText(QString::null); + m_visitcount_le->setText(TQString::null); return; } @@ -99,11 +99,11 @@ void BookmarkInfoWidget::showBookmark(const KBookmark &bk) { m_title_le->setText(bk.fullText()); m_url_le->setReadOnly(bk.isGroup() || bk.isSeparator()); - m_url_le->setText(bk.isGroup() ? QString::null : bk.url().pathOrURL()); + m_url_le->setText(bk.isGroup() ? TQString::null : bk.url().pathOrURL()); m_comment_le->setReadOnly((bk.isSeparator()|| !bk.hasParent()) ? true : false ); m_comment_le->setText( - NodeEditCommand::getNodeText(bk, QStringList() << "desc")); + NodeEditCommand::getNodeText(bk, TQStringList() << "desc")); // readonly fields updateStatus(); @@ -112,14 +112,14 @@ void BookmarkInfoWidget::showBookmark(const KBookmark &bk) { void BookmarkInfoWidget::updateStatus() { - QString visitDate = - CurrentMgr::makeTimeStr( NodeEditCommand::getNodeText(m_bk, QStringList() << "info" << "metadata" + TQString visitDate = + CurrentMgr::makeTimeStr( NodeEditCommand::getNodeText(m_bk, TQStringList() << "info" << "metadata" << "time_visited" )); m_visitdate_le->setReadOnly(true); m_visitdate_le->setText(visitDate); - QString creationDate = - CurrentMgr::makeTimeStr( NodeEditCommand::getNodeText(m_bk, QStringList() << "info" << "metadata" + TQString creationDate = + CurrentMgr::makeTimeStr( NodeEditCommand::getNodeText(m_bk, TQStringList() << "info" << "metadata" << "time_added" )); m_credate_le->setReadOnly(true); m_credate_le->setText(creationDate); @@ -127,7 +127,7 @@ void BookmarkInfoWidget::updateStatus() // TODO - get the actual field name from the spec if it exists, else copy galeon m_visitcount_le->setReadOnly(true); m_visitcount_le->setText( - NodeEditCommand::getNodeText(m_bk, QStringList() << "info" << "metadata" + NodeEditCommand::getNodeText(m_bk, TQStringList() << "info" << "metadata" << "visit_count" )); } @@ -148,7 +148,7 @@ void BookmarkInfoWidget::commitTitle() } } -void BookmarkInfoWidget::slotTextChangedTitle(const QString &str) +void BookmarkInfoWidget::slotTextChangedTitle(const TQString &str) { if (m_bk.isNull() || !m_title_le->isModified()) return; @@ -157,7 +157,7 @@ void BookmarkInfoWidget::slotTextChangedTitle(const QString &str) if(titlecmd) { - NodeEditCommand::setNodeText(m_bk, QStringList() << "title", str); + NodeEditCommand::setNodeText(m_bk, TQStringList() << "title", str); titlecmd->modify(str); } else @@ -178,7 +178,7 @@ void BookmarkInfoWidget::commitURL() } } -void BookmarkInfoWidget::slotTextChangedURL(const QString &str) { +void BookmarkInfoWidget::slotTextChangedURL(const TQString &str) { if (m_bk.isNull() || !m_url_le->isModified()) return; @@ -209,7 +209,7 @@ void BookmarkInfoWidget::commitComment() } } -void BookmarkInfoWidget::slotTextChangedComment(const QString &str) { +void BookmarkInfoWidget::slotTextChangedComment(const TQString &str) { if (m_bk.isNull() || !m_comment_le->isModified()) return; @@ -217,7 +217,7 @@ void BookmarkInfoWidget::slotTextChangedComment(const QString &str) { if(commentcmd) { - NodeEditCommand::setNodeText(m_bk, QStringList() << "desc", str); + NodeEditCommand::setNodeText(m_bk, TQStringList() << "desc", str); commentcmd->modify(str); } else @@ -228,64 +228,64 @@ void BookmarkInfoWidget::slotTextChangedComment(const QString &str) { } } -BookmarkInfoWidget::BookmarkInfoWidget(QWidget *parent, const char *name) - : QWidget(parent, name), m_connected(false) { +BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name), m_connected(false) { - timer = new QTimer(this); - connect(timer, SIGNAL( timeout() ), SLOT( commitChanges())); + timer = new TQTimer(this); + connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( commitChanges())); titlecmd = 0; urlcmd = 0; commentcmd = 0; - QBoxLayout *vbox = new QVBoxLayout(this); - QGridLayout *grid = new QGridLayout(vbox, 3, 4, 4); + TQBoxLayout *vbox = new TQVBoxLayout(this); + TQGridLayout *grid = new TQGridLayout(vbox, 3, 4, 4); m_title_le = new BookmarkLineEdit(this); grid->addWidget(m_title_le, 0, 1); grid->addWidget( - new QLabel(m_title_le, i18n("Name:"), this), + new TQLabel(m_title_le, i18n("Name:"), this), 0, 0); - connect(m_title_le, SIGNAL( textChanged(const QString &) ), - SLOT( slotTextChangedTitle(const QString &) )); - connect(m_title_le, SIGNAL( lostFocus() ), SLOT( commitTitle() )); + connect(m_title_le, TQT_SIGNAL( textChanged(const TQString &) ), + TQT_SLOT( slotTextChangedTitle(const TQString &) )); + connect(m_title_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitTitle() )); m_url_le = new BookmarkLineEdit(this); grid->addWidget(m_url_le, 1, 1); grid->addWidget( - new QLabel(m_url_le, i18n("Location:"), this), + new TQLabel(m_url_le, i18n("Location:"), this), 1, 0); - connect(m_url_le, SIGNAL( textChanged(const QString &) ), - SLOT( slotTextChangedURL(const QString &) )); - connect(m_url_le, SIGNAL( lostFocus() ), SLOT( commitURL() )); + connect(m_url_le, TQT_SIGNAL( textChanged(const TQString &) ), + TQT_SLOT( slotTextChangedURL(const TQString &) )); + connect(m_url_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitURL() )); m_comment_le = new BookmarkLineEdit(this); grid->addWidget(m_comment_le, 2, 1); grid->addWidget( - new QLabel(m_comment_le, i18n("Comment:"), this), + new TQLabel(m_comment_le, i18n("Comment:"), this), 2, 0); - connect(m_comment_le, SIGNAL( textChanged(const QString &) ), - SLOT( slotTextChangedComment(const QString &) )); - connect(m_comment_le, SIGNAL( lostFocus() ), SLOT( commitComment() )); + connect(m_comment_le, TQT_SIGNAL( textChanged(const TQString &) ), + TQT_SLOT( slotTextChangedComment(const TQString &) )); + connect(m_comment_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitComment() )); m_credate_le = new KLineEdit(this); grid->addWidget(m_credate_le, 0, 3); grid->addWidget( - new QLabel(m_credate_le, i18n("First viewed:"), this), + new TQLabel(m_credate_le, i18n("First viewed:"), this), 0, 2); m_visitdate_le = new KLineEdit(this); grid->addWidget(m_visitdate_le, 1, 3); grid->addWidget( - new QLabel(m_visitdate_le, i18n("Viewed last:"), this), + new TQLabel(m_visitdate_le, i18n("Viewed last:"), this), 1, 2 ); m_visitcount_le = new KLineEdit(this); grid->addWidget(m_visitcount_le, 2, 3); grid->addWidget( - new QLabel(m_visitcount_le, i18n("Times visited:"), this), + new TQLabel(m_visitcount_le, i18n("Times visited:"), this), 2, 2); } diff --git a/konqueror/keditbookmarks/bookmarkinfo.h b/konqueror/keditbookmarks/bookmarkinfo.h index 51661959a..9894fec1d 100644 --- a/konqueror/keditbookmarks/bookmarkinfo.h +++ b/konqueror/keditbookmarks/bookmarkinfo.h @@ -24,7 +24,7 @@ #include "commands.h" #include -#include +#include #include class QTimer; @@ -32,16 +32,16 @@ class QTimer; class BookmarkLineEdit : public KLineEdit { Q_OBJECT public: - BookmarkLineEdit( QWidget * ); + BookmarkLineEdit( TQWidget * ); public slots: virtual void cut (); }; -class BookmarkInfoWidget : public QWidget { +class BookmarkInfoWidget : public TQWidget { Q_OBJECT public: - BookmarkInfoWidget(QWidget * = 0, const char * = 0); + BookmarkInfoWidget(TQWidget * = 0, const char * = 0); void showBookmark(const KBookmark &bk); void saveBookmark(const KBookmark &bk); KBookmark bookmark() { return m_bk; } @@ -50,9 +50,9 @@ public: void updateStatus(); public slots: - void slotTextChangedURL(const QString &); - void slotTextChangedTitle(const QString &); - void slotTextChangedComment(const QString &); + void slotTextChangedURL(const TQString &); + void slotTextChangedTitle(const TQString &); + void slotTextChangedComment(const TQString &); // _The deal with all those commitChanges() calls_ // First a short example how all the components @@ -99,7 +99,7 @@ private: NodeEditCommand *titlecmd; EditCommand *urlcmd; NodeEditCommand *commentcmd; - QTimer * timer; + TQTimer * timer; BookmarkLineEdit *m_title_le, *m_url_le, *m_comment_le; KLineEdit *m_visitdate_le, *m_credate_le, diff --git a/konqueror/keditbookmarks/bookmarkiterator.cpp b/konqueror/keditbookmarks/bookmarkiterator.cpp index 588adb86c..c30d890e3 100644 --- a/konqueror/keditbookmarks/bookmarkiterator.cpp +++ b/konqueror/keditbookmarks/bookmarkiterator.cpp @@ -26,11 +26,11 @@ #include -#include +#include -BookmarkIterator::BookmarkIterator(QValueList bks) : m_bklist(bks) { - connect(this, SIGNAL( deleteSelf(BookmarkIterator *) ), - SLOT( slotCancelTest(BookmarkIterator *) )); +BookmarkIterator::BookmarkIterator(TQValueList bks) : m_bklist(bks) { + connect(this, TQT_SIGNAL( deleteSelf(BookmarkIterator *) ), + TQT_SLOT( slotCancelTest(BookmarkIterator *) )); delayedEmitNextOne(); } @@ -39,7 +39,7 @@ BookmarkIterator::~BookmarkIterator() { } void BookmarkIterator::delayedEmitNextOne() { - QTimer::singleShot(1, this, SLOT( nextOne() )); + TQTimer::singleShot(1, this, TQT_SLOT( nextOne() )); } void BookmarkIterator::slotCancelTest(BookmarkIterator *test) { @@ -65,7 +65,7 @@ void BookmarkIterator::nextOne() { return; } - QValueListIterator head = m_bklist.begin(); + TQValueListIterator head = m_bklist.begin(); KBookmark bk = (*head); bool viable = bk.hasParent() && isApplicable(bk); diff --git a/konqueror/keditbookmarks/bookmarkiterator.h b/konqueror/keditbookmarks/bookmarkiterator.h index baafb3486..0931ccaf7 100644 --- a/konqueror/keditbookmarks/bookmarkiterator.h +++ b/konqueror/keditbookmarks/bookmarkiterator.h @@ -21,8 +21,8 @@ #ifndef __bookmarkiterator_h #define __bookmarkiterator_h -#include -#include +#include +#include #include class KEBListViewItem; @@ -33,7 +33,7 @@ class BookmarkIterator : public QObject Q_OBJECT public: - BookmarkIterator(QValueList bks); + BookmarkIterator(TQValueList bks); virtual ~BookmarkIterator(); virtual BookmarkIteratorHolder* holder() const = 0; @@ -53,7 +53,7 @@ protected: private: KBookmark m_bk; - QValueList m_bklist; + TQValueList m_bklist; }; class BookmarkIteratorHolder @@ -68,7 +68,7 @@ protected: virtual void doItrListChanged() = 0; int count() const { return m_itrs.count(); } private: - QPtrList m_itrs; + TQPtrList m_itrs; }; #endif diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp index e545df54e..2ad58a682 100644 --- a/konqueror/keditbookmarks/commands.cpp +++ b/konqueror/keditbookmarks/commands.cpp @@ -27,7 +27,7 @@ #include "listview.h" #include -#include +#include #include #include @@ -38,10 +38,10 @@ #include #include -QString KEBMacroCommand::affectedBookmarks() const +TQString KEBMacroCommand::affectedBookmarks() const { - QPtrListIterator it(m_commands); - QString affectBook; + TQPtrListIterator it(m_commands); + TQString affectBook; if(it.current()) affectBook = dynamic_cast(it.current())->affectedBookmarks(); ++it; @@ -50,34 +50,34 @@ QString KEBMacroCommand::affectedBookmarks() const return affectBook; } -QString DeleteManyCommand::prevOrParentAddress(QString addr) +TQString DeleteManyCommand::prevOrParentAddress(TQString addr) { - QString prev = KBookmark::previousAddress( addr ); + TQString prev = KBookmark::previousAddress( addr ); if( CurrentMgr::bookmarkAt(prev).hasParent()) return prev; else return KBookmark::parentAddress( addr ); } -QString DeleteManyCommand::preOrderNextAddress(QString addr) +TQString DeleteManyCommand::preOrderNextAddress(TQString addr) { - QString rootAdr = CurrentMgr::self()->mgr()->root().address(); + TQString rootAdr = CurrentMgr::self()->mgr()->root().address(); while(addr != rootAdr) { - QString next = KBookmark::nextAddress(addr); + TQString next = KBookmark::nextAddress(addr); if(CurrentMgr::bookmarkAt( next ).hasParent() ) return next; addr = KBookmark::parentAddress( addr ); } - return QString::null; + return TQString::null; } -bool DeleteManyCommand::isConsecutive(const QValueList & addresses) +bool DeleteManyCommand::isConsecutive(const TQValueList & addresses) { - QValueList::const_iterator it, end; + TQValueList::const_iterator it, end; it = addresses.begin(); end = addresses.end(); - QString addr = *(addresses.begin()); + TQString addr = *(addresses.begin()); for( ; it != end; ++it) { if( *it != addr ) @@ -88,10 +88,10 @@ bool DeleteManyCommand::isConsecutive(const QValueList & addresses) } -DeleteManyCommand::DeleteManyCommand(const QString &name, const QValueList & addresses) +DeleteManyCommand::DeleteManyCommand(const TQString &name, const TQValueList & addresses) : KEBMacroCommand(name) { - QValueList::const_iterator it, begin; + TQValueList::const_iterator it, begin; begin = addresses.begin(); it = addresses.end(); while(begin != it) @@ -110,7 +110,7 @@ DeleteManyCommand::DeleteManyCommand(const QString &name, const QValueList::const_iterator last = addresses.end(); + TQValueList::const_iterator last = addresses.end(); --last; if( CurrentMgr::bookmarkAt( KBookmark::nextAddress(*last) ).hasParent() ) m_currentAddress = *begin; else { m_currentAddress = preOrderNextAddress( KBookmark::parentAddress( *begin ) ); - if( m_currentAddress == QString::null) + if( m_currentAddress == TQString::null) m_currentAddress = prevOrParentAddress( *begin ); } } else // not consecutive, select the common parent (This could be more clever) { - QValueList::const_iterator jt, end; + TQValueList::const_iterator jt, end; end = addresses.end(); m_currentAddress = *begin; for( jt = addresses.begin(); jt != end; ++jt) @@ -141,13 +141,13 @@ DeleteManyCommand::DeleteManyCommand(const QString &name, const QValueList::Iterator it = m_editions.begin(); + TQValueList::Iterator it = m_editions.begin(); for ( ; it != m_editions.end() ; ++it) { // backup current value @@ -270,15 +270,15 @@ void EditCommand::unexecute() { m_editions = cmd.m_reverseEditions; } -QString EditCommand::affectedBookmarks() const +TQString EditCommand::affectedBookmarks() const { return KBookmark::parentAddress(m_address); } -void EditCommand::modify(const QString & a, const QString & v) +void EditCommand::modify(const TQString & a, const TQString & v) { - QValueList::Iterator it = m_editions.begin(); - QValueList::Iterator end = m_editions.end(); + TQValueList::Iterator it = m_editions.begin(); + TQValueList::Iterator end = m_editions.end(); for ( ; it != end; ++it) { if( (*it).attr == a) @@ -288,29 +288,29 @@ void EditCommand::modify(const QString & a, const QString & v) /* -------------------------------------- */ -QString NodeEditCommand::name() const { +TQString NodeEditCommand::name() const { // TODO - make dynamic return i18n("Renaming"); } -QString NodeEditCommand::getNodeText(KBookmark bk, const QStringList &nodehier) { - QDomNode subnode = bk.internalElement(); - for (QStringList::ConstIterator it = nodehier.begin(); +TQString NodeEditCommand::getNodeText(KBookmark bk, const TQStringList &nodehier) { + TQDomNode subnode = bk.internalElement(); + for (TQStringList::ConstIterator it = nodehier.begin(); it != nodehier.end(); ++it) { subnode = subnode.namedItem((*it)); if (subnode.isNull()) - return QString::null; + return TQString::null; } return (subnode.firstChild().isNull()) - ? QString::null + ? TQString::null : subnode.firstChild().toText().data(); } -QString NodeEditCommand::setNodeText(KBookmark bk, const QStringList &nodehier, - const QString newValue) { - QDomNode subnode = bk.internalElement(); - for (QStringList::ConstIterator it = nodehier.begin(); +TQString NodeEditCommand::setNodeText(KBookmark bk, const TQStringList &nodehier, + const TQString newValue) { + TQDomNode subnode = bk.internalElement(); + for (TQStringList::ConstIterator it = nodehier.begin(); it != nodehier.end(); ++it) { subnode = subnode.namedItem((*it)); @@ -321,13 +321,13 @@ QString NodeEditCommand::setNodeText(KBookmark bk, const QStringList &nodehier, } if (subnode.firstChild().isNull()) { - QDomText domtext = subnode.ownerDocument().createTextNode(""); + TQDomText domtext = subnode.ownerDocument().createTextNode(""); subnode.appendChild(domtext); } - QDomText domtext = subnode.firstChild().toText(); + TQDomText domtext = subnode.firstChild().toText(); - QString oldText = domtext.data(); + TQString oldText = domtext.data(); domtext.setData(newValue); return oldText; } @@ -336,7 +336,7 @@ void NodeEditCommand::execute() { // DUPLICATED HEAVILY FROM KIO/BOOKMARKS KBookmark bk = CurrentMgr::bookmarkAt(m_address); Q_ASSERT(!bk.isNull()); - m_oldText = setNodeText(bk, QStringList() << m_nodename, m_newText); + m_oldText = setNodeText(bk, TQStringList() << m_nodename, m_newText); } void NodeEditCommand::unexecute() { @@ -349,12 +349,12 @@ void NodeEditCommand::unexecute() { m_newText = cmd.m_oldText; } -void NodeEditCommand::modify(const QString & newText) +void NodeEditCommand::modify(const TQString & newText) { m_newText = newText; } -QString NodeEditCommand::affectedBookmarks() const +TQString NodeEditCommand::affectedBookmarks() const { return KBookmark::parentAddress(m_address); } @@ -368,15 +368,15 @@ void DeleteCommand::execute() { Q_ASSERT(!bk.isNull()); if (m_contentOnly) { - QDomElement groupRoot = bk.internalElement(); + TQDomElement groupRoot = bk.internalElement(); - QDomNode n = groupRoot.firstChild(); + TQDomNode n = groupRoot.firstChild(); while (!n.isNull()) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if (!e.isNull()) { // kdDebug() << e.tagName() << endl; } - QDomNode next = n.nextSibling(); + TQDomNode next = n.nextSibling(); groupRoot.removeChild(n); n = next; } @@ -419,19 +419,19 @@ void DeleteCommand::unexecute() { } } -QString DeleteCommand::affectedBookmarks() const +TQString DeleteCommand::affectedBookmarks() const { return KBookmark::parentAddress(m_from); } KEBMacroCommand* DeleteCommand::deleteAll(const KBookmarkGroup & parentGroup) { - KEBMacroCommand *cmd = new KEBMacroCommand(QString::null); - QStringList lstToDelete; + KEBMacroCommand *cmd = new KEBMacroCommand(TQString::null); + TQStringList lstToDelete; // we need to delete from the end, to avoid index shifting for (KBookmark bk = parentGroup.first(); !bk.isNull(); bk = parentGroup.next(bk)) lstToDelete.prepend(bk.address()); - for (QStringList::Iterator it = lstToDelete.begin(); + for (TQStringList::Iterator it = lstToDelete.begin(); it != lstToDelete.end(); ++it) cmd->addCommand(new DeleteCommand((*it))); return cmd; @@ -439,7 +439,7 @@ KEBMacroCommand* DeleteCommand::deleteAll(const KBookmarkGroup & parentGroup) { /* -------------------------------------- */ -QString MoveCommand::name() const { +TQString MoveCommand::name() const { return i18n("Move %1").arg(m_mytext); } @@ -456,12 +456,12 @@ void MoveCommand::execute() { bool wasFirstChild = (KBookmark::positionInParent(m_from) == 0); KBookmark oldPreviousSibling = wasFirstChild - ? KBookmark(QDomElement()) + ? KBookmark(TQDomElement()) : CurrentMgr::bookmarkAt( KBookmark::previousAddress(m_from)); // look for m_to in the QDom tree - QString parentAddress = KBookmark::parentAddress(m_to); + TQString parentAddress = KBookmark::parentAddress(m_to); KBookmark newParent = CurrentMgr::bookmarkAt(parentAddress); Q_ASSERT(!newParent.isNull()); @@ -470,10 +470,10 @@ void MoveCommand::execute() { bool isFirstChild = (KBookmark::positionInParent(m_to) == 0); if (isFirstChild) { - newParent.toGroup().moveItem(bk, QDomElement()); + newParent.toGroup().moveItem(bk, TQDomElement()); } else { - QString afterAddress = KBookmark::previousAddress(m_to); + TQString afterAddress = KBookmark::previousAddress(m_to); // kdDebug() << "MoveCommand::execute afterAddress=" // << afterAddress << endl; @@ -497,7 +497,7 @@ void MoveCommand::execute() { // << m_from << " to=" << m_to << endl; } -QString MoveCommand::finalAddress() const { +TQString MoveCommand::finalAddress() const { Q_ASSERT( !m_to.isEmpty() ); return m_to; } @@ -511,7 +511,7 @@ void MoveCommand::unexecute() { m_to = undoCmd.m_from; } -QString MoveCommand::affectedBookmarks() const +TQString MoveCommand::affectedBookmarks() const { return KBookmark::commonParent(KBookmark::parentAddress(m_from), KBookmark::parentAddress(m_to)); } @@ -543,7 +543,7 @@ class SortItem { class SortByName { public: - static QString key(const SortItem &item) { + static TQString key(const SortItem &item) { return (item.bookmark().isGroup() ? "a" : "b") + (item.bookmark().fullText().lower()); } @@ -558,7 +558,7 @@ void SortCommand::execute() { SortItem firstChild(grp.first()); // this will call moveAfter, which will add // the subcommands for moving the items - kInsertionSort + kInsertionSort (firstChild, (*this)); } else { @@ -569,7 +569,7 @@ void SortCommand::execute() { void SortCommand::moveAfter(const SortItem &moveMe, const SortItem &afterMe) { - QString destAddress = + TQString destAddress = afterMe.isNull() // move as first child ? KBookmark::parentAddress(moveMe.bookmark().address()) + "/0" @@ -586,7 +586,7 @@ void SortCommand::unexecute() { KEBMacroCommand::unexecute(); } -QString SortCommand::affectedBookmarks() const +TQString SortCommand::affectedBookmarks() const { return m_groupAddress; } @@ -598,14 +598,14 @@ KEBMacroCommand* CmdGen::setAsToolbar(const KBookmark &bk) { KBookmarkGroup oldToolbar = CurrentMgr::self()->mgr()->toolbar(); if (!oldToolbar.isNull()) { - QValueList lst; + TQValueList lst; lst.append(EditCommand::Edition("toolbar", "no")); lst.append(EditCommand::Edition("icon", "")); EditCommand *cmd1 = new EditCommand(oldToolbar.address(), lst); mcmd->addCommand(cmd1); } - QValueList lst; + TQValueList lst; lst.append(EditCommand::Edition("toolbar", "yes")); lst.append(EditCommand::Edition("icon", "bookmark_toolbar")); // TODO - see below @@ -619,16 +619,16 @@ bool CmdGen::shownInToolbar(const KBookmark &bk) { return (bk.internalElement().attribute("showintoolbar") == "yes"); } -KEBMacroCommand* CmdGen::setShownInToolbar(const QValueList &bks, bool show) { - QString i18n_name = i18n("%1 in Bookmark Toolbar").arg(show ? i18n("Show") +KEBMacroCommand* CmdGen::setShownInToolbar(const TQValueList &bks, bool show) { + TQString i18n_name = i18n("%1 in Bookmark Toolbar").arg(show ? i18n("Show") : i18n("Hide")); KEBMacroCommand *mcmd = new KEBMacroCommand(i18n_name); - QValueList::ConstIterator it, end; + TQValueList::ConstIterator it, end; end = bks.end(); for(it = bks.begin(); it != end; ++it) { - QValueList lst; + TQValueList lst; lst.append(EditCommand::Edition("showintoolbar", show ? "yes" : "no")); EditCommand *cmd = new EditCommand((*it).address(), lst); mcmd->addCommand(cmd); @@ -637,9 +637,9 @@ KEBMacroCommand* CmdGen::setShownInToolbar(const QValueList &bks, boo } KEBMacroCommand* CmdGen::insertMimeSource( - const QString &cmdName, QMimeSource *_data, const QString &addr + const TQString &cmdName, TQMimeSource *_data, const TQString &addr ) { - QMimeSource *data = _data; + TQMimeSource *data = _data; bool modified = false; const char *format = 0; for (int i = 0; format = data->format(i), format; i++) { @@ -648,7 +648,7 @@ KEBMacroCommand* CmdGen::insertMimeSource( // or not. so, we search. sucky... if (strcmp(format, "GALEON_BOOKMARK") == 0) { modified = true; - QStoredDrag *mydrag = new QStoredDrag("application/x-xbel"); + TQStoredDrag *mydrag = new TQStoredDrag("application/x-xbel"); mydrag->setEncodedData(data->encodedData("GALEON_BOOKMARK")); data = mydrag; break; @@ -661,14 +661,14 @@ KEBMacroCommand* CmdGen::insertMimeSource( continue; // break out of format loop KURL::List::ConstIterator uit = uris.begin(); KURL::List::ConstIterator uEnd = uris.end(); - QValueList urlBks; + TQValueList urlBks; for ( ; uit != uEnd ; ++uit ) { if (!(*uit).url().endsWith(".desktop")) { urlBks << KBookmark::standaloneBookmark((*uit).prettyURL(), (*uit)); continue; } KDesktopFile df((*uit).path(), true); - QString title = df.readName(); + TQString title = df.readName(); KURL url(df.readURL()); if (title.isNull()) title = url.prettyURL(); @@ -686,9 +686,9 @@ KEBMacroCommand* CmdGen::insertMimeSource( return 0; } KEBMacroCommand *mcmd = new KEBMacroCommand(cmdName); - QString currentAddress = addr; - QValueList bookmarks = KBookmarkDrag::decode(data); - for (QValueListConstIterator it = bookmarks.begin(); + TQString currentAddress = addr; + TQValueList bookmarks = KBookmarkDrag::decode(data); + for (TQValueListConstIterator it = bookmarks.begin(); it != bookmarks.end(); ++it) { CreateCommand *cmd = new CreateCommand(currentAddress, (*it)); cmd->execute(); @@ -700,17 +700,17 @@ KEBMacroCommand* CmdGen::insertMimeSource( return mcmd; } -KEBMacroCommand* CmdGen::itemsMoved(const QValueVector & items, - const QString &newAddress, bool copy) { +KEBMacroCommand* CmdGen::itemsMoved(const TQValueVector & items, + const TQString &newAddress, bool copy) { KEBMacroCommand *mcmd = new KEBMacroCommand(copy ? i18n("Copy Items") : i18n("Move Items")); - QValueList list = ListView::self()->itemsToBookmarks( items ); - QValueList::const_iterator it, end; + TQValueList list = ListView::self()->itemsToBookmarks( items ); + TQValueList::const_iterator it, end; it = list.begin(); end = list.end(); - QString bkInsertAddr = newAddress; + TQString bkInsertAddr = newAddress; for (; it != end; ++it) { if (copy) { CreateCommand *cmd; @@ -726,7 +726,7 @@ KEBMacroCommand* CmdGen::itemsMoved(const QValueVector & item bkInsertAddr = cmd->finalAddress(); } else /* if (move) */ { - QString oldAddress = (*it).address(); + TQString oldAddress = (*it).address(); if (bkInsertAddr.startsWith(oldAddress)) //FIXME uses internal representation of address continue; diff --git a/konqueror/keditbookmarks/commands.h b/konqueror/keditbookmarks/commands.h index 61363f9dd..3df5d3acf 100644 --- a/konqueror/keditbookmarks/commands.h +++ b/konqueror/keditbookmarks/commands.h @@ -23,7 +23,7 @@ #include #include -#include +#include // Interface adds the affectedBookmarks method // Any class should on call add those bookmarks which are @@ -35,82 +35,82 @@ class IKEBCommand public: IKEBCommand() {}; virtual ~IKEBCommand() {}; - virtual QString affectedBookmarks() const = 0; - virtual QString currentAddress() const { return QString::null; } + virtual TQString affectedBookmarks() const = 0; + virtual TQString currentAddress() const { return TQString::null; } }; class KEBMacroCommand : public KMacroCommand, public IKEBCommand { public: - KEBMacroCommand(const QString &name) + KEBMacroCommand(const TQString &name) : KMacroCommand(name) {}; virtual ~KEBMacroCommand() {}; - virtual QString affectedBookmarks() const; + virtual TQString affectedBookmarks() const; }; class DeleteManyCommand : public KEBMacroCommand { public: - DeleteManyCommand(const QString &name, const QValueList & addresses); + DeleteManyCommand(const TQString &name, const TQValueList & addresses); virtual ~DeleteManyCommand() {}; - virtual QString currentAddress() const; + virtual TQString currentAddress() const; private: - QString prevOrParentAddress(QString addr); - QString preOrderNextAddress(QString addr); - bool isConsecutive(const QValueList & addresses); - QString m_currentAddress; + TQString prevOrParentAddress(TQString addr); + TQString preOrderNextAddress(TQString addr); + bool isConsecutive(const TQValueList & addresses); + TQString m_currentAddress; }; class CreateCommand : public KCommand, public IKEBCommand { public: // separator - CreateCommand(const QString &address) + CreateCommand(const TQString &address) : KCommand(), m_to(address), - m_group(false), m_separator(true), m_originalBookmark(QDomElement()) + m_group(false), m_separator(true), m_originalBookmark(TQDomElement()) { ; } // bookmark - CreateCommand(const QString &address, - const QString &text, const QString &iconPath, + CreateCommand(const TQString &address, + const TQString &text, const TQString &iconPath, const KURL &url) : KCommand(), m_to(address), m_text(text), m_iconPath(iconPath), m_url(url), - m_group(false), m_separator(false), m_originalBookmark(QDomElement()) + m_group(false), m_separator(false), m_originalBookmark(TQDomElement()) { ; } // folder - CreateCommand(const QString &address, - const QString &text, const QString &iconPath, + CreateCommand(const TQString &address, + const TQString &text, const TQString &iconPath, bool open) : KCommand(), m_to(address), m_text(text), m_iconPath(iconPath), - m_group(true), m_separator(false), m_open(open), m_originalBookmark(QDomElement()) + m_group(true), m_separator(false), m_open(open), m_originalBookmark(TQDomElement()) { ; } // clone existing bookmark - CreateCommand(const QString &address, - const KBookmark &original, const QString &name = QString::null) + CreateCommand(const TQString &address, + const KBookmark &original, const TQString &name = TQString::null) : KCommand(), m_to(address), m_group(false), m_separator(false), m_open(false), m_originalBookmark(original), m_mytext(name) { ; } - QString finalAddress() const; + TQString finalAddress() const; virtual ~CreateCommand() { ; } virtual void execute(); virtual void unexecute(); - virtual QString name() const; - virtual QString affectedBookmarks() const; - virtual QString currentAddress() const; + virtual TQString name() const; + virtual TQString affectedBookmarks() const; + virtual TQString currentAddress() const; private: - QString m_to; - QString m_text; - QString m_iconPath; + TQString m_to; + TQString m_text; + TQString m_iconPath; KURL m_url; bool m_group:1; bool m_separator:1; bool m_open:1; KBookmark m_originalBookmark; - QString m_mytext; + TQString m_mytext; }; class EditCommand : public KCommand, public IKEBCommand @@ -119,82 +119,82 @@ public: struct Edition { Edition() { ; } // needed for QValueList - Edition(const QString &a, const QString &v) : attr(a), value(v) {} - QString attr; - QString value; + Edition(const TQString &a, const TQString &v) : attr(a), value(v) {} + TQString attr; + TQString value; }; // change one attribute - EditCommand(const QString &address, Edition edition, const QString &name = QString::null) + EditCommand(const TQString &address, Edition edition, const TQString &name = TQString::null) : KCommand(), m_address(address), m_mytext(name) { m_editions.append(edition); } // change multiple attributes - EditCommand(const QString &address, - const QValueList &editions, - const QString &name = QString::null) + EditCommand(const TQString &address, + const TQValueList &editions, + const TQString &name = TQString::null) : KCommand(), m_address(address), m_editions(editions), m_mytext(name) { ; } - void modify(const QString & a, const QString & v); + void modify(const TQString & a, const TQString & v); virtual ~EditCommand() { ; } virtual void execute(); virtual void unexecute(); - virtual QString name() const; - virtual QString affectedBookmarks() const; + virtual TQString name() const; + virtual TQString affectedBookmarks() const; private: - QString m_address; - QValueList m_editions; - QValueList m_reverseEditions; - QString m_mytext; + TQString m_address; + TQValueList m_editions; + TQValueList m_reverseEditions; + TQString m_mytext; }; class NodeEditCommand : public KCommand, public IKEBCommand { public: - NodeEditCommand(const QString &address, - const QString &newText, - const QString &nodeName) + NodeEditCommand(const TQString &address, + const TQString &newText, + const TQString &nodeName) : KCommand(), m_address(address), m_newText(newText), m_nodename(nodeName) { ; } - void modify(const QString & newText); + void modify(const TQString & newText); virtual ~NodeEditCommand() { ; } virtual void execute(); virtual void unexecute(); - virtual QString affectedBookmarks() const; - virtual QString name() const; - static QString getNodeText(KBookmark bk, const QStringList &nodehier); - static QString setNodeText(KBookmark bk, const QStringList &nodehier, - QString newValue); + virtual TQString affectedBookmarks() const; + virtual TQString name() const; + static TQString getNodeText(KBookmark bk, const TQStringList &nodehier); + static TQString setNodeText(KBookmark bk, const TQStringList &nodehier, + TQString newValue); private: - QString m_address; - QString m_newText; - QString m_oldText; - QString m_nodename; + TQString m_address; + TQString m_newText; + TQString m_oldText; + TQString m_nodename; }; class DeleteCommand : public KCommand, public IKEBCommand { public: - DeleteCommand(const QString &from, bool contentOnly = false) + DeleteCommand(const TQString &from, bool contentOnly = false) : KCommand(), m_from(from), m_cmd(0L), m_subCmd(0L), m_contentOnly(contentOnly) { ; } virtual ~DeleteCommand() { delete m_cmd; delete m_subCmd;} virtual void execute(); virtual void unexecute(); - virtual QString name() const { + virtual TQString name() const { // NOTE - DeleteCommand needs no name, its always embedded in a macrocommand return ""; }; - virtual QString affectedBookmarks() const; + virtual TQString affectedBookmarks() const; static KEBMacroCommand* deleteAll(const KBookmarkGroup &parentGroup); private: - QString m_from; + TQString m_from; KCommand *m_cmd; KEBMacroCommand *m_subCmd; bool m_contentOnly; @@ -205,19 +205,19 @@ class MoveCommand : public KCommand, public IKEBCommand public: // "Create it with itemsAlreadyMoved=true since // "KListView moves the item before telling us about it." - MoveCommand(const QString &from, const QString &to, const QString &name = QString::null) + MoveCommand(const TQString &from, const TQString &to, const TQString &name = TQString::null) : KCommand(), m_from(from), m_to(to), m_mytext(name) { ; } - QString finalAddress() const; + TQString finalAddress() const; virtual ~MoveCommand() { ; } virtual void execute(); virtual void unexecute(); - virtual QString name() const; - virtual QString affectedBookmarks() const; + virtual TQString name() const; + virtual TQString affectedBookmarks() const; private: - QString m_from; - QString m_to; - QString m_mytext; + TQString m_from; + TQString m_to; + TQString m_mytext; }; class SortItem; @@ -225,18 +225,18 @@ class SortItem; class SortCommand : public KEBMacroCommand { public: - SortCommand(const QString &name, const QString &groupAddress) + SortCommand(const TQString &name, const TQString &groupAddress) : KEBMacroCommand(name), m_groupAddress(groupAddress) { ; } virtual ~SortCommand() { ; } virtual void execute(); virtual void unexecute(); - virtual QString affectedBookmarks() const; + virtual TQString affectedBookmarks() const; // internal void moveAfter(const SortItem &moveMe, const SortItem &afterMe); private: - QString m_groupAddress; + TQString m_groupAddress; }; class KEBListViewItem; @@ -244,11 +244,11 @@ class KEBListViewItem; class CmdGen { public: static KEBMacroCommand* setAsToolbar(const KBookmark &bk); - static KEBMacroCommand* setShownInToolbar(const QValueList &bk, bool show); + static KEBMacroCommand* setShownInToolbar(const TQValueList &bk, bool show); static bool shownInToolbar(const KBookmark &bk); - static KEBMacroCommand* deleteItems(const QString &commandName, const QValueVector & items); - static KEBMacroCommand* insertMimeSource(const QString &cmdName, QMimeSource *data, const QString &addr); - static KEBMacroCommand* itemsMoved(const QValueVector & items, const QString &newAddress, bool copy); + static KEBMacroCommand* deleteItems(const TQString &commandName, const TQValueVector & items); + static KEBMacroCommand* insertMimeSource(const TQString &cmdName, TQMimeSource *data, const TQString &addr); + static KEBMacroCommand* itemsMoved(const TQValueVector & items, const TQString &newAddress, bool copy); private: CmdGen() { ; } }; diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp index 76b27b9b6..a31af0c80 100644 --- a/konqueror/keditbookmarks/dcop.cpp +++ b/konqueror/keditbookmarks/dcop.cpp @@ -26,9 +26,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include @@ -38,13 +38,13 @@ KBookmarkEditorIface::KBookmarkEditorIface() - : QObject(), DCOPObject("KBookmarkEditor") { - // connect(KBookmarkNotifier_stub, SIGNAL( updatedAccessMetadata(QString,QString) ), - // this, SLOT( slotDcopUpdatedAccessMetadata(QString,QString) )); - connectDCOPSignal(0, "KBookmarkNotifier", "updatedAccessMetadata(QString,QString)", "slotDcopUpdatedAccessMetadata(QString,QString)", false); + : TQObject(), DCOPObject("KBookmarkEditor") { + // connect(KBookmarkNotifier_stub, TQT_SIGNAL( updatedAccessMetadata(TQString,TQString) ), + // this, TQT_SLOT( slotDcopUpdatedAccessMetadata(TQString,TQString) )); + connectDCOPSignal(0, "KBookmarkNotifier", "updatedAccessMetadata(TQString,TQString)", "slotDcopUpdatedAccessMetadata(TQString,TQString)", false); } -void KBookmarkEditorIface::slotDcopUpdatedAccessMetadata(QString filename, QString url) { +void KBookmarkEditorIface::slotDcopUpdatedAccessMetadata(TQString filename, TQString url) { // evil hack, konqi gets updates by way of historymgr, // therefore konqi does'nt want "save" notification, // unfortunately to stop konqi getting it is difficult diff --git a/konqueror/keditbookmarks/dcop.h b/konqueror/keditbookmarks/dcop.h index 3e8e545d8..6914f2db4 100644 --- a/konqueror/keditbookmarks/dcop.h +++ b/konqueror/keditbookmarks/dcop.h @@ -23,14 +23,14 @@ #include -class KBookmarkEditorIface : public QObject, public DCOPObject +class KBookmarkEditorIface : public TQObject, public DCOPObject { Q_OBJECT K_DCOP public: KBookmarkEditorIface(); k_dcop_hidden: - void slotDcopUpdatedAccessMetadata(QString filename, QString url); + void slotDcopUpdatedAccessMetadata(TQString filename, TQString url); }; #endif diff --git a/konqueror/keditbookmarks/exporters.cpp b/konqueror/keditbookmarks/exporters.cpp index 4b1bbb5e7..912edcb9a 100644 --- a/konqueror/keditbookmarks/exporters.cpp +++ b/konqueror/keditbookmarks/exporters.cpp @@ -24,24 +24,24 @@ #include #include -#include +#include HTMLExporter::HTMLExporter() : m_out(&m_string, IO_WriteOnly) { } -void HTMLExporter::write(const KBookmarkGroup &grp, const QString &filename, bool showAddress) { - QFile file(filename); +void HTMLExporter::write(const KBookmarkGroup &grp, const TQString &filename, bool showAddress) { + TQFile file(filename); if (!file.open(IO_WriteOnly)) { kdError(7043) << "Can't write to file " << filename << endl; return; } - QTextStream tstream(&file); - tstream.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream tstream(&file); + tstream.setEncoding(TQTextStream::UnicodeUTF8); tstream << toString(grp, showAddress); } -QString HTMLExporter::toString(const KBookmarkGroup &grp, bool showAddress) +TQString HTMLExporter::toString(const KBookmarkGroup &grp, bool showAddress) { m_showAddress = showAddress; traverse(grp); diff --git a/konqueror/keditbookmarks/exporters.h b/konqueror/keditbookmarks/exporters.h index cdc3844ba..e40964371 100644 --- a/konqueror/keditbookmarks/exporters.h +++ b/konqueror/keditbookmarks/exporters.h @@ -24,15 +24,15 @@ class HTMLExporter : private KBookmarkGroupTraverser { public: HTMLExporter(); - QString toString(const KBookmarkGroup &, bool showAddress = false); - void write(const KBookmarkGroup &, const QString &, bool showAddress = false); + TQString toString(const KBookmarkGroup &, bool showAddress = false); + void write(const KBookmarkGroup &, const TQString &, bool showAddress = false); private: virtual void visit(const KBookmark &); virtual void visitEnter(const KBookmarkGroup &); virtual void visitLeave(const KBookmarkGroup &); private: - QString m_string; - QTextStream m_out; + TQString m_string; + TQTextStream m_out; bool m_showAddress; }; diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp index b99371324..b9b9b4ea9 100644 --- a/konqueror/keditbookmarks/favicons.cpp +++ b/konqueror/keditbookmarks/favicons.cpp @@ -43,11 +43,11 @@ void FavIconsItrHolder::doItrListChanged() { { kdDebug()<<"Notifing managers "<notifyManagers(CurrentMgr::bookmarkAt(m_affectedBookmark).toGroup()); - m_affectedBookmark = QString::null; + m_affectedBookmark = TQString::null; } } -void FavIconsItrHolder::addAffectedBookmark( const QString & address ) +void FavIconsItrHolder::addAffectedBookmark( const TQString & address ) { kdDebug()<<"addAffectedBookmark "< bks) +FavIconsItr::FavIconsItr(TQValueList bks) : BookmarkIterator(bks) { m_updater = 0; } @@ -86,8 +86,8 @@ void FavIconsItr::doAction() { curItem()->setTmpStatus(i18n("Updating favicon...")); if (!m_updater) { m_updater = new FavIconUpdater(kapp, "FavIconUpdater"); - connect(m_updater, SIGNAL( done(bool) ), - this, SLOT( slotDone(bool) ) ); + connect(m_updater, TQT_SIGNAL( done(bool) ), + this, TQT_SLOT( slotDone(bool) ) ); } if (curBk().url().protocol().startsWith("http")) { m_updater->downloadIcon(curBk()); diff --git a/konqueror/keditbookmarks/favicons.h b/konqueror/keditbookmarks/favicons.h index 81f7ed923..97894d741 100644 --- a/konqueror/keditbookmarks/favicons.h +++ b/konqueror/keditbookmarks/favicons.h @@ -34,13 +34,13 @@ public: static FavIconsItrHolder* self() { if (!s_self) { s_self = new FavIconsItrHolder(); }; return s_self; } - void addAffectedBookmark( const QString & address ); + void addAffectedBookmark( const TQString & address ); protected: virtual void doItrListChanged(); private: FavIconsItrHolder(); static FavIconsItrHolder *s_self; - QString m_affectedBookmark; + TQString m_affectedBookmark; }; class FavIconUpdater; @@ -50,7 +50,7 @@ class FavIconsItr : public BookmarkIterator Q_OBJECT public: - FavIconsItr(QValueList bks); + FavIconsItr(TQValueList bks); ~FavIconsItr(); virtual FavIconsItrHolder* holder() const { return FavIconsItrHolder::self(); } diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp index 6b59f04cd..4df0d237d 100644 --- a/konqueror/keditbookmarks/importers.cpp +++ b/konqueror/keditbookmarks/importers.cpp @@ -25,7 +25,7 @@ #include "toplevel.h" #include "listview.h" -#include +#include #include #include @@ -40,15 +40,15 @@ #include #include -QString ImportCommand::name() const { +TQString ImportCommand::name() const { return i18n("Import %1 Bookmarks").arg(visibleName()); } -QString ImportCommand::folder() const { - return m_folder ? i18n("%1 Bookmarks").arg(visibleName()) : QString::null; +TQString ImportCommand::folder() const { + return m_folder ? i18n("%1 Bookmarks").arg(visibleName()) : TQString::null; } -ImportCommand* ImportCommand::importerFactory(const QCString &type) { +ImportCommand* ImportCommand::importerFactory(const TQCString &type) { if (type == "Galeon") return new GaleonImportCommand(); else if (type == "IE") return new IEImportCommand(); else if (type == "KDE2") return new KDE2ImportCommand(); @@ -62,10 +62,10 @@ ImportCommand* ImportCommand::importerFactory(const QCString &type) { } } -ImportCommand* ImportCommand::performImport(const QCString &type, QWidget *top) { +ImportCommand* ImportCommand::performImport(const TQCString &type, TQWidget *top) { ImportCommand *importer = ImportCommand::importerFactory(type); - QString mydirname = importer->requestFilename(); + TQString mydirname = importer->requestFilename(); if (mydirname.isEmpty()) { delete importer; return 0; @@ -136,9 +136,9 @@ void ImportCommand::unexecute() { } } -QString ImportCommand::affectedBookmarks() const +TQString ImportCommand::affectedBookmarks() const { - QString rootAdr = CurrentMgr::self()->mgr()->root().address(); + TQString rootAdr = CurrentMgr::self()->mgr()->root().address(); if(m_group == rootAdr) return m_group; else @@ -147,42 +147,42 @@ QString ImportCommand::affectedBookmarks() const /* -------------------------------------- */ -QString MozImportCommand::requestFilename() const { +TQString MozImportCommand::requestFilename() const { static KMozillaBookmarkImporterImpl importer; return importer.findDefaultLocation(); } -QString NSImportCommand::requestFilename() const { +TQString NSImportCommand::requestFilename() const { static KNSBookmarkImporterImpl importer; return importer.findDefaultLocation(); } -QString OperaImportCommand::requestFilename() const { +TQString OperaImportCommand::requestFilename() const { static KOperaBookmarkImporterImpl importer; return importer.findDefaultLocation(); } -QString CrashesImportCommand::requestFilename() const { +TQString CrashesImportCommand::requestFilename() const { static KCrashBookmarkImporterImpl importer; return importer.findDefaultLocation(); } -QString IEImportCommand::requestFilename() const { +TQString IEImportCommand::requestFilename() const { static KIEBookmarkImporterImpl importer; return importer.findDefaultLocation(); } // following two are really just xbel -QString GaleonImportCommand::requestFilename() const { +TQString GaleonImportCommand::requestFilename() const { return KFileDialog::getOpenFileName( - QDir::homeDirPath() + "/.galeon", + TQDir::homeDirPath() + "/.galeon", i18n("*.xbel|Galeon Bookmark Files (*.xbel)")); } #include "kstandarddirs.h" -QString KDE2ImportCommand::requestFilename() const { +TQString KDE2ImportCommand::requestFilename() const { return KFileDialog::getOpenFileName( locateLocal("data", "konqueror"), i18n("*.xml|KDE Bookmark Files (*.xml)")); @@ -233,10 +233,10 @@ void XBELImportCommand::doExecute(const KBookmarkGroup &/*bkGroup*/) { // check if already open first??? KBookmarkManager *pManager = KBookmarkManager::managerForFile(m_fileName, false); - QDomDocument doc = CurrentMgr::self()->mgr()->internalDocument(); + TQDomDocument doc = CurrentMgr::self()->mgr()->internalDocument(); // get the xbel - QDomNode subDoc = pManager->internalDocument().namedItem("xbel").cloneNode(); + TQDomNode subDoc = pManager->internalDocument().namedItem("xbel").cloneNode(); if (subDoc.isProcessingInstruction()) subDoc = subDoc.nextSibling(); if (subDoc.isDocumentType()) @@ -249,42 +249,42 @@ void XBELImportCommand::doExecute(const KBookmarkGroup &/*bkGroup*/) { subDoc.toElement().setTagName("folder"); // clear attributes - QStringList tags; + TQStringList tags; for (uint i = 0; i < subDoc.attributes().count(); i++) tags << subDoc.attributes().item(i).toAttr().name(); - for (QStringList::Iterator it = tags.begin(); it != tags.end(); ++it) + for (TQStringList::Iterator it = tags.begin(); it != tags.end(); ++it) subDoc.attributes().removeNamedItem((*it)); subDoc.toElement().setAttribute("icon", m_icon); // give the folder a name - QDomElement textElem = doc.createElement("title"); + TQDomElement textElem = doc.createElement("title"); subDoc.insertBefore(textElem, subDoc.firstChild()); textElem.appendChild(doc.createTextNode(folder())); } // import and add it - QDomNode node = doc.importNode(subDoc, true); + TQDomNode node = doc.importNode(subDoc, true); if (!folder().isEmpty()) { CurrentMgr::self()->mgr()->root().internalElement().appendChild(node); m_group = KBookmarkGroup(node.toElement()).address(); } else { - QDomElement root = CurrentMgr::self()->mgr()->root().internalElement(); + TQDomElement root = CurrentMgr::self()->mgr()->root().internalElement(); - QValueList childList; + TQValueList childList; - QDomNode n = subDoc.firstChild().toElement(); + TQDomNode n = subDoc.firstChild().toElement(); while (!n.isNull()) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if (!e.isNull()) childList.append(e); n = n.nextSibling(); } - QValueList::Iterator it = childList.begin(); - QValueList::Iterator end = childList.end(); + TQValueList::Iterator it = childList.begin(); + TQValueList::Iterator end = childList.end(); for (; it!= end ; ++it) root.appendChild((*it)); } diff --git a/konqueror/keditbookmarks/importers.h b/konqueror/keditbookmarks/importers.h index 929bf249a..ef23f5527 100644 --- a/konqueror/keditbookmarks/importers.h +++ b/konqueror/keditbookmarks/importers.h @@ -29,11 +29,11 @@ #include #include -#include -#include +#include +#include // part pure -class ImportCommand : public QObject, public KCommand, public IKEBCommand +class ImportCommand : public TQObject, public KCommand, public IKEBCommand { Q_OBJECT public: @@ -41,24 +41,24 @@ public: : KCommand(), m_utf8(false), m_folder(false), m_cleanUpCmd(0L) { ; } - virtual void import(const QString &fileName, bool folder) = 0; + virtual void import(const TQString &fileName, bool folder) = 0; - virtual QString name() const; - virtual QString visibleName() const { return m_visibleName; } - virtual QString requestFilename() const = 0; + virtual TQString name() const; + virtual TQString visibleName() const { return m_visibleName; } + virtual TQString requestFilename() const = 0; - static ImportCommand* performImport(const QCString &, QWidget *); - static ImportCommand* importerFactory(const QCString &); + static ImportCommand* performImport(const TQCString &, TQWidget *); + static ImportCommand* importerFactory(const TQCString &); virtual ~ImportCommand() { ; } virtual void execute(); virtual void unexecute(); - virtual QString affectedBookmarks() const; + virtual TQString affectedBookmarks() const; - QString groupAddress() const { return m_group; } - QString folder() const; + TQString groupAddress() const { return m_group; } + TQString folder() const; protected: /** @@ -67,7 +67,7 @@ protected: * @param icon icon for the new folder, if @p folder isn't empty * @param utf8 true if the HTML is in utf-8 encoding */ - void init(const QString &fileName, bool folder, const QString &icon, bool utf8) + void init(const TQString &fileName, bool folder, const TQString &icon, bool utf8) { m_fileName = fileName; m_folder = folder; @@ -79,10 +79,10 @@ protected: virtual void doExecute(const KBookmarkGroup &) = 0; protected: - QString m_visibleName; - QString m_fileName; - QString m_icon; - QString m_group; + TQString m_visibleName; + TQString m_fileName; + TQString m_icon; + TQString m_group; bool m_utf8; private: @@ -95,8 +95,8 @@ class XBELImportCommand : public ImportCommand { public: XBELImportCommand() : ImportCommand() { ; } - virtual void import(const QString &fileName, bool folder) = 0; - virtual QString requestFilename() const = 0; + virtual void import(const TQString &fileName, bool folder) = 0; + virtual TQString requestFilename() const = 0; private: virtual void doCreateHoldingFolder(KBookmarkGroup &bkGroup); virtual void doExecute(const KBookmarkGroup &); @@ -106,20 +106,20 @@ class GaleonImportCommand : public XBELImportCommand { public: GaleonImportCommand() : XBELImportCommand() { m_visibleName = i18n("Galeon"); } - virtual void import(const QString &fileName, bool folder) { + virtual void import(const TQString &fileName, bool folder) { init(fileName, folder, "", false); } - virtual QString requestFilename() const; + virtual TQString requestFilename() const; }; class KDE2ImportCommand : public XBELImportCommand { public: KDE2ImportCommand() : XBELImportCommand() { m_visibleName = i18n("KDE"); } - virtual void import(const QString &fileName, bool folder) { + virtual void import(const TQString &fileName, bool folder) { init(fileName, folder, "", false); } - virtual QString requestFilename() const; + virtual TQString requestFilename() const; }; // part pure @@ -127,8 +127,8 @@ class HTMLImportCommand : public ImportCommand { public: HTMLImportCommand() : ImportCommand() { ; } - virtual void import(const QString &fileName, bool folder) = 0; - virtual QString requestFilename() const = 0; + virtual void import(const TQString &fileName, bool folder) = 0; + virtual TQString requestFilename() const = 0; private: virtual void doExecute(const KBookmarkGroup &); }; @@ -137,30 +137,30 @@ class NSImportCommand : public HTMLImportCommand { public: NSImportCommand() : HTMLImportCommand() { m_visibleName = i18n("Netscape"); } - virtual void import(const QString &fileName, bool folder) { + virtual void import(const TQString &fileName, bool folder) { init(fileName, folder, "netscape", false); } - virtual QString requestFilename() const; + virtual TQString requestFilename() const; }; class MozImportCommand : public HTMLImportCommand { public: MozImportCommand() : HTMLImportCommand() { m_visibleName = i18n("Mozilla"); } - virtual void import(const QString &fileName, bool folder) { + virtual void import(const TQString &fileName, bool folder) { init(fileName, folder, "mozilla", true); } - virtual QString requestFilename() const; + virtual TQString requestFilename() const; }; class IEImportCommand : public ImportCommand { public: IEImportCommand() : ImportCommand() { m_visibleName = i18n("IE"); } - virtual void import(const QString &fileName, bool folder) { + virtual void import(const TQString &fileName, bool folder) { init(fileName, folder, "", false); } - virtual QString requestFilename() const; + virtual TQString requestFilename() const; private: virtual void doExecute(const KBookmarkGroup &); }; @@ -169,10 +169,10 @@ class OperaImportCommand : public ImportCommand { public: OperaImportCommand() : ImportCommand() { m_visibleName = i18n("Opera"); } - virtual void import(const QString &fileName, bool folder) { + virtual void import(const TQString &fileName, bool folder) { init(fileName, folder, "opera", false); } - virtual QString requestFilename() const; + virtual TQString requestFilename() const; private: virtual void doExecute(const KBookmarkGroup &); }; @@ -181,10 +181,10 @@ class CrashesImportCommand : public ImportCommand { public: CrashesImportCommand() : ImportCommand() { m_visibleName = i18n("Crashes"); } - virtual void import(const QString &fileName, bool folder) { + virtual void import(const TQString &fileName, bool folder) { init(fileName, folder, "core", false); } - virtual QString requestFilename() const; + virtual TQString requestFilename() const; private: virtual void doExecute(const KBookmarkGroup &); }; diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp index f1e4ad741..d34794fdc 100644 --- a/konqueror/keditbookmarks/kbookmarkmerger.cpp +++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp @@ -31,9 +31,9 @@ #include -#include -#include -#include +#include +#include +#include #include @@ -82,7 +82,7 @@ int main( int argc, char**argv ) } KBookmarkManager *konqBookmarks = KBookmarkManager::userBookmarksManager(); - QStringList mergedFiles; + TQStringList mergedFiles; { KBookmarkGroup root = konqBookmarks->root(); for ( KBookmark bm = root.first(); !bm.isNull(); bm = root.next( bm ) ) { @@ -90,7 +90,7 @@ int main( int argc, char**argv ) continue; } - QString mergedFrom = bm.metaDataItem( "merged_from" ); + TQString mergedFrom = bm.metaDataItem( "merged_from" ); if ( !mergedFrom.isNull() ) { mergedFiles << mergedFrom; } @@ -99,20 +99,20 @@ int main( int argc, char**argv ) bool didMergeBookmark = false; - QString extraBookmarksDirName = QFile::decodeName( args->arg( 0 ) ); - QDir extraBookmarksDir( extraBookmarksDirName, "*.xml" ); + TQString extraBookmarksDirName = TQFile::decodeName( args->arg( 0 ) ); + TQDir extraBookmarksDir( extraBookmarksDirName, "*.xml" ); if ( !extraBookmarksDir.isReadable() ) { kdError() << "Failed to read files in directory " << extraBookmarksDirName << endl; return 1; } for ( unsigned int i = 0; i < extraBookmarksDir.count(); ++i ) { - const QString fileName = extraBookmarksDir[ i ]; + const TQString fileName = extraBookmarksDir[ i ]; if ( mergedFiles.find( fileName ) != mergedFiles.end() ) { continue; } - const QString absPath = extraBookmarksDir.filePath( fileName ); + const TQString absPath = extraBookmarksDir.filePath( fileName ); KBookmarkManager *mgr = KBookmarkManager::managerForFile( absPath, false ); KBookmarkGroup root = mgr->root(); for ( KBookmark bm = root.first(); !bm.isNull(); bm = root.next( bm ) ) { diff --git a/konqueror/keditbookmarks/kebsearchline.cpp b/konqueror/keditbookmarks/kebsearchline.cpp index 5d0f07e59..973f737b5 100644 --- a/konqueror/keditbookmarks/kebsearchline.cpp +++ b/konqueror/keditbookmarks/kebsearchline.cpp @@ -19,19 +19,19 @@ #include "kebsearchline.h" #include "kebsearchline.moc" -KEBSearchLine::KEBSearchLine(QWidget *parent, KListView *listView, const char *name) +KEBSearchLine::KEBSearchLine(TQWidget *parent, KListView *listView, const char *name) : KListViewSearchLine(parent, listView, name) { mmode = AND; } -KEBSearchLine::KEBSearchLine(QWidget *parent, const char *name) +KEBSearchLine::KEBSearchLine(TQWidget *parent, const char *name) :KListViewSearchLine(parent, name) { mmode = AND; } -void KEBSearchLine::updateSearch(const QString &s) +void KEBSearchLine::updateSearch(const TQString &s) { KListViewSearchLine::updateSearch(s); emit searchUpdated(); @@ -41,19 +41,19 @@ KEBSearchLine::~KEBSearchLine() { } -bool KEBSearchLine::itemMatches(const QListViewItem *item, const QString &s) const +bool KEBSearchLine::itemMatches(const TQListViewItem *item, const TQString &s) const { if(mmode == EXACTLY) return KListViewSearchLine::itemMatches(item, s); if(lastpattern != s) { - splitted = QStringList::split(QChar(' '), s); + splitted = TQStringList::split(TQChar(' '), s); lastpattern = s; } - QStringList::const_iterator it = splitted.begin(); - QStringList::const_iterator end = splitted.end(); + TQStringList::const_iterator it = splitted.begin(); + TQStringList::const_iterator end = splitted.end(); if(mmode == OR) { diff --git a/konqueror/keditbookmarks/kebsearchline.h b/konqueror/keditbookmarks/kebsearchline.h index 43248177e..cfaee61c5 100644 --- a/konqueror/keditbookmarks/kebsearchline.h +++ b/konqueror/keditbookmarks/kebsearchline.h @@ -20,33 +20,33 @@ #define __kebsearchline_h #include -#include +#include class KEBSearchLine : public KListViewSearchLine { Q_OBJECT public: - KEBSearchLine(QWidget *parent = 0, KListView *listView = 0, const char *name = 0); + KEBSearchLine(TQWidget *parent = 0, KListView *listView = 0, const char *name = 0); - KEBSearchLine(QWidget *parent, const char *name); + KEBSearchLine(TQWidget *parent, const char *name); virtual ~KEBSearchLine(); enum modes { EXACTLY, AND, OR } mmode; modes mode(); void setMode(modes m); - virtual void updateSearch(const QString &s = QString::null); + virtual void updateSearch(const TQString &s = TQString::null); signals: void searchUpdated(); protected: - virtual bool itemMatches(const QListViewItem *item, const QString &s) const; + virtual bool itemMatches(const TQListViewItem *item, const TQString &s) const; private: - mutable QString lastpattern; // what was cached - mutable QStringList splitted; // cache of the splitted string + mutable TQString lastpattern; // what was cached + mutable TQStringList splitted; // cache of the splitted string }; #endif diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index 25f72afb2..1fa31e967 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/konqueror/keditbookmarks/listview.cpp @@ -29,10 +29,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include @@ -60,8 +60,8 @@ ListView* ListView::s_self = 0; int ListView::s_myrenamecolumn = -1; KEBListViewItem *ListView::s_myrenameitem = 0; -QStringList ListView::s_selected_addresses; -QString ListView::s_current_address; +TQStringList ListView::s_selected_addresses; +TQString ListView::s_current_address; ListView::ListView() : m_needToFixUp(false) @@ -72,10 +72,10 @@ ListView::~ListView() { self()->m_listView->saveColumnSetting(); } -void ListView::createListViews(QSplitter *splitter) { +void ListView::createListViews(TQSplitter *splitter) { s_self = new ListView(); self()->m_listView = new KEBListView(splitter, false); - splitter->setSizes(QValueList() << 100 << 300); + splitter->setSizes(TQValueList() << 100 << 300); } void ListView::initListViews() { @@ -90,12 +90,12 @@ void ListView::connectSignals() { m_listView->makeConnections(); } -bool lessAddress(QString a, QString b) +bool lessAddress(TQString a, TQString b) { if(a == b) return false; - QString error("ERROR"); + TQString error("ERROR"); if(a == error) return false; if(b == error) @@ -144,11 +144,11 @@ bool operator<(const KBookmark & first, const KBookmark & second) //FIXME Using -QValueList ListView::itemsToBookmarks(const QValueVector & items) const +TQValueList ListView::itemsToBookmarks(const TQValueVector & items) const { - QValueList bookmarks; //TODO optimize by using a QValueVector - QValueVector::const_iterator it = items.constBegin(); - QValueVector::const_iterator end = items.constEnd(); + TQValueList bookmarks; //TODO optimize by using a QValueVector + TQValueVector::const_iterator it = items.constBegin(); + TQValueVector::const_iterator end = items.constEnd(); for( ; it!=end; ++it) { if(*it != m_listView->rootItem() ) @@ -158,12 +158,12 @@ QValueList ListView::itemsToBookmarks(const QValueVectorisSelected()) { @@ -178,7 +178,7 @@ void ListView::invalidate(QListViewItem * item) m_needToFixUp = true; } - QListViewItem * child = item->firstChild(); + TQListViewItem * child = item->firstChild(); while(child) { //invalidate(child); @@ -186,17 +186,17 @@ void ListView::invalidate(QListViewItem * item) } } -void ListView::fixUpCurrent(const QString & address) +void ListView::fixUpCurrent(const TQString & address) { if(!m_needToFixUp) return; m_needToFixUp = false; - QListViewItem * item; + TQListViewItem * item; if(mSelectedItems.count() != 0) { - QString least = mSelectedItems.begin().key()->bookmark().address(); - QMap::iterator it, end; + TQString least = mSelectedItems.begin().key()->bookmark().address(); + TQMap::iterator it, end; end = mSelectedItems.end(); for(it = mSelectedItems.begin(); it != end; ++it) if( lessAddress(it.key()->bookmark().address(), least)) @@ -213,7 +213,7 @@ void ListView::fixUpCurrent(const QString & address) void ListView::selected(KEBListViewItem * item, bool s) { Q_ASSERT(item->bookmark().hasParent() || item == m_listView->rootItem()); - QMap::iterator it; + TQMap::iterator it; if(s) mSelectedItems[item] = item; @@ -223,7 +223,7 @@ void ListView::selected(KEBListViewItem * item, bool s) KEBApp::self()->updateActions(); - const QValueVector & selected = selectedItemsMap(); + const TQValueVector & selected = selectedItemsMap(); if (selected.count() != 1) { KEBApp::self()->bkInfo()->showBookmark(KBookmark()); @@ -231,8 +231,8 @@ void ListView::selected(KEBListViewItem * item, bool s) } //FIXME do it once somewhere if (!KEBApp::self()->bkInfo()->connected()) { - connect(KEBApp::self()->bkInfo(), SIGNAL( updateListViewItem() ), - SLOT( slotBkInfoUpdateListViewItem() )); + connect(KEBApp::self()->bkInfo(), TQT_SIGNAL( updateListViewItem() ), + TQT_SLOT( slotBkInfoUpdateListViewItem() )); KEBApp::self()->bkInfo()->setConnected(true); } @@ -240,10 +240,10 @@ void ListView::selected(KEBListViewItem * item, bool s) firstSelected()->modUpdate(); } -QValueVector ListView::selectedItemsMap() const +TQValueVector ListView::selectedItemsMap() const { - QValueVector selected; - QMap::ConstIterator it, end; + TQValueVector selected; + TQMap::ConstIterator it, end; end = mSelectedItems.constEnd(); for(it = mSelectedItems.constBegin(); it != end; ++it) { @@ -258,7 +258,7 @@ KEBListViewItem * ListView::firstSelected() const if(mSelectedItems.isEmpty()) return 0L; - QValueVector selected = selectedItemsMap(); + TQValueVector selected = selectedItemsMap(); if(selected.isEmpty()) return 0L; else @@ -282,11 +282,11 @@ void ListView::deselectAllChildren(KEBListViewItem *item) } } -QValueList ListView::selectedAddresses() +TQValueList ListView::selectedAddresses() { - QValueList addresses; - QValueList bookmarks = itemsToBookmarks( selectedItemsMap() ); - QValueList::const_iterator it, end; + TQValueList addresses; + TQValueList bookmarks = itemsToBookmarks( selectedItemsMap() ); + TQValueList::const_iterator it, end; end = bookmarks.end(); for( it = bookmarks.begin(); it != end; ++it) addresses.append( (*it).address() ); @@ -294,9 +294,9 @@ QValueList ListView::selectedAddresses() } -QValueList ListView::selectedBookmarksExpanded() const { - QValueList bookmarks; - for (QListViewItemIterator it(m_listView); it.current() != 0; ++it) { +TQValueList ListView::selectedBookmarksExpanded() const { + TQValueList bookmarks; + for (TQListViewItemIterator it(m_listView); it.current() != 0; ++it) { if (!it.current()->isSelected()) continue; if(it.current() == m_listView->firstChild()) // root case @@ -312,7 +312,7 @@ QValueList ListView::selectedBookmarksExpanded() const { } -void ListView::selectedBookmarksExpandedHelper(KEBListViewItem * item, QValueList & bookmarks) const +void ListView::selectedBookmarksExpandedHelper(KEBListViewItem * item, TQValueList & bookmarks) const { KEBListViewItem* child = static_cast(item->firstChild()); while( child ) @@ -328,9 +328,9 @@ void ListView::selectedBookmarksExpandedHelper(KEBListViewItem * item, QValueLis } } -QValueList ListView::allBookmarks() const { - QValueList bookmarks; - for (QListViewItemIterator it(m_listView); it.current() != 0; ++it) +TQValueList ListView::allBookmarks() const { + TQValueList bookmarks; + for (TQListViewItemIterator it(m_listView); it.current() != 0; ++it) { KEBListViewItem * item = static_cast(it.current()); if (!item->isEmptyFolderPadder() && (item->childCount() == 0)) @@ -341,7 +341,7 @@ QValueList ListView::allBookmarks() const { // DESIGN - make + "/0" a kbookmark:: thing? -QString ListView::userAddress() const +TQString ListView::userAddress() const { KBookmark current = firstSelected()->bookmark(); return (current.isGroup()) @@ -358,13 +358,13 @@ void ListView::setCurrent(KEBListViewItem *item, bool select) { } } -KEBListViewItem* ListView::getItemAtAddress(const QString &address) const { +KEBListViewItem* ListView::getItemAtAddress(const TQString &address) const { //FIXME uses internal represantation of bookmark address - QListViewItem *item = m_listView->rootItem(); + TQListViewItem *item = m_listView->rootItem(); - QStringList addresses = QStringList::split('/',address); // e.g /5/10/2 + TQStringList addresses = TQStringList::split('/',address); // e.g /5/10/2 - for (QStringList::Iterator it = addresses.begin(); it != addresses.end(); ++it) { + for (TQStringList::Iterator it = addresses.begin(); it != addresses.end(); ++it) { if (item = item->firstChild(), !item) return 0; for (unsigned int i = 0; i < (*it).toUInt(); ++i) @@ -375,7 +375,7 @@ KEBListViewItem* ListView::getItemAtAddress(const QString &address) const { } void ListView::setOpen(bool open) { - for (QListViewItemIterator it(m_listView); it.current() != 0; ++it) + for (TQListViewItemIterator it(m_listView); it.current() != 0; ++it) if (it.current()->parent()) it.current()->setOpen(open); } @@ -385,7 +385,7 @@ SelcAbilities ListView::getSelectionAbilities() const { if (mSelectedItems.count() > 0) { - QValueVector selected = selectedItemsMap(); + TQValueVector selected = selectedItemsMap(); if(!selected.isEmpty()) { //Optimize @@ -406,7 +406,7 @@ SelcAbilities ListView::getSelectionAbilities() const { return sa; } -void ListView::handleDropped(KEBListView *, QDropEvent *e, QListViewItem *newParent, QListViewItem *itemAfterQLVI) { +void ListView::handleDropped(KEBListView *, TQDropEvent *e, TQListViewItem *newParent, TQListViewItem *itemAfterQLVI) { bool inApp = (e->source() == m_listView->viewport()); // drop before root item @@ -415,7 +415,7 @@ void ListView::handleDropped(KEBListView *, QDropEvent *e, QListViewItem *newPar KEBListViewItem *itemAfter = static_cast(itemAfterQLVI); - QString newAddress + TQString newAddress = (!itemAfter || itemAfter->isEmptyFolderPadder()) ? (static_cast(newParent)->bookmark().address() + "/0") : (KBookmark::nextAddress(itemAfter->bookmark().address())); @@ -426,17 +426,17 @@ void ListView::handleDropped(KEBListView *, QDropEvent *e, QListViewItem *newPar mcmd = CmdGen::insertMimeSource(i18n("Drop Items"), e, newAddress); } else { - const QValueVector & selected = selectedItemsMap(); + const TQValueVector & selected = selectedItemsMap(); if (!(selected.count() > 0) || (*(selected.constBegin()) == itemAfterQLVI)) return; - bool copy = (e->action() == QDropEvent::Copy); + bool copy = (e->action() == TQDropEvent::Copy); mcmd = CmdGen::itemsMoved(selected, newAddress, copy); } CmdHistory::self()->didCommand(mcmd); } -void ListView::updateStatus(QString url) { +void ListView::updateStatus(TQString url) { m_listView->updateByURL(url); } @@ -447,7 +447,7 @@ void ListView::updateListView() //Save selected items (restored in fillWithGroup) s_selected_addresses.clear(); - QMap::const_iterator it, end; + TQMap::const_iterator it, end; it = mSelectedItems.begin(); end = mSelectedItems.end(); for ( ; it != end; ++it) @@ -461,7 +461,7 @@ void ListView::updateListView() s_current_address = item->bookmark().address(); } else - s_current_address = QString::null; + s_current_address = TQString::null; updateTree(); m_searchline->updateSearch(); @@ -482,7 +482,7 @@ void ListView::fillWithGroup(KEBListView *lv, KBookmarkGroup group, KEBListViewI lv->clear(); KEBListViewItem *tree = new KEBListViewItem(lv, group); fillWithGroup(lv, group, tree); - tree->QListViewItem::setOpen(true); + tree->TQListViewItem::setOpen(true); if (s_selected_addresses.contains(tree->bookmark().address())) lv->setSelected(tree, true); if(!s_current_address.isNull() && s_current_address == tree->bookmark().address()) @@ -498,7 +498,7 @@ void ListView::fillWithGroup(KEBListView *lv, KBookmarkGroup group, KEBListViewI : new KEBListViewItem(lv, lastItem, grp); fillWithGroup(lv, grp, item); if (grp.isOpen()) - item->QListViewItem::setOpen(true); + item->TQListViewItem::setOpen(true); if (grp.first().isNull()) new KEBListViewItem(item, item); // empty folder lastItem = item; @@ -542,27 +542,27 @@ void ListView::slotBkInfoUpdateListViewItem() { KBookmark bk = i->bookmark(); i->setText(KEBListView::NameColumn, bk.fullText()); i->setText(KEBListView::UrlColumn, bk.url().pathOrURL()); - QString commentStr = NodeEditCommand::getNodeText(bk, QStringList() << "desc"); + TQString commentStr = NodeEditCommand::getNodeText(bk, TQStringList() << "desc"); i->setText(KEBListView::CommentColumn, commentStr); } -void ListView::handleContextMenu(KEBListView *, KListView *, QListViewItem *qitem, const QPoint &p) { +void ListView::handleContextMenu(KEBListView *, KListView *, TQListViewItem *qitem, const TQPoint &p) { KEBListViewItem *item = static_cast(qitem); const char *type = ( !item || (item == m_listView->rootItem()) || (item->bookmark().isGroup()) || (item->isEmptyFolderPadder())) ? "popup_folder" : "popup_bookmark"; - QWidget* popup = KEBApp::self()->popupMenuFactory(type); + TQWidget* popup = KEBApp::self()->popupMenuFactory(type); if (popup) - static_cast(popup)->popup(p); + static_cast(popup)->popup(p); } -void ListView::handleDoubleClicked(KEBListView *lv, QListViewItem *item, const QPoint &, int column) { +void ListView::handleDoubleClicked(KEBListView *lv, TQListViewItem *item, const TQPoint &, int column) { lv->rename(item, column); } -void ListView::handleItemRenamed(KEBListView *lv, QListViewItem *item, const QString &newText, int column) { +void ListView::handleItemRenamed(KEBListView *lv, TQListViewItem *item, const TQString &newText, int column) { Q_ASSERT(item); KBookmark bk = static_cast(item)->bookmark(); KCommand *cmd = 0; @@ -634,20 +634,20 @@ void ListView::renameNextCell(bool fwd) { /* -------------------------------------- */ -class KeyPressEater : public QObject { +class KeyPressEater : public TQObject { public: - KeyPressEater( QWidget *parent = 0, const char *name = 0 ) - : QObject(parent, name) { + KeyPressEater( TQWidget *parent = 0, const char *name = 0 ) + : TQObject(parent, name) { m_allowedToTab = true; } protected: - bool eventFilter(QObject *, QEvent *); + bool eventFilter(TQObject *, TQEvent *); bool m_allowedToTab; }; -bool KeyPressEater::eventFilter(QObject *, QEvent *pe) { - if (pe->type() == QEvent::KeyPress) { - QKeyEvent *k = (QKeyEvent *) pe; +bool KeyPressEater::eventFilter(TQObject *, TQEvent *pe) { + if (pe->type() == TQEvent::KeyPress) { + TQKeyEvent *k = (TQKeyEvent *) pe; if ((k->key() == Qt::Key_Backtab || k->key() == Qt::Key_Tab) && !(k->state() & ControlButton || k->state() & AltButton) ) { @@ -718,21 +718,21 @@ void KEBListView::init() { setDragEnabled(true); setSelectionModeExt((!m_folderList) ? KListView::Extended: KListView::Single); setAllColumnsShowFocus(true); - connect(header(), SIGNAL(sizeChange(int, int, int)), - this, SLOT(slotColumnSizeChanged(int, int, int))); + connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), + this, TQT_SLOT(slotColumnSizeChanged(int, int, int))); } void KEBListView::makeConnections() { - connect(this, SIGNAL( moved() ), - SLOT( slotMoved() )); - connect(this, SIGNAL( contextMenu(KListView *, QListViewItem*, const QPoint &) ), - SLOT( slotContextMenu(KListView *, QListViewItem *, const QPoint &) )); - connect(this, SIGNAL( itemRenamed(QListViewItem *, const QString &, int) ), - SLOT( slotItemRenamed(QListViewItem *, const QString &, int) )); - connect(this, SIGNAL( doubleClicked(QListViewItem *, const QPoint &, int) ), - SLOT( slotDoubleClicked(QListViewItem *, const QPoint &, int) )); - connect(this, SIGNAL( dropped(QDropEvent*, QListViewItem*, QListViewItem*) ), - SLOT( slotDropped(QDropEvent*, QListViewItem*, QListViewItem*) )); + connect(this, TQT_SIGNAL( moved() ), + TQT_SLOT( slotMoved() )); + connect(this, TQT_SIGNAL( contextMenu(KListView *, TQListViewItem*, const TQPoint &) ), + TQT_SLOT( slotContextMenu(KListView *, TQListViewItem *, const TQPoint &) )); + connect(this, TQT_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ), + TQT_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) )); + connect(this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), + TQT_SLOT( slotDoubleClicked(TQListViewItem *, const TQPoint &, int) )); + connect(this, TQT_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), + TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) )); } void KEBListView::readonlyFlagInit(bool readonly) { @@ -744,16 +744,16 @@ void KEBListView::readonlyFlagInit(bool readonly) { void KEBListView::slotMoved() { ListView::self()->handleMoved(this); } -void KEBListView::slotContextMenu(KListView *a, QListViewItem *b, const QPoint &c) +void KEBListView::slotContextMenu(KListView *a, TQListViewItem *b, const TQPoint &c) { ListView::self()->handleContextMenu(this, a,b,c); } -void KEBListView::slotItemRenamed(QListViewItem *a, const QString &b, int c) +void KEBListView::slotItemRenamed(TQListViewItem *a, const TQString &b, int c) { ListView::self()->handleItemRenamed(this, a,b,c); } -void KEBListView::slotDoubleClicked(QListViewItem *a, const QPoint &b, int c) +void KEBListView::slotDoubleClicked(TQListViewItem *a, const TQPoint &b, int c) { ListView::self()->handleDoubleClicked(this, a,b,c); } -void KEBListView::slotDropped(QDropEvent *a, QListViewItem *b, QListViewItem *c) +void KEBListView::slotDropped(TQDropEvent *a, TQListViewItem *b, TQListViewItem *c) { ListView::self()->handleDropped(this, a,b,c); } -void KEBListView::rename(QListViewItem *qitem, int column) { +void KEBListView::rename(TQListViewItem *qitem, int column) { KEBListViewItem *item = static_cast(qitem); if ( !(column == NameColumn || column == UrlColumn || column == CommentColumn) || KEBApp::self()->readonly() @@ -776,8 +776,8 @@ KEBListViewItem* KEBListView::rootItem() const { } // Update display of bookmarks containing URL -void KEBListView::updateByURL(QString url) { - for (QListViewItemIterator it(this); it.current(); it++) { +void KEBListView::updateByURL(TQString url) { + for (TQListViewItemIterator it(this); it.current(); it++) { KEBListViewItem *p = static_cast(it.current()); if (p->text(1) == url) { p->modUpdate(); @@ -785,26 +785,26 @@ void KEBListView::updateByURL(QString url) { } } -bool KEBListView::acceptDrag(QDropEvent * e) const { +bool KEBListView::acceptDrag(TQDropEvent * e) const { return (e->source() == viewport() || KBookmarkDrag::canDecode(e)); } -QDragObject *KEBListView::dragObject() { - QValueList bookmarks = +TQDragObject *KEBListView::dragObject() { + TQValueList bookmarks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap()); KBookmarkDrag *drag = KBookmarkDrag::newDrag(bookmarks, viewport()); - const QString iconname = - (bookmarks.size() == 1) ? bookmarks.first().icon() : QString("bookmark"); + const TQString iconname = + (bookmarks.size() == 1) ? bookmarks.first().icon() : TQString("bookmark"); drag->setPixmap(SmallIcon(iconname)) ; return drag; } /* -------------------------------------- */ -bool KEBListViewItem::parentSelected(QListViewItem * item) +bool KEBListViewItem::parentSelected(TQListViewItem * item) { - QListViewItem *root = item->listView()->firstChild(); - for( QListViewItem *parent = item->parent(); parent ; parent = parent->parent()) + TQListViewItem *root = item->listView()->firstChild(); + for( TQListViewItem *parent = item->parent(); parent ; parent = parent->parent()) if (parent->isSelected() && parent != root) return true; return false; @@ -821,14 +821,14 @@ void KEBListViewItem::setSelected(bool s) if(listView()->firstChild() == this) { ListView::self()->selected(this, s); - QListViewItem::setSelected( s ); + TQListViewItem::setSelected( s ); return; } if(s == false) { ListView::self()->selected(this, false); - QListViewItem::setSelected( false ); + TQListViewItem::setSelected( false ); ListView::deselectAllChildren( this ); //repaints } else if(parentSelected(this)) @@ -836,7 +836,7 @@ void KEBListViewItem::setSelected(bool s) else { ListView::self()->selected(this, true); - QListViewItem::setSelected( true ); + TQListViewItem::setSelected( true ); ListView::deselectAllChildren(this); } } @@ -847,7 +847,7 @@ void KEBListViewItem::normalConstruct(const KBookmark &bk) { #endif setText(KEBListView::CommentColumn, NodeEditCommand::getNodeText(bk, "desc")); bool shown = CmdGen::shownInToolbar(bk); - setPixmap(0, SmallIcon(shown ? QString("bookmark_toolbar") : bk.icon())); + setPixmap(0, SmallIcon(shown ? TQString("bookmark_toolbar") : bk.icon())); // DESIGN - modUpdate badly needs a redesign modUpdate(); } @@ -855,8 +855,8 @@ void KEBListViewItem::normalConstruct(const KBookmark &bk) { // DESIGN - following constructors should be names classes or else just explicit // toplevel item (there should be only one!) -KEBListViewItem::KEBListViewItem(QListView *parent, const KBookmarkGroup &gp) - : QListViewItem(parent, KEBApp::self()->caption().isNull() +KEBListViewItem::KEBListViewItem(TQListView *parent, const KBookmarkGroup &gp) + : TQListViewItem(parent, KEBApp::self()->caption().isNull() ? i18n("Bookmarks") : i18n("%1 Bookmarks").arg(KEBApp::self()->caption())), m_bookmark(gp), m_emptyFolderPadder(false) { @@ -866,39 +866,39 @@ KEBListViewItem::KEBListViewItem(QListView *parent, const KBookmarkGroup &gp) } // empty folder item -KEBListViewItem::KEBListViewItem(KEBListViewItem *parent, QListViewItem *after) - : QListViewItem(parent, after, i18n("Empty Folder") ), m_emptyFolderPadder(true) { +KEBListViewItem::KEBListViewItem(KEBListViewItem *parent, TQListViewItem *after) + : TQListViewItem(parent, after, i18n("Empty Folder") ), m_emptyFolderPadder(true) { setPixmap(0, SmallIcon("bookmark")); } // group -KEBListViewItem::KEBListViewItem(KEBListViewItem *parent, QListViewItem *after, const KBookmarkGroup &gp) - : QListViewItem(parent, after, gp.fullText()), m_bookmark(gp), m_emptyFolderPadder(false) { +KEBListViewItem::KEBListViewItem(KEBListViewItem *parent, TQListViewItem *after, const KBookmarkGroup &gp) + : TQListViewItem(parent, after, gp.fullText()), m_bookmark(gp), m_emptyFolderPadder(false) { setExpandable(true); normalConstruct(gp); } // bookmark (first of its group) KEBListViewItem::KEBListViewItem(KEBListViewItem *parent, const KBookmark & bk) - : QListViewItem(parent, bk.fullText(), bk.url().pathOrURL()), m_bookmark(bk), m_emptyFolderPadder(false) { + : TQListViewItem(parent, bk.fullText(), bk.url().pathOrURL()), m_bookmark(bk), m_emptyFolderPadder(false) { normalConstruct(bk); } // bookmark (after another) -KEBListViewItem::KEBListViewItem(KEBListViewItem *parent, QListViewItem *after, const KBookmark &bk) - : QListViewItem(parent, after, bk.fullText(), bk.url().pathOrURL()), m_bookmark(bk), m_emptyFolderPadder(false) { +KEBListViewItem::KEBListViewItem(KEBListViewItem *parent, TQListViewItem *after, const KBookmark &bk) + : TQListViewItem(parent, after, bk.fullText(), bk.url().pathOrURL()), m_bookmark(bk), m_emptyFolderPadder(false) { normalConstruct(bk); } // root bookmark (first of its group) -KEBListViewItem::KEBListViewItem(QListView *parent, const KBookmark & bk) - : QListViewItem(parent, bk.fullText(), bk.url().pathOrURL()), m_bookmark(bk), m_emptyFolderPadder(false) { +KEBListViewItem::KEBListViewItem(TQListView *parent, const KBookmark & bk) + : TQListViewItem(parent, bk.fullText(), bk.url().pathOrURL()), m_bookmark(bk), m_emptyFolderPadder(false) { normalConstruct(bk); } // root bookmark (after another) -KEBListViewItem::KEBListViewItem(QListView *parent, QListViewItem *after, const KBookmark &bk) - : QListViewItem(parent, after, bk.fullText(), bk.url().pathOrURL()), m_bookmark(bk), m_emptyFolderPadder(false) { +KEBListViewItem::KEBListViewItem(TQListView *parent, TQListViewItem *after, const KBookmark &bk) + : TQListViewItem(parent, after, bk.fullText(), bk.url().pathOrURL()), m_bookmark(bk), m_emptyFolderPadder(false) { normalConstruct(bk); } @@ -907,24 +907,24 @@ void KEBListViewItem::setOpen(bool open) { if (!parent()) return; m_bookmark.internalElement().setAttribute("folded", open ? "no" : "yes"); - QListViewItem::setOpen(open); + TQListViewItem::setOpen(open); } -void KEBListViewItem::greyStyle(QColorGroup &cg) { +void KEBListViewItem::greyStyle(TQColorGroup &cg) { int h, s, v; cg.background().hsv(&h, &s, &v); - QColor color = (v > 180 && v < 220) ? (Qt::darkGray) : (Qt::gray); - cg.setColor(QColorGroup::Text, color); + TQColor color = (v > 180 && v < 220) ? (Qt::darkGray) : (Qt::gray); + cg.setColor(TQColorGroup::Text, color); } -void KEBListViewItem::boldStyle(QPainter *p) { - QFont font = p->font(); +void KEBListViewItem::boldStyle(TQPainter *p) { + TQFont font = p->font(); font.setBold(true); p->setFont(font); } -void KEBListViewItem::paintCell(QPainter *p, const QColorGroup &ocg, int col, int w, int a) { - QColorGroup cg(ocg); +void KEBListViewItem::paintCell(TQPainter *p, const TQColorGroup &ocg, int col, int w, int a) { + TQColorGroup cg(ocg); if (parentSelected(this)) { int base_h, base_s, base_v; cg.background().hsv(&base_h, &base_s, &base_v); @@ -932,11 +932,11 @@ void KEBListViewItem::paintCell(QPainter *p, const QColorGroup &ocg, int col, in int hilite_h, hilite_s, hilite_v; cg.highlight().hsv(&hilite_h, &hilite_s, &hilite_v); - QColor col(hilite_h, + TQColor col(hilite_h, (hilite_s + base_s + base_s ) / 3, (hilite_v + base_v + base_v ) / 3, - QColor::Hsv); - cg.setColor(QColorGroup::Base, col); + TQColor::Hsv); + cg.setColor(TQColorGroup::Base, col); } if (col == KEBListView::StatusColumn) { @@ -962,7 +962,7 @@ void KEBListViewItem::paintCell(QPainter *p, const QColorGroup &ocg, int col, in } } - QListViewItem::paintCell(p, cg, col, w,a); + TQListViewItem::paintCell(p, cg, col, w,a); } #include "listview.moc" diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h index 7741f5858..e2938de80 100644 --- a/konqueror/keditbookmarks/listview.h +++ b/konqueror/keditbookmarks/listview.h @@ -22,9 +22,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include @@ -39,24 +39,24 @@ class KListViewSearchLine; class KEBListViewItem : public QListViewItem { public: - KEBListViewItem(QListView *, const KBookmarkGroup &); - KEBListViewItem(KEBListViewItem *, QListViewItem *); - KEBListViewItem(KEBListViewItem *, QListViewItem *, const KBookmarkGroup &); + KEBListViewItem(TQListView *, const KBookmarkGroup &); + KEBListViewItem(KEBListViewItem *, TQListViewItem *); + KEBListViewItem(KEBListViewItem *, TQListViewItem *, const KBookmarkGroup &); KEBListViewItem(KEBListViewItem *, const KBookmark &); - KEBListViewItem(KEBListViewItem *, QListViewItem *, const KBookmark &); + KEBListViewItem(KEBListViewItem *, TQListViewItem *, const KBookmark &); - KEBListViewItem(QListView *, const KBookmark &); - KEBListViewItem(QListView *, QListViewItem *, const KBookmark &); + KEBListViewItem(TQListView *, const KBookmark &); + KEBListViewItem(TQListView *, TQListViewItem *, const KBookmark &); - void nsPut(const QString &nm); + void nsPut(const TQString &nm); void modUpdate(); - void setOldStatus(const QString &); - void setTmpStatus(const QString &); + void setOldStatus(const TQString &); + void setTmpStatus(const TQString &); void restoreStatus(); - void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); void setSelected ( bool s ); virtual void setOpen(bool); @@ -66,18 +66,18 @@ public: typedef enum { GreyStyle, BoldStyle, GreyBoldStyle, DefaultStyle } PaintStyle; - static bool parentSelected(QListViewItem * item); + static bool parentSelected(TQListViewItem * item); private: - const QString nsGet() const; + const TQString nsGet() const; void normalConstruct(const KBookmark &); KBookmark m_bookmark; PaintStyle m_paintStyle; bool m_emptyFolderPadder; - QString m_oldStatus; - void greyStyle(QColorGroup &); - void boldStyle(QPainter *); + TQString m_oldStatus; + void greyStyle(TQColorGroup &); + void boldStyle(TQPainter *); }; class KEBListView : public KListView @@ -91,7 +91,7 @@ public: StatusColumn = 3, AddressColumn = 4 }; - KEBListView(QWidget *parent, bool folderList) + KEBListView(TQWidget *parent, bool folderList) : KListView(parent), m_folderList(folderList) {} virtual ~KEBListView() {} @@ -102,24 +102,24 @@ public: void loadColumnSetting(); void saveColumnSetting(); - void updateByURL(QString url); + void updateByURL(TQString url); bool isFolderList() const { return m_folderList; } KEBListViewItem* rootItem() const; public slots: - virtual void rename(QListViewItem *item, int c); + virtual void rename(TQListViewItem *item, int c); void slotMoved(); - void slotContextMenu(KListView *, QListViewItem *, const QPoint &); - void slotItemRenamed(QListViewItem *, const QString &, int); - void slotDoubleClicked(QListViewItem *, const QPoint &, int); - void slotDropped(QDropEvent*, QListViewItem*, QListViewItem*); + void slotContextMenu(KListView *, TQListViewItem *, const TQPoint &); + void slotItemRenamed(TQListViewItem *, const TQString &, int); + void slotDoubleClicked(TQListViewItem *, const TQPoint &, int); + void slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*); void slotColumnSizeChanged(int, int, int); protected: - virtual bool acceptDrag(QDropEvent *e) const; - virtual QDragObject* dragObject(); + virtual bool acceptDrag(TQDropEvent *e) const; + virtual TQDragObject* dragObject(); private: bool m_folderList; @@ -140,25 +140,25 @@ public: // selected item stuff void selected(KEBListViewItem * item, bool s); - void invalidate(const QString & address); - void invalidate(QListViewItem * item); - void fixUpCurrent(const QString & address); + void invalidate(const TQString & address); + void invalidate(TQListViewItem * item); + void fixUpCurrent(const TQString & address); KEBListViewItem * firstSelected() const; - QValueVector selectedItemsMap() const; + TQValueVector selectedItemsMap() const; - QValueList selectedAddresses(); + TQValueList selectedAddresses(); // bookmark helpers - QValueList itemsToBookmarks(const QValueVector & items) const; + TQValueList itemsToBookmarks(const TQValueVector & items) const; // bookmark stuff - QValueList allBookmarks() const; - QValueList selectedBookmarksExpanded() const; + TQValueList allBookmarks() const; + TQValueList selectedBookmarksExpanded() const; // address stuff - KEBListViewItem* getItemAtAddress(const QString &address) const; - QString userAddress() const; + KEBListViewItem* getItemAtAddress(const TQString &address) const; + TQString userAddress() const; // gui stuff - DESIGN - all of it??? SelcAbilities getSelectionAbilities() const; @@ -168,20 +168,20 @@ public: void setCurrent(KEBListViewItem *item, bool select); void renameNextCell(bool dir); - QWidget *widget() const { return m_listView; } + TQWidget *widget() const { return m_listView; } void rename(int); void clearSelection(); - void updateStatus(QString url); + void updateStatus(TQString url); static ListView* self() { return s_self; } - static void createListViews(QSplitter *parent); + static void createListViews(TQSplitter *parent); void handleMoved(KEBListView *); - void handleDropped(KEBListView *, QDropEvent *, QListViewItem *, QListViewItem *); - void handleContextMenu(KEBListView *, KListView *, QListViewItem *, const QPoint &); - void handleDoubleClicked(KEBListView *, QListViewItem *, const QPoint &, int); - void handleItemRenamed(KEBListView *, QListViewItem *, const QString &, int); + void handleDropped(KEBListView *, TQDropEvent *, TQListViewItem *, TQListViewItem *); + void handleContextMenu(KEBListView *, KListView *, TQListViewItem *, const TQPoint &); + void handleDoubleClicked(KEBListView *, TQListViewItem *, const TQPoint &, int); + void handleItemRenamed(KEBListView *, TQListViewItem *, const TQString &, int); static void startRename(int column, KEBListViewItem *item); @@ -194,7 +194,7 @@ public slots: private: void updateTree(); - void selectedBookmarksExpandedHelper(KEBListViewItem * item, QValueList & bookmarks) const; + void selectedBookmarksExpandedHelper(KEBListViewItem * item, TQValueList & bookmarks) const; void fillWithGroup(KEBListView *, KBookmarkGroup, KEBListViewItem * = 0); ListView(); @@ -203,15 +203,15 @@ private: KListViewSearchLine * m_searchline; // Actually this is a std:set, the bool is ignored - QMap mSelectedItems; + TQMap mSelectedItems; bool m_needToFixUp; // statics static ListView *s_self; static int s_myrenamecolumn; static KEBListViewItem *s_myrenameitem; - static QStringList s_selected_addresses; - static QString s_current_address; + static TQStringList s_selected_addresses; + static TQString s_current_address; }; #endif diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index 755a6f703..3416e7e0d 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -59,13 +59,13 @@ static KCmdLineOptions options[] = { KCmdLineLastOption }; -static void continueInWindow(QString _wname) { - QCString wname = _wname.latin1(); +static void continueInWindow(TQString _wname) { + TQCString wname = _wname.latin1(); int id = -1; QCStringList apps = kapp->dcopClient()->registeredApplications(); for (QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it) { - QCString &clientId = *it; + TQCString &clientId = *it; if (qstrncmp(clientId, wname, wname.length()) != 0) continue; @@ -83,8 +83,8 @@ static void continueInWindow(QString _wname) { } // TODO - make this register() or something like that and move dialog into main -static int askUser(KApplication &app, QString filename, bool &readonly) { - QCString requestedName("keditbookmarks"); +static int askUser(KApplication &app, TQString filename, bool &readonly) { + TQCString requestedName("keditbookmarks"); if (!filename.isEmpty()) requestedName += "-" + filename.utf8(); @@ -138,9 +138,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { bool gotArg = (args->count() == 1); - QString filename = gotArg - ? QString::fromLatin1(args->arg(0)) - : locateLocal("data", QString::fromLatin1("konqueror/bookmarks.xml")); + TQString filename = gotArg + ? TQString::fromLatin1(args->arg(0)) + : locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml")); if (!isGui) { CurrentMgr::self()->createManager(filename); @@ -161,12 +161,12 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { // TODO - maybe an xbel export??? if (got > 1) // got == 0 isn't possible as !isGui is dependant on "export.*" KCmdLineArgs::usage(I18N_NOOP("You may only specify a single --export option.")); - QString path = QString::fromLocal8Bit(args->getOption(arg2)); + TQString path = TQString::fromLocal8Bit(args->getOption(arg2)); CurrentMgr::self()->doExport(exportType, path); } else if (importType) { if (got > 1) // got == 0 isn't possible as !isGui is dependant on "import.*" KCmdLineArgs::usage(I18N_NOOP("You may only specify a single --import option.")); - QString path = QString::fromLocal8Bit(args->getOption(arg2)); + TQString path = TQString::fromLocal8Bit(args->getOption(arg2)); ImportCommand *importer = ImportCommand::importerFactory(importType); importer->import(path, true); importer->execute(); @@ -176,19 +176,19 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { return 0; // error flag on exit?, 1? } - QString address = args->isSet("address") - ? QString::fromLocal8Bit(args->getOption("address")) - : QString("/0"); + TQString address = args->isSet("address") + ? TQString::fromLocal8Bit(args->getOption("address")) + : TQString("/0"); - QString caption = args->isSet("customcaption") - ? QString::fromLocal8Bit(args->getOption("customcaption")) - : QString::null; + TQString caption = args->isSet("customcaption") + ? TQString::fromLocal8Bit(args->getOption("customcaption")) + : TQString::null; args->clear(); bool readonly = false; // passed by ref - if (askUser(app, (gotArg ? filename : QString::null), readonly)) { + if (askUser(app, (gotArg ? filename : TQString::null), readonly)) { KEBApp *toplevel = new KEBApp(filename, readonly, address, browser, caption); toplevel->show(); app.setMainWidget(toplevel); diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp index 84919ef27..0d7d0ddf8 100644 --- a/konqueror/keditbookmarks/testlink.cpp +++ b/konqueror/keditbookmarks/testlink.cpp @@ -25,8 +25,8 @@ #include "commands.h" #include "bookmarkiterator.h" -#include -#include +#include +#include #include @@ -49,11 +49,11 @@ void TestLinkItrHolder::doItrListChanged() { { kdDebug()<<"Notifing managers "<notifyManagers(CurrentMgr::bookmarkAt(m_affectedBookmark).toGroup()); - m_affectedBookmark = QString::null; + m_affectedBookmark = TQString::null; } } -void TestLinkItrHolder::addAffectedBookmark( const QString & address ) +void TestLinkItrHolder::addAffectedBookmark( const TQString & address ) { kdDebug()<<"addAffectedBookmark "< bks) +TestLinkItr::TestLinkItr(TQValueList bks) : BookmarkIterator(bks) { m_job = 0; } @@ -88,28 +88,28 @@ void TestLinkItr::doAction() { m_job = KIO::get(curBk().url(), true, false); m_job->addMetaData("errorPage", "true"); - m_job->addMetaData( QString("cookies"), QString("none") ); + m_job->addMetaData( TQString("cookies"), TQString("none") ); - connect(m_job, SIGNAL( result( KIO::Job *)), - this, SLOT( slotJobResult(KIO::Job *))); - connect(m_job, SIGNAL( data( KIO::Job *, const QByteArray &)), - this, SLOT( slotJobData(KIO::Job *, const QByteArray &))); + connect(m_job, TQT_SIGNAL( result( KIO::Job *)), + this, TQT_SLOT( slotJobResult(KIO::Job *))); + connect(m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &)), + this, TQT_SLOT( slotJobData(KIO::Job *, const TQByteArray &))); curItem()->setTmpStatus(i18n("Checking...")); - QString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url()); + TQString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url()); curItem()->setOldStatus(oldModDate); TestLinkItrHolder::self()->setMod(curBk().url().url(), i18n("Checking...")); } -void TestLinkItr::slotJobData(KIO::Job *job, const QByteArray &data) { +void TestLinkItr::slotJobData(KIO::Job *job, const TQByteArray &data) { KIO::TransferJob *transfer = (KIO::TransferJob *)job; if (transfer->isErrorPage()) { - QStringList lines = QStringList::split('\n', data); - for (QStringList::Iterator it = lines.begin(); it != lines.end(); ++it) { + TQStringList lines = TQStringList::split('\n', data); + for (TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) { int open_pos = (*it).find("", 0, false); if (open_pos >= 0) { - QString leftover = (*it).mid(open_pos + 7); + TQString leftover = (*it).mid(open_pos + 7); int close_pos = leftover.findRev("", -1, false); if (close_pos >= 0) { // if no end tag found then just @@ -123,9 +123,9 @@ void TestLinkItr::slotJobData(KIO::Job *job, const QByteArray &data) { } } else { - QString modDate = transfer->queryMetaData("modified"); + TQString modDate = transfer->queryMetaData("modified"); if (!modDate.isEmpty()) { - curItem()->nsPut(QString::number(KRFCDate::parseDate(modDate))); + curItem()->nsPut(TQString::number(KRFCDate::parseDate(modDate))); } } @@ -137,12 +137,12 @@ void TestLinkItr::slotJobResult(KIO::Job *job) { if ( !curItem() ) return; KIO::TransferJob *transfer = (KIO::TransferJob *)job; - QString modDate = transfer->queryMetaData("modified"); + TQString modDate = transfer->queryMetaData("modified"); bool chkErr = true; if (transfer->error()) { // can we assume that errorString will contain no entities? - QString jerr = job->errorString(); + TQString jerr = job->errorString(); if (!jerr.isEmpty()) { jerr.replace("\n", " "); curItem()->nsPut(jerr); @@ -152,9 +152,9 @@ void TestLinkItr::slotJobResult(KIO::Job *job) { if (chkErr) { if (!modDate.isEmpty()) { - curItem()->nsPut(QString::number(KRFCDate::parseDate(modDate))); + curItem()->nsPut(TQString::number(KRFCDate::parseDate(modDate))); } else if (!m_errSet) { - curItem()->nsPut(QString::number(KRFCDate::parseDate("0"))); + curItem()->nsPut(TQString::number(KRFCDate::parseDate("0"))); } } @@ -165,27 +165,27 @@ void TestLinkItr::slotJobResult(KIO::Job *job) { /* -------------------------- */ -const QString TestLinkItrHolder::getMod(const QString &url) const { +const TQString TestLinkItrHolder::getMod(const TQString &url) const { return m_modify.contains(url) ? m_modify[url] - : QString::null; + : TQString::null; } -const QString TestLinkItrHolder::getOldVisit(const QString &url) const { +const TQString TestLinkItrHolder::getOldVisit(const TQString &url) const { return self()->m_oldModify.contains(url) ? self()->m_oldModify[url] - : QString::null; + : TQString::null; } -void TestLinkItrHolder::setMod(const QString &url, const QString &val) { +void TestLinkItrHolder::setMod(const TQString &url, const TQString &val) { m_modify[url] = val; } -void TestLinkItrHolder::setOldVisit(const QString &url, const QString &val) { +void TestLinkItrHolder::setOldVisit(const TQString &url, const TQString &val) { m_oldModify[url] = val; } -void TestLinkItrHolder::resetToValue(const QString &url, const QString &oldValue) { +void TestLinkItrHolder::resetToValue(const TQString &url, const TQString &oldValue) { if (!oldValue.isEmpty()) { m_modify[url] = oldValue; } else { @@ -195,11 +195,11 @@ void TestLinkItrHolder::resetToValue(const QString &url, const QString &oldValue /* -------------------------- */ -QString TestLinkItrHolder::calcPaintStyle(const QString &url, KEBListViewItem::PaintStyle &_style, - const QString &nVisit, const QString &Modify) { +TQString TestLinkItrHolder::calcPaintStyle(const TQString &url, KEBListViewItem::PaintStyle &_style, + const TQString &nVisit, const TQString &Modify) { bool newModValid = false; int newMod = 0; - QString newModStr; + TQString newModStr; bool initial = false; bool oldError = false; @@ -224,7 +224,7 @@ QString TestLinkItrHolder::calcPaintStyle(const QString &url, KEBListViewItem::P // kdDebug() << "TestLink " << url << " " << "booktime=" << nVisit << " urltime=" << newModStr << // " Modify=" << Modify << " init=" << initial << " newMod=" << newMod << "\n"; - QString visitStr; + TQString visitStr; if (self()->getOldVisit(url).isNull()) { // first time @@ -233,7 +233,7 @@ QString TestLinkItrHolder::calcPaintStyle(const QString &url, KEBListViewItem::P self()->setOldVisit(url, visitStr); } else { // may be reading a second bookmark with same url - QString oom = nVisit; + TQString oom = nVisit; visitStr = self()->getOldVisit(url); if (oom.toInt() > visitStr.toInt()) { self()->setOldVisit(url, oom); @@ -245,7 +245,7 @@ QString TestLinkItrHolder::calcPaintStyle(const QString &url, KEBListViewItem::P if (!visitStr.isNull()) visit = visitStr.toInt(); // TODO - check validity? - QString statusStr; + TQString statusStr; KEBListViewItem::PaintStyle style = KEBListViewItem::DefaultStyle; // kdDebug() << "TestLink " << "isNull=" << newModStr.isNull() << "newModValid=" @@ -271,7 +271,7 @@ QString TestLinkItrHolder::calcPaintStyle(const QString &url, KEBListViewItem::P } else if (initial && !newModStr.isNull() && (newMod == 0)) { // previous check has no modify time recorded - statusStr = QString::null; + statusStr = TQString::null; } else if (!newModStr.isNull() && (newMod > visit)) { // if modify time greater than last visit, show bold modify time @@ -292,26 +292,26 @@ QString TestLinkItrHolder::calcPaintStyle(const QString &url, KEBListViewItem::P } } else { - statusStr = QString::null; + statusStr = TQString::null; } _style = style; return statusStr; } -static void parseInfo (KBookmark &bk, QString &nVisited) { +static void parseInfo (KBookmark &bk, TQString &nVisited) { nVisited = - NodeEditCommand::getNodeText(bk, QStringList() << "info" << "metadata" + NodeEditCommand::getNodeText(bk, TQStringList() << "info" << "metadata" << "time_visited" ); // kdDebug() << " Visited=" << nVisited << "\n"; } -static void parseNsInfo(const QString &nsinfo, QString &nCreate, QString &nAccess, QString &nModify) { - QStringList sl = QStringList::split(' ', nsinfo); +static void parseNsInfo(const TQString &nsinfo, TQString &nCreate, TQString &nAccess, TQString &nModify) { + TQStringList sl = TQStringList::split(' ', nsinfo); - for (QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) { - QStringList spl = QStringList::split('"', (*it)); + for (TQStringList::Iterator it = sl.begin(); it != sl.end(); ++it) { + TQStringList spl = TQStringList::split('"', (*it)); if (spl[0] == "LAST_MODIFIED=") { nModify = spl[1]; @@ -324,27 +324,27 @@ static void parseNsInfo(const QString &nsinfo, QString &nCreate, QString &nAcces } // Still use nsinfo for storing old modify time -static const QString updateNsInfoMod(const QString &_nsinfo, const QString &nm) { - QString nCreate, nAccess, nModify; +static const TQString updateNsInfoMod(const TQString &_nsinfo, const TQString &nm) { + TQString nCreate, nAccess, nModify; parseNsInfo(_nsinfo, nCreate, nAccess, nModify); bool numValid = false; nm.toInt(&numValid); - QString tmp; - tmp = "ADD_DATE=\"" + ((nCreate.isEmpty()) ? QString::number(time(0)) : nCreate) + "\""; - tmp += " LAST_VISIT=\"" + ((nAccess.isEmpty()) ? QString("0") : nAccess) + "\""; - tmp += " LAST_MODIFIED=\"" + ((numValid) ? nm : QString("1")) + "\""; + TQString tmp; + tmp = "ADD_DATE=\"" + ((nCreate.isEmpty()) ? TQString::number(time(0)) : nCreate) + "\""; + tmp += " LAST_VISIT=\"" + ((nAccess.isEmpty()) ? TQString("0") : nAccess) + "\""; + tmp += " LAST_MODIFIED=\"" + ((numValid) ? nm : TQString("1")) + "\""; // if (!numValid) kdDebug() << tmp << "\n"; return tmp; } // KEBListViewItem !!!!!!!!!!! -void KEBListViewItem::nsPut(const QString &newModDate) { - static const QString NetscapeInfoAttribute = "netscapeinfo"; - const QString info = m_bookmark.internalElement().attribute(NetscapeInfoAttribute); - QString blah = updateNsInfoMod(info, newModDate); +void KEBListViewItem::nsPut(const TQString &newModDate) { + static const TQString NetscapeInfoAttribute = "netscapeinfo"; + const TQString info = m_bookmark.internalElement().attribute(NetscapeInfoAttribute); + TQString blah = updateNsInfoMod(info, newModDate); m_bookmark.internalElement().setAttribute(NetscapeInfoAttribute, blah); TestLinkItrHolder::self()->setMod(m_bookmark.url().url(), newModDate); setText(KEBListView::StatusColumn, newModDate); @@ -352,17 +352,17 @@ void KEBListViewItem::nsPut(const QString &newModDate) { // KEBListViewItem !!!!!!!!!!! void KEBListViewItem::modUpdate() { - QString nCreate, nAccess, oldModify; - QString iVisit; + TQString nCreate, nAccess, oldModify; + TQString iVisit; - QString nsinfo = m_bookmark.internalElement().attribute("netscapeinfo"); + TQString nsinfo = m_bookmark.internalElement().attribute("netscapeinfo"); if (!nsinfo.isEmpty()) { parseNsInfo(nsinfo, nCreate, nAccess, oldModify); } parseInfo(m_bookmark, iVisit); - QString statusLine; + TQString statusLine; statusLine = TestLinkItrHolder::calcPaintStyle(m_bookmark.url().url(), m_paintStyle, iVisit, oldModify); if (statusLine != "Error") setText(KEBListView::StatusColumn, statusLine); @@ -371,13 +371,13 @@ void KEBListViewItem::modUpdate() { /* -------------------------- */ // KEBListViewItem !!!!!!!!!!! -void KEBListViewItem::setOldStatus(const QString &oldStatus) { +void KEBListViewItem::setOldStatus(const TQString &oldStatus) { // kdDebug() << "KEBListViewItem::setOldStatus" << endl; m_oldStatus = oldStatus; } // KEBListViewItem !!!!!!!!!!! -void KEBListViewItem::setTmpStatus(const QString &status) { +void KEBListViewItem::setTmpStatus(const TQString &status) { // kdDebug() << "KEBListViewItem::setTmpStatus" << endl; m_paintStyle = KEBListViewItem::BoldStyle; setText(KEBListView::StatusColumn, status); diff --git a/konqueror/keditbookmarks/testlink.h b/konqueror/keditbookmarks/testlink.h index 7b027edea..7ee84f90b 100644 --- a/konqueror/keditbookmarks/testlink.h +++ b/konqueror/keditbookmarks/testlink.h @@ -20,7 +20,7 @@ #ifndef __testlink_h #define __testlink_h -#include +#include #include #include @@ -33,22 +33,22 @@ public: static TestLinkItrHolder* self() { if (!s_self) { s_self = new TestLinkItrHolder(); }; return s_self; } - void addAffectedBookmark( const QString & address ); - void resetToValue(const QString &url, const QString &val); - const QString getMod(const QString &url) const; - const QString getOldVisit(const QString &url) const; - void setMod(const QString &url, const QString &val); - void setOldVisit(const QString &url, const QString &val); - static QString calcPaintStyle(const QString &, KEBListViewItem::PaintStyle&, - const QString &, const QString &); + void addAffectedBookmark( const TQString & address ); + void resetToValue(const TQString &url, const TQString &val); + const TQString getMod(const TQString &url) const; + const TQString getOldVisit(const TQString &url) const; + void setMod(const TQString &url, const TQString &val); + void setOldVisit(const TQString &url, const TQString &val); + static TQString calcPaintStyle(const TQString &, KEBListViewItem::PaintStyle&, + const TQString &, const TQString &); protected: virtual void doItrListChanged(); private: TestLinkItrHolder(); static TestLinkItrHolder *s_self; - QMap m_modify; - QMap m_oldModify; - QString m_affectedBookmark; + TQMap m_modify; + TQMap m_oldModify; + TQString m_affectedBookmark; }; class TestLinkItr : public BookmarkIterator @@ -56,13 +56,13 @@ class TestLinkItr : public BookmarkIterator Q_OBJECT public: - TestLinkItr(QValueList bks); + TestLinkItr(TQValueList bks); ~TestLinkItr(); virtual TestLinkItrHolder* holder() const { return TestLinkItrHolder::self(); } public slots: void slotJobResult(KIO::Job *job); - void slotJobData(KIO::Job *job, const QByteArray &data); + void slotJobData(KIO::Job *job, const TQByteArray &data); private: virtual void doAction(); diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index 3f49d893a..4a505d495 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -32,10 +32,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -60,8 +60,8 @@ CmdHistory* CmdHistory::s_self = 0; CmdHistory::CmdHistory(KActionCollection *collection) : m_commandHistory(collection) { - connect(&m_commandHistory, SIGNAL( commandExecuted(KCommand *) ), - SLOT( slotCommandExecuted(KCommand *) )); + connect(&m_commandHistory, TQT_SIGNAL( commandExecuted(KCommand *) ), + TQT_SLOT( slotCommandExecuted(KCommand *) )); assert(!s_self); s_self = this; // this is hacky } @@ -121,17 +121,17 @@ void CmdHistory::clearHistory() { CurrentMgr *CurrentMgr::s_mgr = 0; -KBookmark CurrentMgr::bookmarkAt(const QString &a) { +KBookmark CurrentMgr::bookmarkAt(const TQString &a) { return self()->mgr()->findByAddress(a); } bool CurrentMgr::managerSave() { return mgr()->save(); } -void CurrentMgr::saveAs(const QString &fileName) { mgr()->saveAs(fileName); } +void CurrentMgr::saveAs(const TQString &fileName) { mgr()->saveAs(fileName); } void CurrentMgr::setUpdate(bool update) { mgr()->setUpdate(update); } -QString CurrentMgr::path() const { return mgr()->path(); } +TQString CurrentMgr::path() const { return mgr()->path(); } bool CurrentMgr::showNSBookmarks() const { return mgr()->showNSBookmarks(); } -void CurrentMgr::createManager(const QString &filename) { +void CurrentMgr::createManager(const TQString &filename) { if (m_mgr) { kdDebug()<<"ERROR calling createManager twice"< 0) //We ignore the first changed signal after every change we did { --ignorenext; @@ -170,21 +170,21 @@ void CurrentMgr::reloadConfig() { mgr()->emitConfigChanged(); } -QString CurrentMgr::makeTimeStr(const QString & in) +TQString CurrentMgr::makeTimeStr(const TQString & in) { int secs; bool ok; secs = in.toInt(&ok); if (!ok) - return QString::null; + return TQString::null; return makeTimeStr(secs); } -QString CurrentMgr::makeTimeStr(int b) +TQString CurrentMgr::makeTimeStr(int b) { - QDateTime dt; + TQDateTime dt; dt.setTime_t(b); - return (dt.daysTo(QDateTime::currentDateTime()) > 31) + return (dt.daysTo(TQDateTime::currentDateTime()) > 31) ? KGlobal::locale()->formatDate(dt.date(), false) : KGlobal::locale()->formatDateTime(dt, false); } @@ -194,8 +194,8 @@ QString CurrentMgr::makeTimeStr(int b) KEBApp *KEBApp::s_topLevel = 0; KEBApp::KEBApp( - const QString &bookmarksFile, bool readonly, - const QString &address, bool browser, const QString &caption + const TQString &bookmarksFile, bool readonly, + const TQString &address, bool browser, const TQString &caption ) : KMainWindow(), m_dcopIface(0), m_bookmarksFilename(bookmarksFile), m_caption(caption), m_readOnly(readonly), m_browser(browser) { @@ -205,24 +205,24 @@ KEBApp::KEBApp( int h = 20; - QSplitter *vsplitter = new QSplitter(this); + TQSplitter *vsplitter = new TQSplitter(this); KToolBar *quicksearch = new KToolBar(vsplitter, "search toolbar"); KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ), - QApplication::reverseLayout() ? "clear_left" : "locationbar_erase", + TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, actionCollection(), "reset_quicksearch" ); resetQuickSearch->setWhatsThis( i18n( "Reset Quick Search
" "Resets the quick search so that all bookmarks are shown again." ) ); resetQuickSearch->plug( quicksearch ); - QLabel *lbl = new QLabel(i18n("Se&arch:"), quicksearch, "kde toolbar widget"); + TQLabel *lbl = new TQLabel(i18n("Se&arch:"), quicksearch, "kde toolbar widget"); KListViewSearchLine *searchLineEdit = new KEBSearchLine(quicksearch, 0, "KListViewSearchLine"); quicksearch->setStretchableWidget(searchLineEdit); lbl->setBuddy(searchLineEdit); - connect(resetQuickSearch, SIGNAL(activated()), searchLineEdit, SLOT(clear())); - connect(searchLineEdit, SIGNAL(searchUpdated()), SLOT(updateActions())); + connect(resetQuickSearch, TQT_SIGNAL(activated()), searchLineEdit, TQT_SLOT(clear())); + connect(searchLineEdit, TQT_SIGNAL(searchUpdated()), TQT_SLOT(updateActions())); ListView::createListViews(vsplitter); ListView::self()->initListViews(); @@ -231,8 +231,8 @@ KEBApp::KEBApp( m_bkinfo = new BookmarkInfoWidget(vsplitter); - vsplitter->setOrientation(QSplitter::Vertical); - vsplitter->setSizes(QValueList() << h << 380 + vsplitter->setOrientation(TQSplitter::Vertical); + vsplitter->setSizes(TQValueList() << h << 380 << m_bkinfo->sizeHint().height() ); setCentralWidget(vsplitter); @@ -247,8 +247,8 @@ KEBApp::KEBApp( m_dcopIface = new KBookmarkEditorIface(); - connect(kapp->clipboard(), SIGNAL( dataChanged() ), - SLOT( slotClipboardDataChanged() )); + connect(kapp->clipboard(), TQT_SIGNAL( dataChanged() ), + TQT_SLOT( slotClipboardDataChanged() )); ListView::self()->connectSignals(); @@ -276,7 +276,7 @@ void KEBApp::construct() { setAutoSaveSettings(); } -void KEBApp::updateStatus(QString url) +void KEBApp::updateStatus(TQString url) { if(m_bkinfo->bookmark().url() == url) m_bkinfo->updateStatus(); @@ -339,8 +339,8 @@ void KEBApp::notifyCommandExecuted() { void KEBApp::slotConfigureToolbars() { saveMainWindowSettings(KGlobal::config(), "MainWindow"); KEditToolbar dlg(actionCollection()); - connect(&dlg, SIGNAL( newToolbarConfig() ), - SLOT( slotNewToolbarConfig() )); + connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), + TQT_SLOT( slotNewToolbarConfig() )); dlg.exec(); } diff --git a/konqueror/keditbookmarks/toplevel.h b/konqueror/keditbookmarks/toplevel.h index 192f56028..7b1ec5f81 100644 --- a/konqueror/keditbookmarks/toplevel.h +++ b/konqueror/keditbookmarks/toplevel.h @@ -45,7 +45,7 @@ struct SelcAbilities { bool tbShowState:1; }; -class CmdHistory : public QObject { +class CmdHistory : public TQObject { Q_OBJECT public: CmdHistory(KActionCollection *collection); @@ -73,33 +73,33 @@ private: class KBookmark; class KBookmarkManager; -class CurrentMgr : public QObject { +class CurrentMgr : public TQObject { Q_OBJECT public: typedef enum {HTMLExport, OperaExport, IEExport, MozillaExport, NetscapeExport} ExportType; static CurrentMgr* self() { if (!s_mgr) { s_mgr = new CurrentMgr(); } return s_mgr; } - static KBookmark bookmarkAt(const QString & a); + static KBookmark bookmarkAt(const TQString & a); KBookmarkManager* mgr() const { return m_mgr; } bool showNSBookmarks() const; - QString path() const; + TQString path() const; - void createManager(const QString &filename); + void createManager(const TQString &filename); void notifyManagers(KBookmarkGroup grp); void notifyManagers(); bool managerSave(); - void saveAs(const QString &fileName); - void doExport(ExportType type, const QString & path = QString::null); + void saveAs(const TQString &fileName); + void doExport(ExportType type, const TQString & path = TQString::null); void setUpdate(bool update); void reloadConfig(); - static QString makeTimeStr(const QString &); - static QString makeTimeStr(int); + static TQString makeTimeStr(const TQString &); + static TQString makeTimeStr(int); protected slots: - void slotBookmarksChanged(const QString &, const QString &); + void slotBookmarksChanged(const TQString &, const TQString &); private: CurrentMgr() : m_mgr(0), ignorenext(0) { ; } @@ -113,25 +113,25 @@ class KEBApp : public KMainWindow { public: static KEBApp* self() { return s_topLevel; } - KEBApp(const QString & bookmarksFile, bool readonly, const QString &address, bool browser, const QString &caption); + KEBApp(const TQString & bookmarksFile, bool readonly, const TQString &address, bool browser, const TQString &caption); virtual ~KEBApp(); - void updateStatus(QString url); + void updateStatus(TQString url); void setActionsEnabled(SelcAbilities); void setCancelFavIconUpdatesEnabled(bool); void setCancelTestsEnabled(bool); void notifyCommandExecuted(); - void findURL(QString url); + void findURL(TQString url); - QWidget* popupMenuFactory(const char *type) { + TQWidget* popupMenuFactory(const char *type) { return factory()->container(type, this); } KToggleAction* getToggleAction(const char *) const; - QString caption() const { return m_caption; } + TQString caption() const { return m_caption; } bool readonly() const { return m_readOnly; } bool browser() const { return m_browser; } bool nsShown() const; @@ -159,8 +159,8 @@ private: public: // only temporary CmdHistory *m_cmdHistory; - QString m_bookmarksFilename; - QString m_caption; + TQString m_bookmarksFilename; + TQString m_caption; void construct(); diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp index 34c884617..0d9a4cd11 100644 --- a/konqueror/keditbookmarks/updater.cpp +++ b/konqueror/keditbookmarks/updater.cpp @@ -18,7 +18,7 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include "updater.h" @@ -36,7 +36,7 @@ #include #include -FavIconUpdater::FavIconUpdater(QObject *parent, const char *name) +FavIconUpdater::FavIconUpdater(TQObject *parent, const char *name) : KonqFavIconMgr(parent, name) { m_part = 0; m_webGrabber = 0; @@ -58,7 +58,7 @@ void FavIconUpdater::timerDone() { } void FavIconUpdater::downloadIcon(const KBookmark &bk) { - QString favicon = KonqFavIconMgr::iconForURL(bk.url().url()); + TQString favicon = KonqFavIconMgr::iconForURL(bk.url().url()); if (!favicon.isNull()) { // kdDebug() << "downloadIcon() - favicon" << favicon << endl; bk.internalElement().setAttribute("icon", favicon); @@ -90,17 +90,17 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) { if (!m_part) { KParts::ReadOnlyPart *part = KParts::ComponentFactory - ::createPartInstanceFromQuery("text/html", QString::null); + ::createPartInstanceFromQuery("text/html", TQString::null); - part->setProperty("pluginsEnabled", QVariant(false, 1)); - part->setProperty("javaScriptEnabled", QVariant(false, 1)); - part->setProperty("javaEnabled", QVariant(false, 1)); - part->setProperty("autoloadImages", QVariant(false, 1)); + part->setProperty("pluginsEnabled", TQVariant(false, 1)); + part->setProperty("javaScriptEnabled", TQVariant(false, 1)); + part->setProperty("javaEnabled", TQVariant(false, 1)); + part->setProperty("autoloadImages", TQVariant(false, 1)); - connect(part, SIGNAL( canceled(const QString &) ), - this, SLOT( slotCompleted() )); - connect(part, SIGNAL( completed() ), - this, SLOT( slotCompleted() )); + connect(part, TQT_SIGNAL( canceled(const TQString &) ), + this, TQT_SLOT( slotCompleted() )); + connect(part, TQT_SIGNAL( completed() ), + this, TQT_SLOT( slotCompleted() )); KParts::BrowserExtension *ext = KParts::BrowserExtension::childObject(part); assert(ext); @@ -108,16 +108,16 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) { m_browserIface = new FavIconBrowserInterface(this, "browseriface"); ext->setBrowserInterface(m_browserIface); - connect(ext, SIGNAL( setIconURL(const KURL &) ), - this, SLOT( setIconURL(const KURL &) )); + connect(ext, TQT_SIGNAL( setIconURL(const KURL &) ), + this, TQT_SLOT( setIconURL(const KURL &) )); m_part = part; } if (!m_timer) { // Timeout to stop the updating hanging - m_timer = new QTimer(this); - connect( m_timer, SIGNAL(timeout()), this, SLOT(timerDone()) ); + m_timer = new TQTimer(this); + connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) ); } m_timer->start(15000,false); m_webGrabber = new FavIconWebGrabber(m_part, bk.url()); @@ -128,7 +128,7 @@ void FavIconUpdater::setIconURL(const KURL &iconURL) { setIconForURL(m_bk.url(), iconURL); } -void FavIconUpdater::notifyChange(bool isHost, QString hostOrURL, QString iconName) { +void FavIconUpdater::notifyChange(bool isHost, TQString hostOrURL, TQString iconName) { // kdDebug() << "FavIconUpdater::notifyChange()" << endl; Q_UNUSED(isHost); @@ -150,21 +150,21 @@ FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url // the use of KIO rather than directly using KHTML is to allow silently abort on error KIO::Job *job = KIO::get(m_url, false, false); - job->addMetaData( QString("cookies"), QString("none") ); - connect(job, SIGNAL( result( KIO::Job *)), - this, SLOT( slotFinished(KIO::Job *) )); - connect(job, SIGNAL( mimetype( KIO::Job *, const QString &) ), - this, SLOT( slotMimetype(KIO::Job *, const QString &) )); + job->addMetaData( TQString("cookies"), TQString("none") ); + connect(job, TQT_SIGNAL( result( KIO::Job *)), + this, TQT_SLOT( slotFinished(KIO::Job *) )); + connect(job, TQT_SIGNAL( mimetype( KIO::Job *, const TQString &) ), + this, TQT_SLOT( slotMimetype(KIO::Job *, const TQString &) )); } -void FavIconWebGrabber::slotMimetype(KIO::Job *job, const QString & /*type*/) { +void FavIconWebGrabber::slotMimetype(KIO::Job *job, const TQString & /*type*/) { KIO::SimpleJob *sjob = static_cast(job); m_url = sjob->url(); // allow for redirection sjob->putOnHold(); // kdDebug() << "FavIconWebGrabber::slotMimetype " << m_url << "\n"; - // QString typeLocal = typeUncopied; // local copy + // TQString typeLocal = typeUncopied; // local copy // kdDebug() << "slotMimetype : " << typeLocal << endl; // TODO - what to do if typeLocal is not text/html ?? diff --git a/konqueror/keditbookmarks/updater.h b/konqueror/keditbookmarks/updater.h index ff92ea55c..62e034744 100644 --- a/konqueror/keditbookmarks/updater.h +++ b/konqueror/keditbookmarks/updater.h @@ -35,7 +35,7 @@ public: ~FavIconWebGrabber() {} protected slots: - void slotMimetype(KIO::Job *job, const QString &_type); + void slotMimetype(KIO::Job *job, const TQString &_type); void slotFinished(KIO::Job *job); private: @@ -50,13 +50,13 @@ class FavIconUpdater : public KonqFavIconMgr Q_OBJECT public: - FavIconUpdater(QObject *parent, const char *name); + FavIconUpdater(TQObject *parent, const char *name); ~FavIconUpdater(); void downloadIcon(const KBookmark &bk); void downloadIconActual(const KBookmark &bk); - virtual void notifyChange(bool isHost, QString hostOrURL, - QString iconName); + virtual void notifyChange(bool isHost, TQString hostOrURL, + TQString iconName); protected slots: void setIconURL(const KURL &iconURL); @@ -71,7 +71,7 @@ private: KParts::ReadOnlyPart *m_part; FavIconBrowserInterface *m_browserIface; FavIconWebGrabber *m_webGrabber; - QTimer *m_timer; + TQTimer *m_timer; KBookmark m_bk; }; diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc index ce0bafd03..5cb090909 100644 --- a/konqueror/konq_actions.cc +++ b/konqueror/konq_actions.cc @@ -34,13 +34,13 @@ #include "konq_view.h" #include "konq_settingsxt.h" -template class QPtrList; +template class TQPtrList; ///////////////// //static - used by KonqHistoryAction and KonqBidiHistoryAction -void KonqBidiHistoryAction::fillHistoryPopup( const QPtrList &history, - QPopupMenu * popup, +void KonqBidiHistoryAction::fillHistoryPopup( const TQPtrList &history, + TQPopupMenu * popup, bool onlyBack, bool onlyForward, bool checkCurrentItem, @@ -50,7 +50,7 @@ void KonqBidiHistoryAction::fillHistoryPopup( const QPtrList &hist //kdDebug(1202) << "fillHistoryPopup position: " << history.at() << endl; HistoryEntry * current = history.current(); - QPtrListIterator it( history ); + TQPtrListIterator it( history ); if (onlyBack || onlyForward) { it += history.at(); // Jump to current item @@ -61,7 +61,7 @@ void KonqBidiHistoryAction::fillHistoryPopup( const QPtrList &hist uint i = 0; while ( it.current() ) { - QString text = it.current()->title; + TQString text = it.current()->title; text = KStringHandler::cEmSqueeze(text, popup->fontMetrics(), 30); //CT: squeeze text.replace( "&", "&&" ); if ( checkCurrentItem && it.current() == current ) @@ -80,7 +80,7 @@ void KonqBidiHistoryAction::fillHistoryPopup( const QPtrList &hist /////////////////////////////// -KonqBidiHistoryAction::KonqBidiHistoryAction ( const QString & text, QObject* parent, const char* name ) +KonqBidiHistoryAction::KonqBidiHistoryAction ( const TQString & text, TQObject* parent, const char* name ) : KAction( text, 0, parent, name ) { setShortcutConfigurable(false); @@ -88,20 +88,20 @@ KonqBidiHistoryAction::KonqBidiHistoryAction ( const QString & text, QObject* pa m_goMenu = 0L; } -int KonqBidiHistoryAction::plug( QWidget *widget, int index ) +int KonqBidiHistoryAction::plug( TQWidget *widget, int index ) { if (kapp && !kapp->authorizeKAction(name())) return -1; // Go menu - if ( widget->inherits("QPopupMenu") ) + if ( widget->inherits("TQPopupMenu") ) { - m_goMenu = (QPopupMenu*)widget; + m_goMenu = (TQPopupMenu*)widget; // Forward signal (to main view) - connect( m_goMenu, SIGNAL( aboutToShow() ), - this, SIGNAL( menuAboutToShow() ) ); - connect( m_goMenu, SIGNAL( activated( int ) ), - this, SLOT( slotActivated( int ) ) ); + connect( m_goMenu, TQT_SIGNAL( aboutToShow() ), + this, TQT_SIGNAL( menuAboutToShow() ) ); + connect( m_goMenu, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( slotActivated( int ) ) ); //kdDebug(1202) << "m_goMenu->count()=" << m_goMenu->count() << endl; // Store how many items the menu already contains. // This means, the KonqBidiHistoryAction has to be plugged LAST in a menu ! @@ -111,7 +111,7 @@ int KonqBidiHistoryAction::plug( QWidget *widget, int index ) return KAction::plug( widget, index ); } -void KonqBidiHistoryAction::fillGoMenu( const QPtrList & history ) +void KonqBidiHistoryAction::fillGoMenu( const TQPtrList & history ) { if (history.isEmpty()) return; // nothing to do @@ -168,29 +168,29 @@ void KonqBidiHistoryAction::slotActivated( int id ) /////////////////////////////// -KonqLogoAction::KonqLogoAction( const QString& text, int accel, QObject* parent, const char* name ) +KonqLogoAction::KonqLogoAction( const TQString& text, int accel, TQObject* parent, const char* name ) : KAction( text, accel, parent, name ) { } -KonqLogoAction::KonqLogoAction( const QString& text, int accel, - QObject* receiver, const char* slot, QObject* parent, const char* name ) +KonqLogoAction::KonqLogoAction( const TQString& text, int accel, + TQObject* receiver, const char* slot, TQObject* parent, const char* name ) : KAction( text, accel, receiver, slot, parent, name ) { } -KonqLogoAction::KonqLogoAction( const QString& text, const QIconSet& pix, int accel, QObject* parent, const char* name ) +KonqLogoAction::KonqLogoAction( const TQString& text, const TQIconSet& pix, int accel, TQObject* parent, const char* name ) : KAction( text, pix, accel, parent, name ) { } -KonqLogoAction::KonqLogoAction( const QString& text, const QIconSet& pix,int accel, QObject* receiver, const char* slot, QObject* parent, const char* name ) +KonqLogoAction::KonqLogoAction( const TQString& text, const TQIconSet& pix,int accel, TQObject* receiver, const char* slot, TQObject* parent, const char* name ) : KAction( text, pix, accel, receiver, slot, parent, name ) { } -KonqLogoAction::KonqLogoAction( const QStringList& icons, QObject* receiver, - const char* slot, QObject* parent, +KonqLogoAction::KonqLogoAction( const TQStringList& icons, TQObject* receiver, + const char* slot, TQObject* parent, const char* name ) : KAction( 0L, 0, receiver, slot, parent, name ) // text missing ! { @@ -202,7 +202,7 @@ void KonqLogoAction::start() int len = containerCount(); for ( int i = 0; i < len; i++ ) { - QWidget *w = container( i ); + TQWidget *w = container( i ); if ( w->inherits( "KToolBar" ) ) { @@ -217,7 +217,7 @@ void KonqLogoAction::stop() int len = containerCount(); for ( int i = 0; i < len; i++ ) { - QWidget *w = container( i ); + TQWidget *w = container( i ); if ( w->inherits( "KToolBar" ) ) { @@ -229,7 +229,7 @@ void KonqLogoAction::stop() void KonqLogoAction::updateIcon(int id) { - QWidget *w = container( id ); + TQWidget *w = container( id ); if ( w->inherits( "KToolBar" ) ) { @@ -240,7 +240,7 @@ void KonqLogoAction::updateIcon(int id) -int KonqLogoAction::plug( QWidget *widget, int index ) +int KonqLogoAction::plug( TQWidget *widget, int index ) { if (kapp && !kapp->authorizeKAction(name())) return -1; @@ -261,12 +261,12 @@ int KonqLogoAction::plug( QWidget *widget, int index ) int id_ = getToolButtonID(); - bar->insertAnimatedWidget( id_, this, SIGNAL(activated()), QString("kde"), index ); + bar->insertAnimatedWidget( id_, this, TQT_SIGNAL(activated()), TQString("kde"), index ); bar->alignItemRight( id_ ); addContainer( bar, id_ ); - connect( bar, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) ); + connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -278,18 +278,18 @@ int KonqLogoAction::plug( QWidget *widget, int index ) /////////// -KonqViewModeAction::KonqViewModeAction( const QString &text, const QString &icon, - QObject *parent, const char *name ) +KonqViewModeAction::KonqViewModeAction( const TQString &text, const TQString &icon, + TQObject *parent, const char *name ) : KRadioAction( text, icon, 0, parent, name ) { m_menu = new QPopupMenu; - connect( m_menu, SIGNAL( aboutToShow() ), - this, SLOT( slotPopupAboutToShow() ) ); - connect( m_menu, SIGNAL( activated( int ) ), - this, SLOT( slotPopupActivated() ) ); - connect( m_menu, SIGNAL( aboutToHide() ), - this, SLOT( slotPopupAboutToHide() ) ); + connect( m_menu, TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotPopupAboutToShow() ) ); + connect( m_menu, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( slotPopupActivated() ) ); + connect( m_menu, TQT_SIGNAL( aboutToHide() ), + this, TQT_SLOT( slotPopupAboutToHide() ) ); } KonqViewModeAction::~KonqViewModeAction() @@ -297,7 +297,7 @@ KonqViewModeAction::~KonqViewModeAction() delete m_menu; } -int KonqViewModeAction::plug( QWidget *widget, int index ) +int KonqViewModeAction::plug( TQWidget *widget, int index ) { int res = KRadioAction::plug( widget, index ); @@ -331,7 +331,7 @@ void KonqViewModeAction::slotPopupAboutToHide() int i = 0; for (; i < containerCount(); ++i ) { - QWidget *widget = container( i ); + TQWidget *widget = container( i ); if ( !widget->inherits( "KToolBar" ) ) continue; @@ -348,17 +348,17 @@ void KonqViewModeAction::slotPopupAboutToHide() MostOftenList * KonqMostOftenURLSAction::s_mostEntries = 0L; uint KonqMostOftenURLSAction::s_maxEntries = 0; -KonqMostOftenURLSAction::KonqMostOftenURLSAction( const QString& text, - QObject *parent, +KonqMostOftenURLSAction::KonqMostOftenURLSAction( const TQString& text, + TQObject *parent, const char *name ) : KActionMenu( text, "goto", parent, name ) { setDelayed( false ); - connect( popupMenu(), SIGNAL( aboutToShow() ), SLOT( slotFillMenu() )); - //connect( popupMenu(), SIGNAL( aboutToHide() ), SLOT( slotClearMenu() )); - connect( popupMenu(), SIGNAL( activated( int ) ), - SLOT( slotActivated(int) )); + connect( popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotFillMenu() )); + //connect( popupMenu(), TQT_SIGNAL( aboutToHide() ), TQT_SLOT( slotClearMenu() )); + connect( popupMenu(), TQT_SIGNAL( activated( int ) ), + TQT_SLOT( slotActivated(int) )); // Need to do all this upfront for a correct initial state init(); } @@ -380,11 +380,11 @@ void KonqMostOftenURLSAction::parseHistory() // only ever called once KonqHistoryManager *mgr = KonqHistoryManager::kself(); KonqHistoryIterator it( mgr->entries() ); - connect( mgr, SIGNAL( entryAdded( const KonqHistoryEntry * )), - SLOT( slotEntryAdded( const KonqHistoryEntry * ))); - connect( mgr, SIGNAL( entryRemoved( const KonqHistoryEntry * )), - SLOT( slotEntryRemoved( const KonqHistoryEntry * ))); - connect( mgr, SIGNAL( cleared() ), SLOT( slotHistoryCleared() )); + connect( mgr, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * )), + TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * ))); + connect( mgr, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry * )), + TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry * ))); + connect( mgr, TQT_SIGNAL( cleared() ), TQT_SLOT( slotHistoryCleared() )); s_mostEntries = new MostOftenList; // exit() will clean this up for now for ( uint i = 0; it.current() && i < s_maxEntries; i++ ) { @@ -447,7 +447,7 @@ void KonqMostOftenURLSAction::slotFillMenu() KonqHistoryEntry *entry = s_mostEntries->at( id ); while ( entry ) { // we take either title, typedURL or URL (in this order) - QString text = entry->title.isEmpty() ? (entry->typedURL.isEmpty() ? + TQString text = entry->title.isEmpty() ? (entry->typedURL.isEmpty() ? entry->url.prettyURL() : entry->typedURL) : entry->title; @@ -487,8 +487,8 @@ void KonqMostOftenURLSAction::slotActivated( int id ) } // sort by numberOfTimesVisited (least often goes first) -int MostOftenList::compareItems( QPtrCollection::Item item1, - QPtrCollection::Item item2) +int MostOftenList::compareItems( TQPtrCollection::Item item1, + TQPtrCollection::Item item2) { KonqHistoryEntry *entry1 = static_cast( item1 ); KonqHistoryEntry *entry2 = static_cast( item2 ); diff --git a/konqueror/konq_actions.h b/konqueror/konq_actions.h index d4fb343e7..947f0e404 100644 --- a/konqueror/konq_actions.h +++ b/konqueror/konq_actions.h @@ -22,7 +22,7 @@ #include #include -#include +#include class HistoryEntry; class QPopupMenu; @@ -35,18 +35,18 @@ class KonqBidiHistoryAction : public KAction { Q_OBJECT public: - KonqBidiHistoryAction( const QString & text, QObject* parent = 0, const char* name = 0 ); + KonqBidiHistoryAction( const TQString & text, TQObject* parent = 0, const char* name = 0 ); virtual ~KonqBidiHistoryAction() {}; - virtual int plug( QWidget *widget, int index = -1 ); - //virtual void unplug( QWidget *widget ); + virtual int plug( TQWidget *widget, int index = -1 ); + //virtual void unplug( TQWidget *widget ); - void fillGoMenu( const QPtrList &history ); + void fillGoMenu( const TQPtrList &history ); // Used by KonqHistoryAction and KonqBidiHistoryAction - static void fillHistoryPopup( const QPtrList &history, - QPopupMenu * popup, + static void fillHistoryPopup( const TQPtrList &history, + TQPopupMenu * popup, bool onlyBack = false, bool onlyForward = false, bool checkCurrentItem = false, @@ -63,7 +63,7 @@ private: uint m_firstIndex; // first index in the Go menu int m_startPos; int m_currentPos; // == history.at() - QPopupMenu *m_goMenu; // hack + TQPopupMenu *m_goMenu; // hack }; ///// @@ -72,38 +72,38 @@ class KonqLogoAction : public KAction { Q_OBJECT public: - KonqLogoAction( const QString& text, int accel = 0, QObject* parent = 0, const char* name = 0 ); - KonqLogoAction( const QString& text, int accel, - QObject* receiver, const char* slot, QObject* parent, const char* name = 0 ); - KonqLogoAction( const QString& text, const QIconSet& pix, int accel = 0, - QObject* parent = 0, const char* name = 0 ); - KonqLogoAction( const QString& text, const QIconSet& pix, int accel, - QObject* receiver, const char* slot, QObject* parent, const char* name = 0 ); + KonqLogoAction( const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0 ); + KonqLogoAction( const TQString& text, int accel, + TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); + KonqLogoAction( const TQString& text, const TQIconSet& pix, int accel = 0, + TQObject* parent = 0, const char* name = 0 ); + KonqLogoAction( const TQString& text, const TQIconSet& pix, int accel, + TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); // text missing ! - KonqLogoAction( const QStringList& icons, QObject* receiver, - const char* slot, QObject* parent, const char* name = 0 ); + KonqLogoAction( const TQStringList& icons, TQObject* receiver, + const char* slot, TQObject* parent, const char* name = 0 ); - virtual int plug( QWidget *widget, int index = -1 ); + virtual int plug( TQWidget *widget, int index = -1 ); virtual void updateIcon(int id); void start(); void stop(); private: - QStringList iconList; + TQStringList iconList; }; class KonqViewModeAction : public KRadioAction { Q_OBJECT public: - KonqViewModeAction( const QString &text, const QString &icon, - QObject *parent, const char *name ); + KonqViewModeAction( const TQString &text, const TQString &icon, + TQObject *parent, const char *name ); virtual ~KonqViewModeAction(); - virtual int plug( QWidget *widget, int index = -1 ); + virtual int plug( TQWidget *widget, int index = -1 ); - QPopupMenu *popupMenu() const { return m_menu; } + TQPopupMenu *popupMenu() const { return m_menu; } private slots: void slotPopupAboutToShow(); @@ -112,7 +112,7 @@ private slots: private: bool m_popupActivated; - QPopupMenu *m_menu; + TQPopupMenu *m_menu; }; class MostOftenList : public KonqBaseHistoryList @@ -121,7 +121,7 @@ protected: /** * Ensures that the items are sorted by numberOfTimesVisited */ - virtual int compareItems( QPtrCollection::Item, QPtrCollection::Item ); + virtual int compareItems( TQPtrCollection::Item, TQPtrCollection::Item ); }; class KonqMostOftenURLSAction : public KActionMenu @@ -129,7 +129,7 @@ class KonqMostOftenURLSAction : public KActionMenu Q_OBJECT public: - KonqMostOftenURLSAction( const QString& text, QObject *parent, + KonqMostOftenURLSAction( const TQString& text, TQObject *parent, const char *name ); virtual ~KonqMostOftenURLSAction(); diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index 4ea68abb3..86747ebde 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include #include #include @@ -39,7 +39,7 @@ KConfig * KonqCombo::s_config = 0L; const int KonqCombo::temporary = 0; -static QString titleOfURL( const QString& urlStr ) +static TQString titleOfURL( const TQString& urlStr ) { KURL url = KURL::fromPathOrURL( urlStr ); KonqHistoryList& historylist = const_cast( KonqHistoryManager::kself()->entries() ); @@ -48,50 +48,50 @@ static QString titleOfURL( const QString& urlStr ) url.setPath( url.path()+'/' ); historyentry = historylist.findEntry( url ); } - return ( historyentry ? historyentry->title : QString::null ); + return ( historyentry ? historyentry->title : TQString::null ); } class Q_EXPORT KonqComboListBoxPixmap : public QListBoxItem { public: - KonqComboListBoxPixmap( const QString& text ); - KonqComboListBoxPixmap( const QPixmap &, const QString& text, const QString& title ); + KonqComboListBoxPixmap( const TQString& text ); + KonqComboListBoxPixmap( const TQPixmap &, const TQString& text, const TQString& title ); - const QPixmap *pixmap() const { return ± } + const TQPixmap *pixmap() const { return ± } - int height( const QListBox * ) const; - int width( const QListBox * ) const; + int height( const TQListBox * ) const; + int width( const TQListBox * ) const; int rtti() const; static int RTTI; - bool reuse( const QString& newText ); + bool reuse( const TQString& newText ); protected: - void paint( QPainter * ); + void paint( TQPainter * ); private: bool lookup_pending; - QPixmap pm; - QString title; + TQPixmap pm; + TQString title; }; class KonqComboLineEdit : public KLineEdit { public: - KonqComboLineEdit( QWidget *parent=0, const char *name=0 ); - void setCompletedItems( const QStringList& items ); + KonqComboLineEdit( TQWidget *parent=0, const char *name=0 ); + void setCompletedItems( const TQStringList& items ); }; class KonqComboCompletionBox : public KCompletionBox { public: - KonqComboCompletionBox( QWidget *parent, const char *name = 0 ); - void setItems( const QStringList& items ); - void insertStringList( const QStringList & list, int index = -1 ); + KonqComboCompletionBox( TQWidget *parent, const char *name = 0 ); + void setItems( const TQStringList& items ); + void insertStringList( const TQStringList & list, int index = -1 ); }; -KonqCombo::KonqCombo( QWidget *parent, const char *name ) +KonqCombo::KonqCombo( TQWidget *parent, const char *name ) : KHistoryCombo( parent, name ), m_returnPressed( false ), m_permanent( false ), @@ -99,7 +99,7 @@ KonqCombo::KonqCombo( QWidget *parent, const char *name ) m_pageSecurity( KonqMainWindow::NotCrypted ) { setInsertionPolicy( NoInsertion ); - setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed )); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); Q_ASSERT( s_config ); @@ -122,11 +122,11 @@ KonqCombo::KonqCombo( QWidget *parent, const char *name ) // Make the lineedit consume the Key_Enter event... setTrapReturnKey( true ); - connect( KonqHistoryManager::kself(), SIGNAL(cleared()), SLOT(slotCleared()) ); - connect( this, SIGNAL(cleared() ), SLOT(slotCleared()) ); - connect( this, SIGNAL(highlighted( int )), SLOT(slotSetIcon( int )) ); - connect( this, SIGNAL(activated( const QString& )), - SLOT(slotActivated( const QString& )) ); + connect( KonqHistoryManager::kself(), TQT_SIGNAL(cleared()), TQT_SLOT(slotCleared()) ); + connect( this, TQT_SIGNAL(cleared() ), TQT_SLOT(slotCleared()) ); + connect( this, TQT_SIGNAL(highlighted( int )), TQT_SLOT(slotSetIcon( int )) ); + connect( this, TQT_SIGNAL(activated( const TQString& )), + TQT_SLOT(slotActivated( const TQString& )) ); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); @@ -145,30 +145,30 @@ void KonqCombo::init( KCompletion *completion ) loadItems(); } -void KonqCombo::setURL( const QString& url ) +void KonqCombo::setURL( const TQString& url ) { //kdDebug(1202) << "KonqCombo::setURL: " << url << ", returnPressed ? " << m_returnPressed << endl; setTemporary( url ); if ( m_returnPressed ) { // Really insert... m_returnPressed = false; - QByteArray data; - QDataStream s( data, IO_WriteOnly ); + TQByteArray data; + TQDataStream s( data, IO_WriteOnly ); s << url << kapp->dcopClient()->defaultObject(); kapp->dcopClient()->send( "konqueror*", "KonquerorIface", - "addToCombo(QString,QCString)", data); + "addToCombo(TQString,TQCString)", data); } // important security consideration: always display the beginning // of the url rather than its end to prevent spoofing attempts. lineEdit()->setCursorPosition( 0 ); } -void KonqCombo::setTemporary( const QString& text ) +void KonqCombo::setTemporary( const TQString& text ) { setTemporary( text, KonqPixmapProvider::self()->pixmapFor(text) ); } -void KonqCombo::setTemporary( const QString& url, const QPixmap& pix ) +void KonqCombo::setTemporary( const TQString& url, const TQPixmap& pix ) { //kdDebug(1202) << "KonqCombo::setTemporary: " << url << ", temporary = " << temporary << endl; @@ -190,14 +190,14 @@ void KonqCombo::removeDuplicates( int index ) { //kdDebug(1202) << "KonqCombo::removeDuplicates: Starting index = " << index << endl; - QString url (temporaryItem()); + TQString url (temporaryItem()); if (url.endsWith("/")) url.truncate(url.length()-1); // Remove all dupes, if available... for ( int i = index; i < count(); i++ ) { - QString item (text(i)); + TQString item (text(i)); if (item.endsWith("/")) item.truncate(item.length()-1); @@ -208,7 +208,7 @@ void KonqCombo::removeDuplicates( int index ) } // called via DCOP in all instances -void KonqCombo::insertPermanent( const QString& url ) +void KonqCombo::insertPermanent( const TQString& url ) { //kdDebug(1202) << "KonqCombo::insertPermanent: URL = " << url << endl; saveState(); @@ -228,7 +228,7 @@ void KonqCombo::applyPermanent() while ( count() >= maxCount() ) removeItem( --index ); - QString url (temporaryItem()); + TQString url (temporaryItem()); insertItem( KonqPixmapProvider::self()->pixmapFor( url ), url, 1, titleOfURL( url ) ); //kdDebug(1202) << "KonqCombo::applyPermanent: " << url << endl; @@ -238,19 +238,19 @@ void KonqCombo::applyPermanent() } } -void KonqCombo::insertItem( const QString &text, int index, const QString& title ) +void KonqCombo::insertItem( const TQString &text, int index, const TQString& title ) { KonqComboListBoxPixmap* item = new KonqComboListBoxPixmap( 0, text, title ); listBox()->insertItem( item, index ); } -void KonqCombo::insertItem( const QPixmap &pixmap, const QString& text, int index, const QString& title ) +void KonqCombo::insertItem( const TQPixmap &pixmap, const TQString& text, int index, const TQString& title ) { KonqComboListBoxPixmap* item = new KonqComboListBoxPixmap( pixmap, text, title ); listBox()->insertItem( item, index ); } -void KonqCombo::updateItem( const QPixmap& pix, const QString& t, int index, const QString& title ) +void KonqCombo::updateItem( const TQPixmap& pix, const TQString& t, int index, const TQString& title ) { // No need to flicker if (text( index ) == t && @@ -260,9 +260,9 @@ void KonqCombo::updateItem( const QPixmap& pix, const QString& t, int index, con // kdDebug(1202) << "KonqCombo::updateItem: item='" << t << "', index='" // << index << "'" << endl; - // QComboBox::changeItem() doesn't honour the pixmap when + // TQComboBox::changeItem() doesn't honour the pixmap when // using an editable combobox, so we just remove and insert - // ### use QComboBox::changeItem(), once that finally works + // ### use TQComboBox::changeItem(), once that finally works // Well lets try it now as it seems to work fine for me. We // can always revert :) KonqComboListBoxPixmap* item = new KonqComboListBoxPixmap( pix, t, title ); @@ -318,9 +318,9 @@ void KonqCombo::loadItems() s_config->writeEntry( "CompletionItems", "unused" ); s_config->setGroup( "Location Bar" ); - QStringList items = s_config->readPathListEntry( "ComboContents" ); - QStringList::ConstIterator it = items.begin(); - QString item; + TQStringList items = s_config->readPathListEntry( "ComboContents" ); + TQStringList::ConstIterator it = items.begin(); + TQString item; bool first = true; while ( it != items.end() ) { item = *it; @@ -367,7 +367,7 @@ void KonqCombo::popup() void KonqCombo::saveItems() { - QStringList items; + TQStringList items; int i = m_permanent ? 0 : 1; for ( ; i < count(); i++ ) @@ -383,20 +383,20 @@ void KonqCombo::saveItems() void KonqCombo::clearTemporary( bool makeCurrent ) { applyPermanent(); - changeItem( QString::null, temporary ); // ### default pixmap? + changeItem( TQString::null, temporary ); // ### default pixmap? if ( makeCurrent ) setCurrentItem( temporary ); } -bool KonqCombo::eventFilter( QObject *o, QEvent *ev ) +bool KonqCombo::eventFilter( TQObject *o, TQEvent *ev ) { // Handle Ctrl+Del/Backspace etc better than the Qt widget, which always // jumps to the next whitespace. - QLineEdit *edit = lineEdit(); + TQLineEdit *edit = lineEdit(); if ( o == edit ) { int type = ev->type(); - if ( type == QEvent::KeyPress ) { - QKeyEvent *e = static_cast( ev ); + if ( type == TQEvent::KeyPress ) { + TQKeyEvent *e = static_cast( ev ); if ( e->key() == Key_Return || e->key() == Key_Enter ) { m_modifier = e->state(); @@ -413,7 +413,7 @@ bool KonqCombo::eventFilter( QObject *o, QEvent *ev ) } } - else if ( type == QEvent::MouseButtonDblClick ) { + else if ( type == TQEvent::MouseButtonDblClick ) { edit->selectAll(); return true; } @@ -421,11 +421,11 @@ bool KonqCombo::eventFilter( QObject *o, QEvent *ev ) return KComboBox::eventFilter( o, ev ); } -void KonqCombo::keyPressEvent( QKeyEvent *e ) +void KonqCombo::keyPressEvent( TQKeyEvent *e ) { KHistoryCombo::keyPressEvent( e ); // we have to set it as temporary, otherwise we wouldn't get our nice - // pixmap. Yes, QComboBox still sucks. + // pixmap. Yes, TQComboBox still sucks. if ( KKey( e ) == KKey( int( KStdAccel::rotateUp() ) ) || KKey( e ) == KKey( int( KStdAccel::rotateDown() ) ) ) setTemporary( currentText() ); @@ -437,17 +437,17 @@ void KonqCombo::keyPressEvent( QKeyEvent *e ) the next [/#?:], which makes more sense for URLs. The list of chars that will stop the cursor are '/', '.', '?', '#', ':'. */ -void KonqCombo::selectWord(QKeyEvent *e) +void KonqCombo::selectWord(TQKeyEvent *e) { - QLineEdit* edit = lineEdit(); - QString text = edit->text(); + TQLineEdit* edit = lineEdit(); + TQString text = edit->text(); int pos = edit->cursorPosition(); int pos_old = pos; int count = 0; // TODO: make these a parameter when in kdelibs/kdeui... - QValueList chars; - chars << QChar('/') << QChar('.') << QChar('?') << QChar('#') << QChar(':'); + TQValueList chars; + chars << TQChar('/') << TQChar('.') << TQChar('?') << TQChar('#') << TQChar(':'); bool allow_space_break = true; if( e->key() == Key_Left || e->key() == Key_Backspace ) { @@ -463,9 +463,9 @@ void KonqCombo::selectWord(QKeyEvent *e) } else if( e->key() == Key_Backspace ) { edit->cursorForward(false, 1-count); - QString text = edit->text(); + TQString text = edit->text(); int pos_to_right = edit->text().length() - pos_old; - QString cut = text.left(edit->cursorPosition()) + text.right(pos_to_right); + TQString cut = text.left(edit->cursorPosition()) + text.right(pos_to_right); edit->setText(cut); edit->setCursorPosition(pos_old-count+1); } @@ -486,10 +486,10 @@ void KonqCombo::selectWord(QKeyEvent *e) } else if( e->key() == Key_Delete ) { edit->cursorForward(false, -count-1); - QString text = edit->text(); + TQString text = edit->text(); int pos_to_right = text.length() - pos - 1; - QString cut = text.left(pos_old) + - (pos_to_right > 0 ? text.right(pos_to_right) : QString::null ); + TQString cut = text.left(pos_old) + + (pos_to_right > 0 ? text.right(pos_to_right) : TQString::null ); edit->setText(cut); edit->setCursorPosition(pos_old); } @@ -501,13 +501,13 @@ void KonqCombo::selectWord(QKeyEvent *e) void KonqCombo::slotCleared() { - QByteArray data; - QDataStream s( data, IO_WriteOnly ); + TQByteArray data; + TQDataStream s( data, IO_WriteOnly ); s << kapp->dcopClient()->defaultObject(); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "comboCleared(QCString)", data); + kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "comboCleared(TQCString)", data); } -void KonqCombo::removeURL( const QString& url ) +void KonqCombo::removeURL( const TQString& url ) { setUpdatesEnabled( false ); lineEdit()->setUpdatesEnabled( false ); @@ -521,14 +521,14 @@ void KonqCombo::removeURL( const QString& url ) update(); } -void KonqCombo::mousePressEvent( QMouseEvent *e ) +void KonqCombo::mousePressEvent( TQMouseEvent *e ) { - m_dragStart = QPoint(); // null QPoint + m_dragStart = TQPoint(); // null QPoint if ( e->button() == LeftButton && pixmap( currentItem()) ) { // check if the pixmap was clicked int x = e->pos().x(); - int x0 = QStyle::visualRect( style().querySubControlMetrics( QStyle::CC_ComboBox, this, QStyle::SC_ComboBoxEditField ), this ).x(); + int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); if ( x > x0 + 2 && x < lineEdit()->x() ) { m_dragStart = e->pos(); @@ -539,7 +539,7 @@ void KonqCombo::mousePressEvent( QMouseEvent *e ) if ( e->button() == LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) { // check if the lock icon was clicked int x = e->pos().x(); - int x0 = QStyle::visualRect( style().querySubControlMetrics( QStyle::CC_ComboBox, this, QStyle::SC_ComboBoxArrow ), this ).x(); + int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x(); if ( x < x0 ) emit showPageSecurity(); @@ -548,7 +548,7 @@ void KonqCombo::mousePressEvent( QMouseEvent *e ) KComboBox::mousePressEvent( e ); } -void KonqCombo::mouseMoveEvent( QMouseEvent *e ) +void KonqCombo::mouseMoveEvent( TQMouseEvent *e ) { KComboBox::mouseMoveEvent( e ); if ( m_dragStart.isNull() || currentText().isEmpty() ) @@ -564,7 +564,7 @@ void KonqCombo::mouseMoveEvent( QMouseEvent *e ) KURL::List list; list.append( url ); KURLDrag *drag = new KURLDrag( list, this ); - QPixmap pix = KonqPixmapProvider::self()->pixmapFor( currentText(), + TQPixmap pix = KonqPixmapProvider::self()->pixmapFor( currentText(), KIcon::SizeMedium ); if ( !pix.isNull() ) drag->setPixmap( pix ); @@ -573,7 +573,7 @@ void KonqCombo::mouseMoveEvent( QMouseEvent *e ) } } -void KonqCombo::slotActivated( const QString& text ) +void KonqCombo::slotActivated( const TQString& text ) { //kdDebug(1202) << "KonqCombo::slotActivated: " << text << endl; applyPermanent(); @@ -587,28 +587,28 @@ void KonqCombo::setConfig( KConfig *kc ) s_config = kc; } -void KonqCombo::paintEvent( QPaintEvent *pe ) +void KonqCombo::paintEvent( TQPaintEvent *pe ) { - QComboBox::paintEvent( pe ); + TQComboBox::paintEvent( pe ); - QLineEdit *edit = lineEdit(); - QRect re = style().querySubControlMetrics( QStyle::CC_ComboBox, this, QStyle::SC_ComboBoxEditField ); - re = QStyle::visualRect(re, this); + TQLineEdit *edit = lineEdit(); + TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); + re = TQStyle::visualRect(re, this); if ( m_pageSecurity!=KonqMainWindow::NotCrypted ) { - QColor color(245, 246, 190); + TQColor color(245, 246, 190); bool useColor = hasSufficientContrast(color,edit->paletteForegroundColor()); - QPainter p( this ); + TQPainter p( this ); p.setClipRect( re ); - QPixmap pix = KonqPixmapProvider::self()->pixmapFor( currentText() ); + TQPixmap pix = KonqPixmapProvider::self()->pixmapFor( currentText() ); if ( useColor ) { - p.fillRect( re.x(), re.y(), pix.width() + 4, re.height(), QBrush( color )); + p.fillRect( re.x(), re.y(), pix.width() + 4, re.height(), TQBrush( color )); p.drawPixmap( re.x() + 2, re.y() + ( re.height() - pix.height() ) / 2, pix ); } - QRect r = edit->geometry(); + TQRect r = edit->geometry(); r.setRight( re.right() - pix.width() - 4 ); if ( r != edit->geometry() ) edit->setGeometry( r ); @@ -618,16 +618,16 @@ void KonqCombo::paintEvent( QPaintEvent *pe ) pix = SmallIcon( m_pageSecurity==KonqMainWindow::Encrypted ? "encrypted" : "halfencrypted" ); p.fillRect( re.right() - pix.width() - 3 , re.y(), pix.width() + 4, re.height(), - QBrush( useColor ? color : edit->paletteBackgroundColor() )); + TQBrush( useColor ? color : edit->paletteBackgroundColor() )); p.drawPixmap( re.right() - pix.width() -1 , re.y() + ( re.height() - pix.height() ) / 2, pix ); p.setClipping( FALSE ); } else { - QRect r = edit->geometry(); + TQRect r = edit->geometry(); r.setRight( re.right() ); if ( r != edit->geometry() ) edit->setGeometry( r ); - edit->setPaletteBackgroundColor( QApplication::palette( edit ).color( QPalette::Active, QColorGroup::Base ) ); + edit->setPaletteBackgroundColor( TQApplication::palette( edit ).color( TQPalette::Active, TQColorGroup::Base ) ); } } @@ -637,7 +637,7 @@ void KonqCombo::setPageSecurity( int pageSecurity ) repaint(); } -bool KonqCombo::hasSufficientContrast(const QColor &c1, const QColor &c2) +bool KonqCombo::hasSufficientContrast(const TQColor &c1, const TQColor &c2) { // Taken from khtml/misc/helper.cc #define HUE_DISTANCE 40 @@ -667,15 +667,15 @@ bool KonqCombo::hasSufficientContrast(const QColor &c1, const QColor &c2) /////////////////////////////////////////////////////////////////////////////// -KonqComboListBoxPixmap::KonqComboListBoxPixmap( const QString& text ) - : QListBoxItem() +KonqComboListBoxPixmap::KonqComboListBoxPixmap( const TQString& text ) + : TQListBoxItem() { setText( text ); lookup_pending = true; } -KonqComboListBoxPixmap::KonqComboListBoxPixmap( const QPixmap & pix, const QString& text, const QString& _title ) - : QListBoxItem() +KonqComboListBoxPixmap::KonqComboListBoxPixmap( const TQPixmap & pix, const TQString& text, const TQString& _title ) + : TQListBoxItem() { pm = pix; title = _title; @@ -683,7 +683,7 @@ KonqComboListBoxPixmap::KonqComboListBoxPixmap( const QPixmap & pix, const QStri lookup_pending = false; } -void KonqComboListBoxPixmap::paint( QPainter *painter ) +void KonqComboListBoxPixmap::paint( TQPainter *painter ) { if ( lookup_pending ) { title = titleOfURL( text() ); @@ -697,13 +697,13 @@ void KonqComboListBoxPixmap::paint( QPainter *painter ) pm = KonqPixmapProvider::self()->pixmapFor( text(), KIcon::SizeSmall ); } else - pm = QPixmap(); + pm = TQPixmap(); lookup_pending = false; } int itemHeight = height( listBox() ); int yPos, pmWidth = 0; - const QPixmap *pm = pixmap(); + const TQPixmap *pm = pixmap(); if ( pm && ! pm->isNull() ) { yPos = ( itemHeight - pm->height() ) / 2; @@ -711,19 +711,19 @@ void KonqComboListBoxPixmap::paint( QPainter *painter ) pmWidth = pm->width() + 5; } - int entryWidth = listBox()->width() - listBox()->style().pixelMetric( QStyle::PM_ScrollBarExtent ) - - 2 * listBox()->style().pixelMetric( QStyle::PM_DefaultFrameWidth ); + int entryWidth = listBox()->width() - listBox()->style().pixelMetric( TQStyle::PM_ScrollBarExtent ) - + 2 * listBox()->style().pixelMetric( TQStyle::PM_DefaultFrameWidth ); int titleWidth = ( entryWidth / 3 ) - 1; int urlWidth = entryWidth - titleWidth - pmWidth - 2; if ( !text().isEmpty() ) { - QString squeezedText = KStringHandler::rPixelSqueeze( text(), listBox()->fontMetrics(), urlWidth ); + TQString squeezedText = KStringHandler::rPixelSqueeze( text(), listBox()->fontMetrics(), urlWidth ); painter->drawText( pmWidth, 0, urlWidth + pmWidth, itemHeight, Qt::AlignLeft | Qt::AlignTop, squeezedText ); //painter->setPen( KGlobalSettings::inactiveTextColor() ); squeezedText = KStringHandler::rPixelSqueeze( title, listBox()->fontMetrics(), titleWidth ); - QFont font = painter->font(); + TQFont font = painter->font(); font.setItalic( true ); painter->setFont( font ); painter->drawText( entryWidth - titleWidth, 0, titleWidth, @@ -731,22 +731,22 @@ void KonqComboListBoxPixmap::paint( QPainter *painter ) } } -int KonqComboListBoxPixmap::height( const QListBox* lb ) const +int KonqComboListBoxPixmap::height( const TQListBox* lb ) const { int h; if ( text().isEmpty() ) h = pm.height(); else h = QMAX( pm.height(), lb->fontMetrics().lineSpacing() + 2 ); - return QMAX( h, QApplication::globalStrut().height() ); + return QMAX( h, TQApplication::globalStrut().height() ); } -int KonqComboListBoxPixmap::width( const QListBox* lb ) const +int KonqComboListBoxPixmap::width( const TQListBox* lb ) const { if ( text().isEmpty() ) - return QMAX( pm.width() + 6, QApplication::globalStrut().width() ); + return QMAX( pm.width() + 6, TQApplication::globalStrut().width() ); return QMAX( pm.width() + lb->fontMetrics().width( text() ) + 6, - QApplication::globalStrut().width() ); + TQApplication::globalStrut().width() ); } int KonqComboListBoxPixmap::RTTI = 1003; @@ -756,7 +756,7 @@ int KonqComboListBoxPixmap::rtti() const return RTTI; } -bool KonqComboListBoxPixmap::reuse( const QString& newText ) +bool KonqComboListBoxPixmap::reuse( const TQString& newText ) { if ( text() == newText ) return false; @@ -768,12 +768,12 @@ bool KonqComboListBoxPixmap::reuse( const QString& newText ) /////////////////////////////////////////////////////////////////////////////// -KonqComboLineEdit::KonqComboLineEdit( QWidget *parent, const char *name ) +KonqComboLineEdit::KonqComboLineEdit( TQWidget *parent, const char *name ) :KLineEdit( parent, name ) {} -void KonqComboLineEdit::setCompletedItems( const QStringList& items ) +void KonqComboLineEdit::setCompletedItems( const TQStringList& items ) { - QString txt; + TQString txt; KonqComboCompletionBox *completionbox = static_cast( completionBox() ); if ( completionbox && completionbox->isVisible() ) @@ -789,9 +789,9 @@ void KonqComboLineEdit::setCompletedItems( const QStringList& items ) if ( completionbox->isVisible() ) { bool wasSelected = completionbox->isSelected( completionbox->currentItem() ); - const QString currentSelection = completionbox->currentText(); + const TQString currentSelection = completionbox->currentText(); completionbox->setItems( items ); - QListBoxItem* item = completionbox->findItem( currentSelection, Qt::ExactMatch ); + TQListBoxItem* item = completionbox->findItem( currentSelection, Qt::ExactMatch ); if( !item || !wasSelected ) { wasSelected = false; @@ -813,7 +813,7 @@ void KonqComboLineEdit::setCompletedItems( const QStringList& items ) if ( autoSuggest() ) { int index = items.first().find( txt ); - QString newText = items.first().mid( index ); + TQString newText = items.first().mid( index ); setUserSelection( false ); setCompletedText( newText, true ); } @@ -825,15 +825,15 @@ void KonqComboLineEdit::setCompletedItems( const QStringList& items ) /////////////////////////////////////////////////////////////////////////////// -KonqComboCompletionBox::KonqComboCompletionBox( QWidget *parent, const char *name ) +KonqComboCompletionBox::KonqComboCompletionBox( TQWidget *parent, const char *name ) :KCompletionBox( parent, name ) {} -void KonqComboCompletionBox::setItems( const QStringList& items ) +void KonqComboCompletionBox::setItems( const TQStringList& items ) { bool block = signalsBlocked(); blockSignals( true ); - QListBoxItem* item = firstItem(); + TQListBoxItem* item = firstItem(); if ( !item ) insertStringList( items ); else { @@ -842,8 +842,8 @@ void KonqComboCompletionBox::setItems( const QStringList& items ) //to reduce flicker bool dirty = false; - QStringList::ConstIterator it = items.constBegin(); - const QStringList::ConstIterator itEnd = items.constEnd(); + TQStringList::ConstIterator it = items.constBegin(); + const TQStringList::ConstIterator itEnd = items.constEnd(); for ( ; it != itEnd; ++it) { if ( item ) { @@ -862,7 +862,7 @@ void KonqComboCompletionBox::setItems( const QStringList& items ) if ( item ) dirty = true; - QListBoxItem* tmp = item; + TQListBoxItem* tmp = item; while ( (item = tmp ) ) { tmp = item->next(); delete item; @@ -878,15 +878,15 @@ void KonqComboCompletionBox::setItems( const QStringList& items ) blockSignals( block ); // Trigger d->down_workaround = true within KCompletionBox - QStringList dummy; + TQStringList dummy; KCompletionBox::insertItems( dummy, 1 ); } -void KonqComboCompletionBox::insertStringList( const QStringList & list, int index ) +void KonqComboCompletionBox::insertStringList( const TQStringList & list, int index ) { if ( index < 0 ) index = count(); - for ( QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) + for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) insertItem( new KonqComboListBoxPixmap( *it ), index++ ); } diff --git a/konqueror/konq_combo.h b/konqueror/konq_combo.h index 8775d0c96..dfb2778dc 100644 --- a/konqueror/konq_combo.h +++ b/konqueror/konq_combo.h @@ -20,7 +20,7 @@ #ifndef KONQ_COMBO_H #define KONQ_COMBO_H -#include +#include #include #include @@ -35,21 +35,21 @@ class KonqCombo : public KHistoryCombo Q_OBJECT public: - KonqCombo( QWidget *parent, const char *name ); + KonqCombo( TQWidget *parent, const char *name ); ~KonqCombo(); // initializes with the completion object and calls loadItems() void init( KCompletion * ); // determines internally if it's temporary or final - void setURL( const QString& url ); + void setURL( const TQString& url ); - void setTemporary( const QString& ); - void setTemporary( const QString&, const QPixmap& ); + void setTemporary( const TQString& ); + void setTemporary( const TQString&, const TQPixmap& ); void clearTemporary( bool makeCurrent = true ); - void removeURL( const QString& url ); + void removeURL( const TQString& url ); - void insertPermanent( const QString& ); + void insertPermanent( const TQString& ); void updatePixmaps(); @@ -62,23 +62,23 @@ public: void setPageSecurity( int ); - void insertItem( const QString &text, int index=-1, const QString& title=QString::null ); - void insertItem( const QPixmap &pixmap, const QString &text, int index=-1, const QString& title=QString::null ); + void insertItem( const TQString &text, int index=-1, const TQString& title=TQString::null ); + void insertItem( const TQPixmap &pixmap, const TQString &text, int index=-1, const TQString& title=TQString::null ); protected: - virtual void keyPressEvent( QKeyEvent * ); - virtual bool eventFilter( QObject *, QEvent * ); - virtual void mousePressEvent( QMouseEvent * ); - virtual void mouseMoveEvent( QMouseEvent * ); - void paintEvent( QPaintEvent * ); - void selectWord(QKeyEvent *e); + virtual void keyPressEvent( TQKeyEvent * ); + virtual bool eventFilter( TQObject *, TQEvent * ); + virtual void mousePressEvent( TQMouseEvent * ); + virtual void mouseMoveEvent( TQMouseEvent * ); + void paintEvent( TQPaintEvent * ); + void selectWord(TQKeyEvent *e); signals: /** Specialized signal that emits the state of the modifier keys along with the actual activated text. */ - void activated( const QString &, int ); + void activated( const TQString &, int ); /** User has clicked on the security lock in the combobar @@ -88,24 +88,24 @@ signals: private slots: void slotCleared(); void slotSetIcon( int index ); - void slotActivated( const QString& text ); + void slotActivated( const TQString& text ); private: - void updateItem( const QPixmap& pix, const QString&, int index, const QString& title ); + void updateItem( const TQPixmap& pix, const TQString&, int index, const TQString& title ); void saveState(); void restoreState(); void applyPermanent(); - QString temporaryItem() const { return text( temporary ); } + TQString temporaryItem() const { return text( temporary ); } void removeDuplicates( int index ); - bool hasSufficientContrast(const QColor &c1, const QColor &c2); + bool hasSufficientContrast(const TQColor &c1, const TQColor &c2); bool m_returnPressed; bool m_permanent; int m_cursorPos; int m_currentIndex; int m_modifier; - QString m_currentText; - QPoint m_dragStart; + TQString m_currentText; + TQPoint m_dragStart; int m_pageSecurity; static KConfig *s_config; diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc index a43d4540d..d6d9f71a0 100644 --- a/konqueror/konq_extensionmanager.cc +++ b/konqueror/konq_extensionmanager.cc @@ -14,8 +14,8 @@ ************************************************************************* */ -#include -#include +#include +#include #include #include @@ -39,7 +39,7 @@ public: bool isChanged; }; -KonqExtensionManager::KonqExtensionManager(QWidget *parent, KonqMainWindow *mainWindow, KParts::ReadOnlyPart* activePart) : +KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mainWindow, KParts::ReadOnlyPart* activePart) : KDialogBase(Plain, i18n("Configure"), Default | Cancel | Apply | Ok | User1, Ok, parent, "extensionmanager", false, true, KGuiItem(i18n("&Reset"), "undo")) { @@ -47,14 +47,14 @@ KonqExtensionManager::KonqExtensionManager(QWidget *parent, KonqMainWindow *main showButton(User1, false); setChanged(false); - setInitialSize(QSize(640, 480)); + setInitialSize(TQSize(640, 480)); - (new QVBoxLayout(plainPage(), 0, 0))->setAutoAdd(true); + (new TQVBoxLayout(plainPage(), 0, 0))->setAutoAdd(true); d->pluginSelector = new KPluginSelector(plainPage()); setMainWidget(d->pluginSelector); - connect(d->pluginSelector, SIGNAL(changed(bool)), this, SLOT(setChanged(bool))); - connect(d->pluginSelector, SIGNAL(configCommitted(const QCString &)), - KSettings::Dispatcher::self(), SLOT(reparseConfiguration(const QCString &))); + connect(d->pluginSelector, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(setChanged(bool))); + connect(d->pluginSelector, TQT_SIGNAL(configCommitted(const TQCString &)), + KSettings::Dispatcher::self(), TQT_SLOT(reparseConfiguration(const TQCString &))); d->mainWindow = mainWindow; d->activePart = activePart; @@ -101,8 +101,8 @@ void KonqExtensionManager::apply() if( d->mainWindow ) { KParts::Plugin::loadPlugins(d->mainWindow, d->mainWindow, KGlobal::instance()); - QPtrList plugins = KParts::Plugin::pluginObjects(d->mainWindow); - QPtrListIterator it(plugins); + TQPtrList plugins = KParts::Plugin::pluginObjects(d->mainWindow); + TQPtrListIterator it(plugins); KParts::Plugin *plugin; while((plugin = it.current()) != 0) { @@ -113,8 +113,8 @@ void KonqExtensionManager::apply() if ( d->activePart ) { KParts::Plugin::loadPlugins( d->activePart, d->activePart, d->activePart->instance() ); - QPtrList plugins = KParts::Plugin::pluginObjects( d->activePart ); - QPtrListIterator it(plugins); + TQPtrList plugins = KParts::Plugin::pluginObjects( d->activePart ); + TQPtrListIterator it(plugins); KParts::Plugin *plugin; while((plugin = it.current()) != 0) { diff --git a/konqueror/konq_extensionmanager.h b/konqueror/konq_extensionmanager.h index 824dc2771..7ecc88b3b 100644 --- a/konqueror/konq_extensionmanager.h +++ b/konqueror/konq_extensionmanager.h @@ -36,7 +36,7 @@ class KonqExtensionManager : public KDialogBase Q_OBJECT public: - KonqExtensionManager(QWidget *parent, KonqMainWindow *mainWindow, KParts::ReadOnlyPart* activePart); + KonqExtensionManager(TQWidget *parent, KonqMainWindow *mainWindow, KParts::ReadOnlyPart* activePart); ~KonqExtensionManager(); void apply(); diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc index 9eeeac1fa..8dfee7f85 100644 --- a/konqueror/konq_factory.cc +++ b/konqueror/konq_factory.cc @@ -30,28 +30,28 @@ #include #include -#include -#include +#include +#include #include KAboutData *KonqFactory::s_aboutData = 0; -KonqViewFactory::KonqViewFactory( KLibFactory *factory, const QStringList &args, +KonqViewFactory::KonqViewFactory( KLibFactory *factory, const TQStringList &args, bool createBrowser ) : m_factory( factory ), m_args( args ), m_createBrowser( createBrowser ) { if ( m_createBrowser ) - m_args << QString::fromLatin1( "Browser/View" ); + m_args << TQString::fromLatin1( "Browser/View" ); } -KParts::ReadOnlyPart *KonqViewFactory::create( QWidget *parentWidget, const char *widgetName, - QObject * parent, const char *name ) +KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const char *widgetName, + TQObject * parent, const char *name ) { if ( !m_factory ) return 0L; - QObject *obj = 0L; + TQObject *obj = 0L; if ( m_factory->inherits( "KParts::Factory" ) ) { @@ -74,17 +74,17 @@ KParts::ReadOnlyPart *KonqViewFactory::create( QWidget *parentWidget, const char kdError(1202) << "Part " << obj << " (" << obj->className() << ") doesn't inherit KParts::ReadOnlyPart !" << endl; KParts::ReadOnlyPart* part = static_cast( obj ); - QFrame* frame = ::qt_cast( part->widget() ); + TQFrame* frame = ::qt_cast( part->widget() ); if (frame) { - frame->setFrameStyle( QFrame::NoFrame ); + frame->setFrameStyle( TQFrame::NoFrame ); } return part; } -KonqViewFactory KonqFactory::createView( const QString &serviceType, - const QString &serviceName, +KonqViewFactory KonqFactory::createView( const TQString &serviceType, + const TQString &serviceName, KService::Ptr *serviceImpl, KTrader::OfferList *partServiceOffers, KTrader::OfferList *appServiceOffers, @@ -142,7 +142,7 @@ KonqViewFactory KonqFactory::createView( const QString &serviceType, if ( service ) { kdDebug(1202) << "Trying to open lib for requested service " << service->desktopEntryName() << endl; - factory = KLibLoader::self()->factory( QFile::encodeName(service->library()) ); + factory = KLibLoader::self()->factory( TQFile::encodeName(service->library()) ); if ( !factory ) KMessageBox::error(0, i18n("There was an error loading the module %1.\nThe diagnostics is:\n%2") @@ -154,13 +154,13 @@ KonqViewFactory KonqFactory::createView( const QString &serviceType, { service = (*it); // Allowed as default ? - QVariant prop = service->property( "X-KDE-BrowserView-AllowAsDefault" ); + TQVariant prop = service->property( "X-KDE-BrowserView-AllowAsDefault" ); kdDebug(1202) << service->desktopEntryName() << " : X-KDE-BrowserView-AllowAsDefault is valid : " << prop.isValid() << endl; if ( !prop.isValid() || prop.toBool() ) // defaults to true { //kdDebug(1202) << "Trying to open lib for service " << service->name() << endl; // Try loading factory - factory = KLibLoader::self()->factory( QFile::encodeName(service->library()) ); + factory = KLibLoader::self()->factory( TQFile::encodeName(service->library()) ); if ( !factory ) KMessageBox::error(0, i18n("There was an error loading the module %1.\nThe diagnostics is:\n%2") @@ -179,20 +179,20 @@ KonqViewFactory KonqFactory::createView( const QString &serviceType, return KonqViewFactory(); } - QStringList args; + TQStringList args; - QVariant prop = service->property( "X-KDE-BrowserView-Args" ); + TQVariant prop = service->property( "X-KDE-BrowserView-Args" ); if ( prop.isValid() ) { - QString argStr = prop.toString(); - args = QStringList::split( " ", argStr ); + TQString argStr = prop.toString(); + args = TQStringList::split( " ", argStr ); } return KonqViewFactory( factory, args, service->serviceTypes().contains( "Browser/View" ) ); } -void KonqFactory::getOffers( const QString & serviceType, +void KonqFactory::getOffers( const TQString & serviceType, KTrader::OfferList *partServiceOffers, KTrader::OfferList *appServiceOffers ) { @@ -200,13 +200,13 @@ void KonqFactory::getOffers( const QString & serviceType, { *appServiceOffers = KTrader::self()->query( serviceType, "Application", "DesktopEntryName != 'kfmclient' and DesktopEntryName != 'kfmclient_dir' and DesktopEntryName != 'kfmclient_html'", - QString::null ); + TQString::null ); } if ( partServiceOffers ) { *partServiceOffers = KTrader::self()->query( serviceType, "KParts/ReadOnlyPart", - QString::null, QString::null ); + TQString::null, TQString::null ); } } diff --git a/konqueror/konq_factory.h b/konqueror/konq_factory.h index 8d156876f..ac24061e6 100644 --- a/konqueror/konq_factory.h +++ b/konqueror/konq_factory.h @@ -22,8 +22,8 @@ #ifndef __konq_factory_h__ #define __konq_factory_h__ -#include -#include +#include +#include #include #include @@ -39,7 +39,7 @@ class KonqViewFactory public: KonqViewFactory() : m_factory( 0L ), m_createBrowser( false ) {} - KonqViewFactory( KLibFactory *factory, const QStringList &args, bool createBrowser ); + KonqViewFactory( KLibFactory *factory, const TQStringList &args, bool createBrowser ); KonqViewFactory( const KonqViewFactory &factory ) { (*this) = factory; } @@ -52,28 +52,28 @@ public: return *this; } - KParts::ReadOnlyPart *create( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name ); + KParts::ReadOnlyPart *create( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name ); bool isNull() const { return m_factory ? false : true; } private: KLibFactory *m_factory; - QStringList m_args; + TQStringList m_args; bool m_createBrowser; }; class KonqFactory { public: - static KonqViewFactory createView( const QString &serviceType, - const QString &serviceName = QString::null, + static KonqViewFactory createView( const TQString &serviceType, + const TQString &serviceName = TQString::null, KService::Ptr *serviceImpl = 0, KTrader::OfferList *partServiceOffers = 0, KTrader::OfferList *appServiceOffers = 0, bool forceAutoEmbed = false ); - static void getOffers( const QString & serviceType, + static void getOffers( const TQString & serviceType, KTrader::OfferList *partServiceOffers = 0, KTrader::OfferList *appServiceOffers = 0); diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc index 0aacbe3d6..77310ebbc 100644 --- a/konqueror/konq_frame.cc +++ b/konqueror/konq_frame.cc @@ -18,14 +18,14 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -48,11 +48,11 @@ #define DEFAULT_HEADER_HEIGHT 13 -void KonqCheckBox::drawButton( QPainter *p ) +void KonqCheckBox::drawButton( TQPainter *p ) { - //static QPixmap indicator_anchor( UserIcon( "indicator_anchor" ) ); - static QPixmap indicator_connect( UserIcon( "indicator_connect" ) ); - static QPixmap indicator_noconnect( UserIcon( "indicator_noconnect" ) ); + //static TQPixmap indicator_anchor( UserIcon( "indicator_anchor" ) ); + static TQPixmap indicator_connect( UserIcon( "indicator_connect" ) ); + static TQPixmap indicator_noconnect( UserIcon( "indicator_noconnect" ) ); if (isOn() || isDown()) p->drawPixmap(0,0,indicator_connect); @@ -66,22 +66,22 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name ) { setSizeGripEnabled( false ); - m_led = new QLabel( this ); + m_led = new TQLabel( this ); m_led->setAlignment( Qt::AlignCenter ); - m_led->setSizePolicy(QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed )); + m_led->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); addWidget( m_led, 0, false ); // led (active view indicator) m_led->hide(); m_pStatusLabel = new KSqueezedTextLabel( this ); m_pStatusLabel->setMinimumSize( 0, 0 ); - m_pStatusLabel->setSizePolicy(QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Fixed )); + m_pStatusLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); m_pStatusLabel->installEventFilter(this); addWidget( m_pStatusLabel, 1 /*stretch*/, false ); // status label m_pLinkedViewCheckBox = new KonqCheckBox( this, "m_pLinkedViewCheckBox" ); m_pLinkedViewCheckBox->setFocusPolicy(NoFocus); - m_pLinkedViewCheckBox->setSizePolicy(QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed )); - QWhatsThis::add( m_pLinkedViewCheckBox, + m_pLinkedViewCheckBox->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); + TQWhatsThis::add( m_pLinkedViewCheckBox, i18n("Checking this box on at least two views sets those views as 'linked'. " "Then, when you change directories in one view, the other views " "linked with it will automatically update to show the current directory. " @@ -89,15 +89,15 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name ) "directory tree with an icon view or detailed view, and possibly a " "terminal emulator window." ) ); addWidget( m_pLinkedViewCheckBox, 0, true /*permanent->right align*/ ); - connect( m_pLinkedViewCheckBox, SIGNAL(toggled(bool)), - this, SIGNAL(linkedViewClicked(bool)) ); + connect( m_pLinkedViewCheckBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(linkedViewClicked(bool)) ); m_progressBar = new KProgress( this ); m_progressBar->setMaximumHeight(fontMetrics().height()); m_progressBar->hide(); addWidget( m_progressBar, 0, true /*permanent->right align*/ ); - fontChange(QFont()); + fontChange(TQFont()); installEventFilter( this ); } @@ -105,7 +105,7 @@ KonqFrameStatusBar::~KonqFrameStatusBar() { } -void KonqFrameStatusBar::fontChange(const QFont & /* oldFont */) +void KonqFrameStatusBar::fontChange(const TQFont & /* oldFont */) { int h = fontMetrics().height(); if ( h < DEFAULT_HEADER_HEIGHT ) h = DEFAULT_HEADER_HEIGHT; @@ -116,7 +116,7 @@ void KonqFrameStatusBar::fontChange(const QFont & /* oldFont */) } -void KonqFrameStatusBar::resizeEvent( QResizeEvent* ev ) +void KonqFrameStatusBar::resizeEvent( TQResizeEvent* ev ) { //m_progressBar->setGeometry( width()-160, 0, 140, height() ); //m_pLinkedViewCheckBox->move( width()-15, m_yOffset ); // right justify @@ -125,9 +125,9 @@ void KonqFrameStatusBar::resizeEvent( QResizeEvent* ev ) // I don't think this code _ever_ gets called! // I don't want to remove it, though. :-) -void KonqFrameStatusBar::mousePressEvent( QMouseEvent* event ) +void KonqFrameStatusBar::mousePressEvent( TQMouseEvent* event ) { - QWidget::mousePressEvent( event ); + TQWidget::mousePressEvent( event ); if ( !m_pParentKonqFrame->childView()->isPassiveMode() ) { emit clicked(); @@ -145,7 +145,7 @@ void KonqFrameStatusBar::splitFrameMenu() // We have to ship the remove view action ourselves, // since this may not be the active view (passive view) - KAction actRemoveView(i18n("Close View"), "view_remove", 0, m_pParentKonqFrame, SLOT(slotRemoveView()), (QObject*)0, "removethisview"); + KAction actRemoveView(i18n("Close View"), "view_remove", 0, m_pParentKonqFrame, TQT_SLOT(slotRemoveView()), (TQObject*)0, "removethisview"); //KonqView * nextView = mw->viewManager()->chooseNextView( m_pParentKonqFrame->childView() ); actRemoveView.setEnabled( mw->mainViewsCount() > 1 || m_pParentKonqFrame->childView()->isToggleView() || m_pParentKonqFrame->childView()->isPassiveMode() ); @@ -153,7 +153,7 @@ void KonqFrameStatusBar::splitFrameMenu() // ###### might be not right for passive views ! KActionCollection *actionColl = mw->actionCollection(); - QPopupMenu menu; + TQPopupMenu menu; actionColl->action( "splitviewh" )->plug( &menu ); actionColl->action( "splitviewv" )->plug( &menu ); @@ -162,20 +162,20 @@ void KonqFrameStatusBar::splitFrameMenu() actRemoveView.plug( &menu ); - menu.exec(QCursor::pos()); + menu.exec(TQCursor::pos()); } -bool KonqFrameStatusBar::eventFilter(QObject* o, QEvent *e) +bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e) { - if (o == m_pStatusLabel && e->type()==QEvent::MouseButtonPress) + if (o == m_pStatusLabel && e->type()==TQEvent::MouseButtonPress) { emit clicked(); update(); - if ( static_cast(e)->button() == RightButton) + if ( static_cast(e)->button() == RightButton) splitFrameMenu(); return true; } - else if ( o == this && e->type() == QEvent::ApplicationPaletteChange ) + else if ( o == this && e->type() == TQEvent::ApplicationPaletteChange ) { unsetPalette(); updateActiveStatus(); @@ -185,17 +185,17 @@ bool KonqFrameStatusBar::eventFilter(QObject* o, QEvent *e) return false; } -void KonqFrameStatusBar::message( const QString &msg ) +void KonqFrameStatusBar::message( const TQString &msg ) { - // We don't use the message()/clear() mechanism of QStatusBar because + // We don't use the message()/clear() mechanism of TQStatusBar because // it really looks ugly (the label border goes away, the active-view indicator // is hidden...) - QString saveMsg = m_savedMessage; + TQString saveMsg = m_savedMessage; slotDisplayStatusText( msg ); m_savedMessage = saveMsg; } -void KonqFrameStatusBar::slotDisplayStatusText(const QString& text) +void KonqFrameStatusBar::slotDisplayStatusText(const TQString& text) { //kdDebug(1202)<<"KonqFrameHeader::slotDisplayStatusText("<resize(fontMetrics().width(text),fontMetrics().height()+2); @@ -223,7 +223,7 @@ void KonqFrameStatusBar::slotLoadingProgress( int percent ) void KonqFrameStatusBar::slotSpeedProgress( int bytesPerSecond ) { - QString sizeStr; + TQString sizeStr; if ( bytesPerSecond > 0 ) sizeStr = i18n( "%1/s" ).arg( KIO::convertSize( bytesPerSecond ) ); @@ -236,8 +236,8 @@ void KonqFrameStatusBar::slotSpeedProgress( int bytesPerSecond ) void KonqFrameStatusBar::slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *newOne) { if (newOne!=0) - connect(newOne,SIGNAL(setStatusBarText(const QString &)),this,SLOT(slotDisplayStatusText(const QString&))); - slotDisplayStatusText( QString::null ); + connect(newOne,TQT_SIGNAL(setStatusBarText(const TQString &)),this,TQT_SLOT(slotDisplayStatusText(const TQString&))); + slotDisplayStatusText( TQString::null ); } void KonqFrameStatusBar::showActiveViewIndicator( bool b ) @@ -268,25 +268,25 @@ void KonqFrameStatusBar::updateActiveStatus() bool hasFocus = m_pParentKonqFrame->isActivePart(); - const QColorGroup& activeCg = kapp->palette().active(); + const TQColorGroup& activeCg = kapp->palette().active(); setPaletteBackgroundColor( hasFocus ? activeCg.midlight() : activeCg.mid() ); - static QPixmap indicator_viewactive( UserIcon( "indicator_viewactive" ) ); - static QPixmap indicator_empty( UserIcon( "indicator_empty" ) ); + static TQPixmap indicator_viewactive( UserIcon( "indicator_viewactive" ) ); + static TQPixmap indicator_empty( UserIcon( "indicator_empty" ) ); m_led->setPixmap( hasFocus ? indicator_viewactive : indicator_empty ); } //################################################################### -void KonqFrameBase::printFrameInfo(const QString& spaces) +void KonqFrameBase::printFrameInfo(const TQString& spaces) { kdDebug(1202) << spaces << "KonqFrameBase " << this << " printFrameInfo not implemented in derived class!" << endl; } //################################################################### -KonqFrame::KonqFrame( QWidget* parent, KonqFrameContainerBase *parentContainer, const char *name ) -:QWidget(parent,name) +KonqFrame::KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer, const char *name ) +:TQWidget(parent,name) { //kdDebug(1202) << "KonqFrame::KonqFrame()" << endl; @@ -295,9 +295,9 @@ KonqFrame::KonqFrame( QWidget* parent, KonqFrameContainerBase *parentContainer, // the frame statusbar m_pStatusBar = new KonqFrameStatusBar( this, "KonquerorFrameStatusBar"); - m_pStatusBar->setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed )); - connect(m_pStatusBar, SIGNAL(clicked()), this, SLOT(slotStatusBarClicked())); - connect( m_pStatusBar, SIGNAL( linkedViewClicked( bool ) ), this, SLOT( slotLinkedViewClicked( bool ) ) ); + m_pStatusBar->setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + connect(m_pStatusBar, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStatusBarClicked())); + connect( m_pStatusBar, TQT_SIGNAL( linkedViewClicked( bool ) ), this, TQT_SLOT( slotLinkedViewClicked( bool ) ) ); m_separator = 0; m_pParentContainer = parentContainer; } @@ -318,22 +318,22 @@ void KonqFrame::listViews( ChildViewList *viewList ) viewList->append( childView() ); } -void KonqFrame::saveConfig( KConfig* config, const QString &prefix, bool saveURLs, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ ) +void KonqFrame::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ ) { if (saveURLs) - config->writePathEntry( QString::fromLatin1( "URL" ).prepend( prefix ), + config->writePathEntry( TQString::fromLatin1( "URL" ).prepend( prefix ), childView()->url().url() ); - config->writeEntry( QString::fromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() ); - config->writeEntry( QString::fromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() ); - config->writeEntry( QString::fromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() ); - config->writeEntry( QString::fromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() ); - config->writeEntry( QString::fromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() ); - config->writeEntry( QString::fromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() ); - //config->writeEntry( QString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() ); - if (this == docContainer) config->writeEntry( QString::fromLatin1( "docContainer" ).prepend( prefix ), true ); + config->writeEntry( TQString::fromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() ); + config->writeEntry( TQString::fromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() ); + config->writeEntry( TQString::fromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() ); + config->writeEntry( TQString::fromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() ); + config->writeEntry( TQString::fromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() ); + config->writeEntry( TQString::fromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() ); + //config->writeEntry( TQString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() ); + if (this == docContainer) config->writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true ); KonqConfigEvent ev( config, prefix+"_", true/*save*/); - QApplication::sendEvent( childView()->part(), &ev ); + TQApplication::sendEvent( childView()->part(), &ev ); } void KonqFrame::copyHistory( KonqFrameBase *other ) @@ -342,12 +342,12 @@ void KonqFrame::copyHistory( KonqFrameBase *other ) childView()->copyHistory( static_cast( other )->childView() ); } -void KonqFrame::printFrameInfo( const QString& spaces ) +void KonqFrame::printFrameInfo( const TQString& spaces ) { - QString className = "NoPart"; + TQString className = "NoPart"; if (part()) className = part()->widget()->className(); - kdDebug(1202) << spaces << "KonqFrame " << this << " visible=" << QString("%1").arg(isVisible()) << " containing view " - << childView() << " visible=" << QString("%1").arg(isVisible()) + kdDebug(1202) << spaces << "KonqFrame " << this << " visible=" << TQString("%1").arg(isVisible()) << " containing view " + << childView() << " visible=" << TQString("%1").arg(isVisible()) << " and part " << part() << " whose widget is a " << className << endl; } @@ -375,7 +375,7 @@ void KonqFrame::attachInternal() //kdDebug(1202) << "KonqFrame::attachInternal()" << endl; delete m_pLayout; - m_pLayout = new QVBoxLayout( this, 0, -1, "KonqFrame's QVBoxLayout" ); + m_pLayout = new TQVBoxLayout( this, 0, -1, "KonqFrame's TQVBoxLayout" ); m_pLayout->addWidget( m_pPart->widget(), 1 ); @@ -387,11 +387,11 @@ void KonqFrame::attachInternal() m_pPart->widget()->installEventFilter(this); } -bool KonqFrame::eventFilter(QObject* /*obj*/, QEvent *ev) +bool KonqFrame::eventFilter(TQObject* /*obj*/, TQEvent *ev) { - if (ev->type()==QEvent::KeyPress) + if (ev->type()==TQEvent::KeyPress) { - QKeyEvent * keyEv = static_cast(ev); + TQKeyEvent * keyEv = static_cast(ev); if ((keyEv->key()==Key_Tab) && (keyEv->state()==ControlButton)) { emit ((KonqFrameContainer*)parent())->ctrlTabPressed(); @@ -401,7 +401,7 @@ bool KonqFrame::eventFilter(QObject* /*obj*/, QEvent *ev) return false; } -void KonqFrame::insertTopWidget( QWidget * widget ) +void KonqFrame::insertTopWidget( TQWidget * widget ) { assert(m_pLayout); m_pLayout->insertWidget( 0, widget ); @@ -414,27 +414,27 @@ void KonqFrame::setView( KonqView* child ) m_pView = child; if (m_pView) { - connect(m_pView,SIGNAL(sigPartChanged(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)), - m_pStatusBar,SLOT(slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *))); + connect(m_pView,TQT_SIGNAL(sigPartChanged(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)), + m_pStatusBar,TQT_SLOT(slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *))); } } -void KonqFrame::setTitle( const QString &title , QWidget* /*sender*/) +void KonqFrame::setTitle( const TQString &title , TQWidget* /*sender*/) { //kdDebug(1202) << "KonqFrame::setTitle( " << title << " )" << endl; m_title = title; if (m_pParentContainer) m_pParentContainer->setTitle( title , this); } -void KonqFrame::setTabIcon( const KURL &url, QWidget* /*sender*/ ) +void KonqFrame::setTabIcon( const KURL &url, TQWidget* /*sender*/ ) { //kdDebug(1202) << "KonqFrame::setTabIcon( " << url << " )" << endl; if (m_pParentContainer) m_pParentContainer->setTabIcon( url, this ); } -void KonqFrame::reparentFrame( QWidget* parent, const QPoint & p, bool showIt ) +void KonqFrame::reparentFrame( TQWidget* parent, const TQPoint & p, bool showIt ) { - QWidget::reparent( parent, p, showIt ); + TQWidget::reparent( parent, p, showIt ); } void KonqFrame::slotStatusBarClicked() @@ -452,7 +452,7 @@ void KonqFrame::slotLinkedViewClicked( bool mode ) } void -KonqFrame::paintEvent( QPaintEvent* ) +KonqFrame::paintEvent( TQPaintEvent* ) { m_pStatusBar->repaint(); } @@ -470,7 +470,7 @@ void KonqFrame::activateChild() //################################################################### -void KonqFrameContainerBase::printFrameInfo(const QString& spaces) +void KonqFrameContainerBase::printFrameInfo(const TQString& spaces) { kdDebug(1202) << spaces << "KonqFrameContainerBase " << this << ", this shouldn't happen!" << endl; } @@ -478,10 +478,10 @@ void KonqFrameContainerBase::printFrameInfo(const QString& spaces) //################################################################### KonqFrameContainer::KonqFrameContainer( Orientation o, - QWidget* parent, + TQWidget* parent, KonqFrameContainerBase* parentContainer, const char * name) - : QSplitter( o, parent, name ), m_bAboutToBeDeleted(false) + : TQSplitter( o, parent, name ), m_bAboutToBeDeleted(false) { m_pParentContainer = parentContainer; m_pFirstChild = 0L; @@ -506,45 +506,45 @@ void KonqFrameContainer::listViews( ChildViewList *viewList ) m_pSecondChild->listViews( viewList ); } -void KonqFrameContainer::saveConfig( KConfig* config, const QString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth ) +void KonqFrameContainer::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth ) { int idSecond = id + (int)pow( 2.0, depth ); //write children sizes - config->writeEntry( QString::fromLatin1( "SplitterSizes" ).prepend( prefix ), sizes() ); + config->writeEntry( TQString::fromLatin1( "SplitterSizes" ).prepend( prefix ), sizes() ); //write children - QStringList strlst; + TQStringList strlst; if( firstChild() ) - strlst.append( QString::fromLatin1( firstChild()->frameType() ) + QString::number(idSecond - 1) ); + strlst.append( TQString::fromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1) ); if( secondChild() ) - strlst.append( QString::fromLatin1( secondChild()->frameType() ) + QString::number( idSecond ) ); + strlst.append( TQString::fromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ) ); - config->writeEntry( QString::fromLatin1( "Children" ).prepend( prefix ), strlst ); + config->writeEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), strlst ); //write orientation - QString o; + TQString o; if( orientation() == Qt::Horizontal ) - o = QString::fromLatin1("Horizontal"); + o = TQString::fromLatin1("Horizontal"); else if( orientation() == Qt::Vertical ) - o = QString::fromLatin1("Vertical"); - config->writeEntry( QString::fromLatin1( "Orientation" ).prepend( prefix ), o ); + o = TQString::fromLatin1("Vertical"); + config->writeEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ), o ); //write docContainer - if (this == docContainer) config->writeEntry( QString::fromLatin1( "docContainer" ).prepend( prefix ), true ); + if (this == docContainer) config->writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true ); - if (m_pSecondChild == m_pActiveChild) config->writeEntry( QString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 1 ); - else config->writeEntry( QString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 0 ); + if (m_pSecondChild == m_pActiveChild) config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 1 ); + else config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 0 ); //write child configs if( firstChild() ) { - QString newPrefix = QString::fromLatin1( firstChild()->frameType() ) + QString::number(idSecond - 1); + TQString newPrefix = TQString::fromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1); newPrefix.append( '_' ); firstChild()->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + 1 ); } if( secondChild() ) { - QString newPrefix = QString::fromLatin1( secondChild()->frameType() ) + QString::number( idSecond ); + TQString newPrefix = TQString::fromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ); newPrefix.append( '_' ); secondChild()->saveConfig( config, newPrefix, saveURLs, docContainer, idSecond, depth + 1 ); } @@ -568,9 +568,9 @@ KonqFrameBase* KonqFrameContainer::otherChild( KonqFrameBase* child ) return 0L; } -void KonqFrameContainer::printFrameInfo( const QString& spaces ) +void KonqFrameContainer::printFrameInfo( const TQString& spaces ) { - kdDebug(1202) << spaces << "KonqFrameContainer " << this << " visible=" << QString("%1").arg(isVisible()) + kdDebug(1202) << spaces << "KonqFrameContainer " << this << " visible=" << TQString("%1").arg(isVisible()) << " activeChild=" << m_pActiveChild << endl; if (!m_pActiveChild) kdDebug(1202) << "WARNING: " << this << " has a null active child!" << endl; @@ -586,9 +586,9 @@ void KonqFrameContainer::printFrameInfo( const QString& spaces ) kdDebug(1202) << spaces << " Null child" << endl; } -void KonqFrameContainer::reparentFrame( QWidget* parent, const QPoint & p, bool showIt ) +void KonqFrameContainer::reparentFrame( TQWidget* parent, const TQPoint & p, bool showIt ) { - QWidget::reparent( parent, p, showIt ); + TQWidget::reparent( parent, p, showIt ); } void KonqFrameContainer::swapChildren() @@ -598,14 +598,14 @@ void KonqFrameContainer::swapChildren() m_pSecondChild = firstCh; } -void KonqFrameContainer::setTitle( const QString &title , QWidget* sender) +void KonqFrameContainer::setTitle( const TQString &title , TQWidget* sender) { //kdDebug(1202) << "KonqFrameContainer::setTitle( " << title << " , " << sender << " )" << endl; if (m_pParentContainer && activeChild() && (sender == activeChild()->widget())) m_pParentContainer->setTitle( title , this); } -void KonqFrameContainer::setTabIcon( const KURL &url, QWidget* sender ) +void KonqFrameContainer::setTabIcon( const KURL &url, TQWidget* sender ) { //kdDebug(1202) << "KonqFrameContainer::setTabIcon( " << url << " , " << sender << " )" << endl; if (m_pParentContainer && activeChild() && (sender == activeChild()->widget())) @@ -653,18 +653,18 @@ void KonqFrameContainer::removeChildFrame( KonqFrameBase * frame ) kdWarning(1202) << this << " Can't find this child:" << frame << endl; } -void KonqFrameContainer::childEvent( QChildEvent *c ) +void KonqFrameContainer::childEvent( TQChildEvent *c ) { // Child events cause layout changes. These are unnecassery if we are going // to be deleted anyway. if (!m_bAboutToBeDeleted) - QSplitter::childEvent(c); + TQSplitter::childEvent(c); } void KonqFrameContainer::setRubberband( int pos ) { emit setRubberbandCalled(); - QSplitter::setRubberband( pos ); + TQSplitter::setRubberband( pos ); } #include "konq_frame.moc" diff --git a/konqueror/konq_frame.h b/konqueror/konq_frame.h index 24ff77faa..3b8dd2f5e 100644 --- a/konqueror/konq_frame.h +++ b/konqueror/konq_frame.h @@ -21,12 +21,12 @@ #include "konq_factory.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -66,10 +66,10 @@ class KonqCheckBox : public QCheckBox { Q_OBJECT // for classname public: - KonqCheckBox(QWidget *parent=0, const char *name=0) - :QCheckBox( parent, name ) {} + KonqCheckBox(TQWidget *parent=0, const char *name=0) + :TQCheckBox( parent, name ) {} protected: - void drawButton( QPainter * ); + void drawButton( TQPainter * ); }; @@ -107,10 +107,10 @@ class KonqFrameStatusBar : public KStatusBar void slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *oldOne,KParts::ReadOnlyPart *newOne); void slotLoadingProgress( int percent ); void slotSpeedProgress( int bytesPerSecond ); - void slotDisplayStatusText(const QString& text); + void slotDisplayStatusText(const TQString& text); void slotClear(); - void message ( const QString & message ); + void message ( const TQString & message ); signals: /** @@ -124,9 +124,9 @@ class KonqFrameStatusBar : public KStatusBar void linkedViewClicked( bool mode ); protected: - virtual bool eventFilter(QObject*,QEvent *); - virtual void resizeEvent( QResizeEvent* ); - virtual void mousePressEvent( QMouseEvent* ); + virtual bool eventFilter(TQObject*,TQEvent *); + virtual void resizeEvent( TQResizeEvent* ); + virtual void mousePressEvent( TQMouseEvent* ); /** * Brings up the context menu for this frame */ @@ -135,44 +135,44 @@ class KonqFrameStatusBar : public KStatusBar /** * Takes care of the statusbars size **/ - virtual void fontChange(const QFont &oldFont); + virtual void fontChange(const TQFont &oldFont); private: KonqFrame* m_pParentKonqFrame; - QCheckBox *m_pLinkedViewCheckBox; + TQCheckBox *m_pLinkedViewCheckBox; KProgress *m_progressBar; KSqueezedTextLabel *m_pStatusLabel; - QLabel* m_led; - QString m_savedMessage; + TQLabel* m_led; + TQString m_savedMessage; }; -typedef QPtrList ChildViewList; +typedef TQPtrList ChildViewList; class KonqFrameBase { public: virtual ~KonqFrameBase() {} - virtual void saveConfig( KConfig* config, const QString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0) = 0; + virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0) = 0; virtual void copyHistory( KonqFrameBase *other ) = 0; - virtual void printFrameInfo( const QString& spaces ); + virtual void printFrameInfo( const TQString& spaces ); - virtual void reparentFrame( QWidget* parent, - const QPoint & p, bool showIt=FALSE ) = 0; + virtual void reparentFrame( TQWidget* parent, + const TQPoint & p, bool showIt=FALSE ) = 0; virtual KonqFrameContainerBase* parentContainer() { return m_pParentContainer; } virtual void setParentContainer(KonqFrameContainerBase* parent) { m_pParentContainer = parent; } - virtual void setTitle( const QString &title , QWidget* sender) = 0; - virtual void setTabIcon( const KURL &url, QWidget* sender ) = 0; + virtual void setTitle( const TQString &title , TQWidget* sender) = 0; + virtual void setTabIcon( const KURL &url, TQWidget* sender ) = 0; - virtual QWidget* widget() = 0; + virtual TQWidget* widget() = 0; virtual void listViews( ChildViewList *viewList ) = 0; - virtual QCString frameType() = 0; + virtual TQCString frameType() = 0; virtual void activateChild() = 0; @@ -196,12 +196,12 @@ protected: * widget of the layout */ -class KonqFrame : public QWidget, public KonqFrameBase +class KonqFrame : public TQWidget, public KonqFrameBase { Q_OBJECT public: - KonqFrame( QWidget* parent, KonqFrameContainerBase *parentContainer = 0L, + KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer = 0L, const char *name = 0L ); virtual ~KonqFrame(); @@ -215,7 +215,7 @@ public: * Filters the CTRL+Tab event from the views and emits ctrlTabPressed to make KonqMainWindow switch to the next view */ - virtual bool eventFilter(QObject*obj,QEvent *ev); + virtual bool eventFilter(TQObject*obj,TQEvent *ev); /** * Inserts the part's widget and the statusbar into the layout @@ -226,7 +226,7 @@ public: * Inserts a widget at the top of the part's widget, in the layout * (used for the find functionality) */ - void insertTopWidget( QWidget * widget ); + void insertTopWidget( TQWidget * widget ); /** * Returns the part that is currently connected to the Frame. @@ -242,22 +242,22 @@ public: void setView( KonqView* child ); virtual void listViews( ChildViewList *viewList ); - virtual void saveConfig( KConfig* config, const QString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 ); + virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 ); virtual void copyHistory( KonqFrameBase *other ); - virtual void printFrameInfo( const QString& spaces ); + virtual void printFrameInfo( const TQString& spaces ); - virtual void setTitle( const QString &title, QWidget* sender ); - virtual void setTabIcon( const KURL &url, QWidget* sender ); + virtual void setTitle( const TQString &title, TQWidget* sender ); + virtual void setTabIcon( const KURL &url, TQWidget* sender ); - virtual void reparentFrame(QWidget * parent, - const QPoint & p, bool showIt=FALSE ); + virtual void reparentFrame(TQWidget * parent, + const TQPoint & p, bool showIt=FALSE ); //virtual KonqFrameContainerBase* parentContainer(); - virtual QWidget* widget() { return this; } - virtual QCString frameType() { return QCString("View"); } + virtual TQWidget* widget() { return this; } + virtual TQCString frameType() { return TQCString("View"); } - QVBoxLayout *layout()const { return m_pLayout; } + TQVBoxLayout *layout()const { return m_pLayout; } KonqFrameStatusBar *statusbar() const { return m_pStatusBar; } @@ -265,7 +265,7 @@ public: KonqView* activeChildView() { return m_pView; } - QString title() const { return m_title; } + TQString title() const { return m_title; } public slots: @@ -282,19 +282,19 @@ public slots: void slotRemoveView(); protected: - virtual void paintEvent( QPaintEvent* ); + virtual void paintEvent( TQPaintEvent* ); - QVBoxLayout *m_pLayout; - QGuardedPtr m_pView; + TQVBoxLayout *m_pLayout; + TQGuardedPtr m_pView; - QGuardedPtr m_pPart; + TQGuardedPtr m_pPart; KonqViewManager* m_pViewManager; KSeparator *m_separator; KonqFrameStatusBar* m_pStatusBar; - QString m_title; + TQString m_title; }; class KonqFrameContainerBase : public KonqFrameBase @@ -312,12 +312,12 @@ public: virtual void removeChildFrame( KonqFrameBase * frame ) = 0; //inherited - virtual void printFrameInfo( const QString& spaces ); + virtual void printFrameInfo( const TQString& spaces ); - virtual QCString frameType() { return QCString("ContainerBase"); } + virtual TQCString frameType() { return TQCString("ContainerBase"); } - virtual void reparentFrame(QWidget * parent, - const QPoint & p, bool showIt=FALSE ) = 0; + virtual void reparentFrame(TQWidget * parent, + const TQPoint & p, bool showIt=FALSE ) = 0; virtual KonqFrameBase* activeChild() { return m_pActiveChild; } @@ -344,35 +344,35 @@ protected: * KonqFrameContainers or, as leaves, KonqFrames. */ -class KonqFrameContainer : public QSplitter, public KonqFrameContainerBase +class KonqFrameContainer : public TQSplitter, public KonqFrameContainerBase { Q_OBJECT friend class KonqFrame; //for emitting ctrlTabPressed() only, aleXXX public: KonqFrameContainer( Orientation o, - QWidget* parent, + TQWidget* parent, KonqFrameContainerBase* parentContainer, const char * name = 0); virtual ~KonqFrameContainer(); virtual void listViews( ChildViewList *viewList ); - virtual void saveConfig( KConfig* config, const QString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 ); + virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 ); virtual void copyHistory( KonqFrameBase *other ); KonqFrameBase* firstChild() { return m_pFirstChild; } KonqFrameBase* secondChild() { return m_pSecondChild; } KonqFrameBase* otherChild( KonqFrameBase* child ); - virtual void printFrameInfo( const QString& spaces ); + virtual void printFrameInfo( const TQString& spaces ); void swapChildren(); - virtual void setTitle( const QString &title, QWidget* sender ); - virtual void setTabIcon( const KURL &url, QWidget* sender ); + virtual void setTitle( const TQString &title, TQWidget* sender ); + virtual void setTabIcon( const KURL &url, TQWidget* sender ); - virtual QWidget* widget() { return this; } - virtual QCString frameType() { return QCString("Container"); } + virtual TQWidget* widget() { return this; } + virtual TQCString frameType() { return TQCString("Container"); } /** * Call this after inserting a new frame into the splitter. @@ -384,16 +384,16 @@ public: void removeChildFrame( KonqFrameBase * frame ); //inherited - virtual void reparentFrame(QWidget * parent, - const QPoint & p, bool showIt=FALSE ); + virtual void reparentFrame(TQWidget * parent, + const TQPoint & p, bool showIt=FALSE ); //make this one public - int idAfter( QWidget* w ){ return QSplitter::idAfter( w ); } + int idAfter( TQWidget* w ){ return TQSplitter::idAfter( w ); } void setAboutToBeDeleted() { m_bAboutToBeDeleted = true; } //inherited - virtual void childEvent( QChildEvent * ); + virtual void childEvent( TQChildEvent * ); signals: void ctrlTabPressed(); diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc index 7a3dbaca8..316c88254 100644 --- a/konqueror/konq_guiclients.cc +++ b/konqueror/konq_guiclients.cc @@ -37,18 +37,18 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow, m_mainWindow = mainWindow; - m_doc = QDomDocument( "kpartgui" ); - QDomElement root = m_doc.createElement( "kpartgui" ); + m_doc = TQDomDocument( "kpartgui" ); + TQDomElement root = m_doc.createElement( "kpartgui" ); root.setAttribute( "name", "konqueror" ); m_doc.appendChild( root ); - QDomElement menu = m_doc.createElement( "Menu" ); + TQDomElement menu = m_doc.createElement( "Menu" ); root.appendChild( menu ); menu.setAttribute( "name", "popupmenu" ); if ( !mainWindow->menuBar()->isVisible() ) { - QDomElement showMenuBarElement = m_doc.createElement( "action" ); + TQDomElement showMenuBarElement = m_doc.createElement( "action" ); showMenuBarElement.setAttribute( "name", "options_show_menubar" ); menu.appendChild( showMenuBarElement ); @@ -57,7 +57,7 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow, if ( mainWindow->fullScreenMode() ) { - QDomElement stopFullScreenElement = m_doc.createElement( "action" ); + TQDomElement stopFullScreenElement = m_doc.createElement( "action" ); stopFullScreenElement.setAttribute( "name", "fullscreen" ); menu.appendChild( stopFullScreenElement ); @@ -77,9 +77,9 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow, else if ( embeddingServices.count() > 1 ) { int idx = 0; - QDomElement subMenu = m_doc.createElement( "menu" ); + TQDomElement subMenu = m_doc.createElement( "menu" ); menu.appendChild( subMenu ); - QDomElement text = m_doc.createElement( "text" ); + TQDomElement text = m_doc.createElement( "text" ); subMenu.appendChild( text ); text.appendChild( m_doc.createTextNode( i18n( "Preview In" ) ) ); subMenu.setAttribute( "group", "preview" ); @@ -100,22 +100,22 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow, if ( doTabHandling ) { - QDomElement openInSameWindow = m_doc.createElement( "action" ); + TQDomElement openInSameWindow = m_doc.createElement( "action" ); openInSameWindow.setAttribute( "name", "sameview" ); openInSameWindow.setAttribute( "group", "tabhandling" ); menu.appendChild( openInSameWindow ); - QDomElement openInWindow = m_doc.createElement( "action" ); + TQDomElement openInWindow = m_doc.createElement( "action" ); openInWindow.setAttribute( "name", "newview" ); openInWindow.setAttribute( "group", "tabhandling" ); menu.appendChild( openInWindow ); - QDomElement openInTabElement = m_doc.createElement( "action" ); + TQDomElement openInTabElement = m_doc.createElement( "action" ); openInTabElement.setAttribute( "name", "openintab" ); openInTabElement.setAttribute( "group", "tabhandling" ); menu.appendChild( openInTabElement ); - QDomElement separatorElement = m_doc.createElement( "separator" ); + TQDomElement separatorElement = m_doc.createElement( "separator" ); separatorElement.setAttribute( "group", "tabhandling" ); menu.appendChild( separatorElement ); } @@ -129,7 +129,7 @@ PopupMenuGUIClient::~PopupMenuGUIClient() { } -KAction *PopupMenuGUIClient::action( const QDomElement &element ) const +KAction *PopupMenuGUIClient::action( const TQDomElement &element ) const { KAction *res = KXMLGUIClient::action( element ); @@ -139,24 +139,24 @@ KAction *PopupMenuGUIClient::action( const QDomElement &element ) const return res; } -void PopupMenuGUIClient::addEmbeddingService( QDomElement &menu, int idx, const QString &name, const KService::Ptr &service ) +void PopupMenuGUIClient::addEmbeddingService( TQDomElement &menu, int idx, const TQString &name, const KService::Ptr &service ) { - QDomElement action = m_doc.createElement( "action" ); + TQDomElement action = m_doc.createElement( "action" ); menu.appendChild( action ); - QCString actName; + TQCString actName; actName.setNum( idx ); - action.setAttribute( "name", QString::number( idx ) ); + action.setAttribute( "name", TQString::number( idx ) ); action.setAttribute( "group", "preview" ); (void)new KAction( name, service->pixmap( KIcon::Small ), 0, - m_mainWindow, SLOT( slotOpenEmbedded() ), actionCollection(), actName ); + m_mainWindow, TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName ); } ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) -: QObject( mainWindow ) +: TQObject( mainWindow ) { m_mainWindow = mainWindow; m_actions.setAutoDelete( true ); @@ -165,8 +165,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) KTrader::OfferList::Iterator it = offers.begin(); while ( it != offers.end() ) { - QVariant prop = (*it)->property( "X-KDE-BrowserView-Toggable" ); - QVariant orientation = (*it)->property( "X-KDE-BrowserView-ToggableView-Orientation" ); + TQVariant prop = (*it)->property( "X-KDE-BrowserView-Toggable" ); + TQVariant orientation = (*it)->property( "X-KDE-BrowserView-ToggableView-Orientation" ); if ( !prop.isValid() || !prop.toBool() || !orientation.isValid() || orientation.toString().isEmpty() ) @@ -187,8 +187,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) KTrader::OfferList::ConstIterator cEnd = offers.end(); for (; cIt != cEnd; ++cIt ) { - QString description = i18n( "Show %1" ).arg( (*cIt)->name() ); - QString name = (*cIt)->desktopEntryName(); + TQString description = i18n( "Show %1" ).arg( (*cIt)->name() ); + TQString name = (*cIt)->desktopEntryName(); //kdDebug(1202) << "ToggleViewGUIClient: name=" << name << endl; KToggleAction *action = new KToggleAction( description, 0, mainWindow->actionCollection(), name.latin1() ); action->setCheckedState( i18n( "Hide %1" ).arg( (*cIt)->name() ) ); @@ -197,31 +197,31 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) if ( (*cIt)->icon() != "unknown" ) action->setIcon( (*cIt)->icon() ); - connect( action, SIGNAL( toggled( bool ) ), - this, SLOT( slotToggleView( bool ) ) ); + connect( action, TQT_SIGNAL( toggled( bool ) ), + this, TQT_SLOT( slotToggleView( bool ) ) ); m_actions.insert( name, action ); - QVariant orientation = (*cIt)->property( "X-KDE-BrowserView-ToggableView-Orientation" ); + TQVariant orientation = (*cIt)->property( "X-KDE-BrowserView-ToggableView-Orientation" ); bool horizontal = orientation.toString().lower() == "horizontal"; m_mapOrientation.insert( name, horizontal ); } - connect( m_mainWindow, SIGNAL( viewAdded( KonqView * ) ), - this, SLOT( slotViewAdded( KonqView * ) ) ); - connect( m_mainWindow, SIGNAL( viewRemoved( KonqView * ) ), - this, SLOT( slotViewRemoved( KonqView * ) ) ); + connect( m_mainWindow, TQT_SIGNAL( viewAdded( KonqView * ) ), + this, TQT_SLOT( slotViewAdded( KonqView * ) ) ); + connect( m_mainWindow, TQT_SIGNAL( viewRemoved( KonqView * ) ), + this, TQT_SLOT( slotViewRemoved( KonqView * ) ) ); } ToggleViewGUIClient::~ToggleViewGUIClient() { } -QPtrList ToggleViewGUIClient::actions() const +TQPtrList ToggleViewGUIClient::actions() const { - QPtrList res; + TQPtrList res; - QDictIterator it( m_actions ); + TQDictIterator it( m_actions ); for (; it.current(); ++it ) res.append( it.current() ); @@ -230,7 +230,7 @@ QPtrList ToggleViewGUIClient::actions() const void ToggleViewGUIClient::slotToggleView( bool toggle ) { - QString serviceName = QString::fromLatin1( sender()->name() ); + TQString serviceName = TQString::fromLatin1( sender()->name() ); bool horizontal = m_mapOrientation[ serviceName ]; @@ -240,11 +240,11 @@ void ToggleViewGUIClient::slotToggleView( bool toggle ) { KonqView *childView = viewManager->splitWindow( horizontal ? Qt::Vertical : Qt::Horizontal, - QString::fromLatin1( "Browser/View" ), + TQString::fromLatin1( "Browser/View" ), serviceName, !horizontal /* vertical = make it first */); - QValueList newSplitterSizes; + TQValueList newSplitterSizes; if ( horizontal ) newSplitterSizes << 100 << 30; @@ -265,7 +265,7 @@ void ToggleViewGUIClient::slotToggleView( bool toggle ) #if 0 // already done by splitWindow if ( m_mainWindow->currentView() ) { - QString locBarURL = m_mainWindow->currentView()->url().prettyURL(); // default one in case it doesn't set it + TQString locBarURL = m_mainWindow->currentView()->url().prettyURL(); // default one in case it doesn't set it childView->openURL( m_mainWindow->currentView()->url(), locBarURL ); } #endif @@ -282,11 +282,11 @@ void ToggleViewGUIClient::slotToggleView( bool toggle ) } else { - QPtrList viewList; + TQPtrList viewList; m_mainWindow->listViews( &viewList ); - QPtrListIterator it( viewList ); + TQPtrListIterator it( viewList ); for (; it.current(); ++it ) if ( it.current()->service()->desktopEntryName() == serviceName ) // takes care of choosing the new active view, and also calls slotViewRemoved @@ -296,13 +296,13 @@ void ToggleViewGUIClient::slotToggleView( bool toggle ) } -void ToggleViewGUIClient::saveConfig( bool add, const QString &serviceName ) +void ToggleViewGUIClient::saveConfig( bool add, const TQString &serviceName ) { // This is used on konqueror's startup....... so it's never used, since // the K menu only contains calls to kfmclient...... // Well, it could be useful again in the future. // Currently, the profiles save this info. - QStringList toggableViewsShown = KonqSettings::toggableViewsShown(); + TQStringList toggableViewsShown = KonqSettings::toggableViewsShown(); if (add) { if ( !toggableViewsShown.contains( serviceName ) ) @@ -315,7 +315,7 @@ void ToggleViewGUIClient::saveConfig( bool add, const QString &serviceName ) void ToggleViewGUIClient::slotViewAdded( KonqView *view ) { - QString name = view->service()->desktopEntryName(); + TQString name = view->service()->desktopEntryName(); KAction *action = m_actions[ name ]; @@ -327,9 +327,9 @@ void ToggleViewGUIClient::slotViewAdded( KonqView *view ) // KonqView::isToggleView() is not set yet.. so just check for the orientation #if 0 - QVariant vert = view->service()->property( "X-KDE-BrowserView-ToggableView-Orientation"); + TQVariant vert = view->service()->property( "X-KDE-BrowserView-ToggableView-Orientation"); bool vertical = vert.toString().lower() == "vertical"; - QVariant nohead = view->service()->property( "X-KDE-BrowserView-ToggableView-NoHeader"); + TQVariant nohead = view->service()->property( "X-KDE-BrowserView-ToggableView-NoHeader"); bool noheader = nohead.isValid() ? nohead.toBool() : false; // if it is a vertical toggle part, turn on the header. // this works even when konq loads the view from a profile. @@ -344,7 +344,7 @@ void ToggleViewGUIClient::slotViewAdded( KonqView *view ) void ToggleViewGUIClient::slotViewRemoved( KonqView *view ) { - QString name = view->service()->desktopEntryName(); + TQString name = view->service()->desktopEntryName(); KAction *action = m_actions[ name ]; diff --git a/konqueror/konq_guiclients.h b/konqueror/konq_guiclients.h index 3e34d3ee5..6dc31b7e9 100644 --- a/konqueror/konq_guiclients.h +++ b/konqueror/konq_guiclients.h @@ -21,8 +21,8 @@ #define __konq_guiclients_h__ #include -#include -#include +#include +#include #include class KAction; @@ -59,14 +59,14 @@ public: bool isIntoTrash, bool doTabHandling ); virtual ~PopupMenuGUIClient(); - virtual KAction *action( const QDomElement &element ) const; + virtual KAction *action( const TQDomElement &element ) const; private: - void addEmbeddingService( QDomElement &menu, int idx, const QString &name, const KService::Ptr &service ); + void addEmbeddingService( TQDomElement &menu, int idx, const TQString &name, const KService::Ptr &service ); KonqMainWindow *m_mainWindow; - QDomDocument m_doc; + TQDomDocument m_doc; }; class ToggleViewGUIClient : public QObject @@ -78,10 +78,10 @@ public: bool empty() const { return m_empty; } - QPtrList actions() const; - KAction *action( const QString &name ) { return m_actions[ name ]; } + TQPtrList actions() const; + KAction *action( const TQString &name ) { return m_actions[ name ]; } - void saveConfig( bool add, const QString &serviceName ); + void saveConfig( bool add, const TQString &serviceName ); private slots: void slotToggleView( bool toggle ); @@ -89,9 +89,9 @@ private slots: void slotViewRemoved( KonqView *view ); private: KonqMainWindow *m_mainWindow; - QDict m_actions; + TQDict m_actions; bool m_empty; - QMap m_mapOrientation; + TQMap m_mapOrientation; }; #endif diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc index e64016ed9..3f3e47bc3 100644 --- a/konqueror/konq_main.cc +++ b/konqueror/konq_main.cc @@ -32,9 +32,9 @@ #include #include #include -#include +#include -#include +#include static const KCmdLineOptions options[] = { @@ -75,8 +75,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) int n = 1; while ( KonqMainWindow::canBeRestored( n ) ) { - QString className = KMainWindow::classNameOfToplevel( n ); - if( className == QString::fromLatin1( "KonqMainWindow" )) + TQString className = KMainWindow::classNameOfToplevel( n ); + if( className == TQString::fromLatin1( "KonqMainWindow" )) (new KonqMainWindow( KURL(), false ) )->restore( n ); else kdWarning() << "Unknown class " << className << " in session saved data!" << endl; @@ -87,34 +87,34 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) { if (args->isSet("profiles")) { - QStringList profiles = KGlobal::dirs()->findAllResources("data", "konqueror/profiles/*", false, true); + TQStringList profiles = KGlobal::dirs()->findAllResources("data", "konqueror/profiles/*", false, true); profiles.sort(); - for(QStringList::ConstIterator it = profiles.begin(); + for(TQStringList::ConstIterator it = profiles.begin(); it != profiles.end(); ++it) { - QString file = *it; + TQString file = *it; file = file.mid(file.findRev('/')+1); - printf("%s\n", QFile::encodeName(file).data()); + printf("%s\n", TQFile::encodeName(file).data()); } return 0; } if (args->isSet("profile")) { - QString profile = QString::fromLocal8Bit(args->getOption("profile")); - QString profilePath = profile; + TQString profile = TQString::fromLocal8Bit(args->getOption("profile")); + TQString profilePath = profile; if (profile[0] != '/') - profilePath = locate( "data", QString::fromLatin1("konqueror/profiles/")+profile ); - QString url; - QStringList filesToSelect; + profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ); + TQString url; + TQStringList filesToSelect; if (args->count() == 1) - url = QString::fromLocal8Bit(args->arg(0)); + url = TQString::fromLocal8Bit(args->arg(0)); KURL kurl(url); KParts::URLArgs urlargs; if (args->isSet("mimetype")) - urlargs.serviceType = QString::fromLocal8Bit(args->getOption("mimetype")); + urlargs.serviceType = TQString::fromLocal8Bit(args->getOption("mimetype")); if (args->isSet("select")) { - QString fn = kurl.fileName(false); + TQString fn = kurl.fileName(false); if( !fn.isEmpty() ){ filesToSelect += fn; kurl.setFileName(""); @@ -149,8 +149,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) else if (!args->isSet("silent")) { // By default try to open in webbrowser mode. People can use "konqueror ." to get a filemanager. - QString profile = "webbrowsing"; - QString profilePath = locate( "data", QString::fromLatin1("konqueror/profiles/")+profile ); + TQString profile = "webbrowsing"; + TQString profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ); if ( !profilePath.isEmpty() ) { KonqMisc::createBrowserWindowFromProfile( profilePath, profile ); } else { @@ -169,23 +169,23 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) // KonqMisc::konqFilteredURL doesn't cope with local files... A bit of hackery below KURL url = args->url(i); KURL urlToOpen; - QStringList filesToSelect; + TQStringList filesToSelect; - if (url.isLocalFile() && QFile::exists(url.path())) // "konqueror index.html" + if (url.isLocalFile() && TQFile::exists(url.path())) // "konqueror index.html" urlToOpen = url; else - urlToOpen = KURL( KonqMisc::konqFilteredURL(0L, QString::fromLocal8Bit(args->arg(i))) ); // "konqueror slashdot.org" + urlToOpen = KURL( KonqMisc::konqFilteredURL(0L, TQString::fromLocal8Bit(args->arg(i))) ); // "konqueror slashdot.org" if ( !mainwin ) { KParts::URLArgs urlargs; if (args->isSet("mimetype")) { - urlargs.serviceType = QString::fromLocal8Bit(args->getOption("mimetype")); + urlargs.serviceType = TQString::fromLocal8Bit(args->getOption("mimetype")); kdDebug(1202) << "main() : setting serviceType to " << urlargs.serviceType << endl; } if (args->isSet("select")) { - QString fn = urlToOpen.fileName(false); + TQString fn = urlToOpen.fileName(false); if( !fn.isEmpty() ){ filesToSelect += fn; urlToOpen.setFileName(""); diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index e2e516b39..c6a9bb742 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -59,13 +59,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -117,13 +117,13 @@ #include #include -template class QPtrList; -template class QPtrList; +template class TQPtrList; +template class TQPtrList; -QPtrList *KonqMainWindow::s_lstViews = 0; +TQPtrList *KonqMainWindow::s_lstViews = 0; KConfig * KonqMainWindow::s_comboConfig = 0; KCompletion * KonqMainWindow::s_pCompletion = 0; -QFile * KonqMainWindow::s_crashlog_file = 0; +TQFile * KonqMainWindow::s_crashlog_file = 0; bool KonqMainWindow::s_preloaded = false; KonqMainWindow* KonqMainWindow::s_preloadedWindow = 0; int KonqMainWindow::s_initialMemoryUsage = -1; @@ -141,13 +141,13 @@ KonqExtendedBookmarkOwner::KonqExtendedBookmarkOwner(KonqMainWindow *w) m_pKonqMainWindow = w; } -KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, const char *name, const QString& xmluiFile) +KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, const char *name, const TQString& xmluiFile) : KParts::MainWindow( NoDCOPObject, 0L, name, WDestructiveClose | WStyle_ContextHelp | Qt::WGroupLeader ) { setPreloadedFlag( false ); if ( !s_lstViews ) - s_lstViews = new QPtrList; + s_lstViews = new TQPtrList; s_lstViews->append( this ); @@ -188,9 +188,9 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con KonqExtendedBookmarkOwner *extOwner = new KonqExtendedBookmarkOwner( this ); m_pBookmarksOwner = extOwner; connect( extOwner, - SIGNAL( signalFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ), + TQT_SIGNAL( signalFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ), extOwner, - SLOT( slotFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ) ); + TQT_SLOT( slotFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ) ); // init history-manager, load history, get completion object if ( !s_pCompletion ) { @@ -203,7 +203,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con int mode = KonqSettings::settingsCompletionMode(); s_pCompletion->setCompletionMode( (KGlobalSettings::Completion) mode ); } - connect(KParts::HistoryProvider::self(), SIGNAL(cleared()), SLOT(slotClearComboHistory())); + connect(KParts::HistoryProvider::self(), TQT_SIGNAL(cleared()), TQT_SLOT(slotClearComboHistory())); KonqPixmapProvider *prov = KonqPixmapProvider::self(); if ( !s_comboConfig ) { @@ -212,17 +212,17 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con s_comboConfig->setGroup( "Location Bar" ); prov->load( s_comboConfig, "ComboIconCache" ); } - connect( prov, SIGNAL( changed() ), SLOT( slotIconsChanged() ) ); + connect( prov, TQT_SIGNAL( changed() ), TQT_SLOT( slotIconsChanged() ) ); initCombo(); initActions(); setInstance( KGlobal::instance() ); - connect( KSycoca::self(), SIGNAL( databaseChanged() ), - this, SLOT( slotDatabaseChanged() ) ); + connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), + this, TQT_SLOT( slotDatabaseChanged() ) ); - connect( kapp, SIGNAL( kdisplayFontChanged()), SLOT(slotReconfigure())); + connect( kapp, TQT_SIGNAL( kdisplayFontChanged()), TQT_SLOT(slotReconfigure())); //load the xmlui file specified in the profile or the default konqueror.rc setXMLFile( xmluiFile ); @@ -231,10 +231,10 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con createGUI( 0L ); - connect(toolBarMenuAction(),SIGNAL(activated()),this,SLOT(slotForceSaveMainWindowSettings()) ); + connect(toolBarMenuAction(),TQT_SIGNAL(activated()),this,TQT_SLOT(slotForceSaveMainWindowSettings()) ); if ( !m_toggleViewGUIClient->empty() ) - plugActionList( QString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); + plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); else { delete m_toggleViewGUIClient; @@ -242,10 +242,10 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con } // Those menus are created by konqueror.rc so their address will never change - QPopupMenu *popup = static_cast(factory()->container("edit",this)); + TQPopupMenu *popup = static_cast(factory()->container("edit",this)); if (popup) KAcceleratorManager::manage(popup); - popup = static_cast(factory()->container("tools",this)); + popup = static_cast(factory()->container("tools",this)); if (popup) KAcceleratorManager::manage(popup); @@ -257,8 +257,8 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con KonqUndoManager::incRef(); - connect( KonqUndoManager::self(), SIGNAL( undoAvailable( bool ) ), - this, SLOT( slotUndoAvailable( bool ) ) ); + connect( KonqUndoManager::self(), TQT_SIGNAL( undoAvailable( bool ) ), + this, TQT_SLOT( slotUndoAvailable( bool ) ) ); m_bNeedApplyKonqMainWindowSettings = true; if ( !initialURL.isEmpty() ) @@ -268,7 +268,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con else if ( openInitialURL ) { KURL homeURL; - homeURL.setPath( QDir::homeDirPath() ); + homeURL.setPath( TQDir::homeDirPath() ); openURL( 0L, homeURL ); } else @@ -339,12 +339,12 @@ KonqMainWindow::~KonqMainWindow() kdDebug(1202) << "KonqMainWindow::~KonqMainWindow " << this << " done" << endl; } -QWidget * KonqMainWindow::createContainer( QWidget *parent, int index, const QDomElement &element, int &id ) +TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id ) { - static QString nameBookmarkBar = QString::fromLatin1( "bookmarkToolBar" ); - static QString tagToolBar = QString::fromLatin1( "ToolBar" ); + static TQString nameBookmarkBar = TQString::fromLatin1( "bookmarkToolBar" ); + static TQString tagToolBar = TQString::fromLatin1( "ToolBar" ); - QWidget *res = KParts::MainWindow::createContainer( parent, index, element, id ); + TQWidget *res = KParts::MainWindow::createContainer( parent, index, element, id ); if ( res && (element.tagName() == tagToolBar) && (element.attribute( "name" ) == nameBookmarkBar) ) { @@ -362,8 +362,8 @@ QWidget * KonqMainWindow::createContainer( QWidget *parent, int index, const QDo m_bookmarkBarActionCollection = new KActionCollection( this ); m_bookmarkBarActionCollection->setHighlightingEnabled( true ); connectActionCollection( m_bookmarkBarActionCollection ); - DelayedInitializer *initializer = new DelayedInitializer( QEvent::Show, res ); - connect( initializer, SIGNAL( initialize() ), this, SLOT(initBookmarkBar()) ); + DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, res ); + connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT(initBookmarkBar()) ); } } @@ -379,21 +379,21 @@ void KonqMainWindow::initBookmarkBar() delete m_paBookmarkBar; m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, this ); connect( m_paBookmarkBar, - SIGNAL( aboutToShowContextMenu(const KBookmark &, QPopupMenu*) ), - this, SLOT( slotFillContextMenu(const KBookmark &, QPopupMenu*) )); + TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ), + this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) )); connect( m_paBookmarkBar, - SIGNAL( openBookmark(const QString &, Qt::ButtonState) ), - this, SLOT( slotOpenBookmarkURL(const QString &, Qt::ButtonState) )); + TQT_SIGNAL( openBookmark(const TQString &, Qt::ButtonState) ), + this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, Qt::ButtonState) )); // hide if empty if (bar->count() == 0 ) bar->hide(); } -void KonqMainWindow::removeContainer( QWidget *container, QWidget *parent, QDomElement &element, int id ) +void KonqMainWindow::removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id ) { - static QString nameBookmarkBar = QString::fromLatin1( "bookmarkToolBar" ); - static QString tagToolBar = QString::fromLatin1( "ToolBar" ); + static TQString nameBookmarkBar = TQString::fromLatin1( "bookmarkToolBar" ); + static TQString tagToolBar = TQString::fromLatin1( "ToolBar" ); if ( element.tagName() == tagToolBar && element.attribute( "name" ) == nameBookmarkBar ) { @@ -409,29 +409,29 @@ void KonqMainWindow::removeContainer( QWidget *container, QWidget *parent, QDomE // Note that KShortURIFilter does the same, but we have no way of getting it from there // // Note: this removes the filter from the URL. -static QString detectNameFilter( KURL & url ) +static TQString detectNameFilter( KURL & url ) { if ( !KProtocolInfo::supportsListing(url) ) - return QString::null; + return TQString::null; // Look for wildcard selection - QString nameFilter; - QString path = url.path(); + TQString nameFilter; + TQString path = url.path(); int lastSlash = path.findRev( '/' ); if ( lastSlash > -1 ) { if ( !url.query().isEmpty() && lastSlash == (int)path.length()-1 ) { // In /tmp/?foo, foo isn't a query path += url.query(); // includes the '?' - url.setQuery( QString::null ); + url.setQuery( TQString::null ); } - const QString fileName = path.mid( lastSlash + 1 ); + const TQString fileName = path.mid( lastSlash + 1 ); if ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 ) { // Check that a file or dir with all the special chars in the filename doesn't exist - if ( url.isLocalFile() ? !QFile::exists( path ) : !KIO::NetAccess::exists( url, false, 0 ) ) + if ( url.isLocalFile() ? !TQFile::exists( path ) : !KIO::NetAccess::exists( url, false, 0 ) ) { nameFilter = fileName; - url.setFileName( QString::null ); + url.setFileName( TQString::null ); kdDebug(1202) << "Found wildcard. nameFilter=" << nameFilter << " New url=" << url << endl; } } @@ -440,7 +440,7 @@ static QString detectNameFilter( KURL & url ) return nameFilter; } -void KonqMainWindow::openFilteredURL( const QString & url, KonqOpenURLRequest & req ) +void KonqMainWindow::openFilteredURL( const TQString & url, KonqOpenURLRequest & req ) { // Filter URL to build a correct one if (m_currentDir.isEmpty() && m_currentView) @@ -452,9 +452,9 @@ void KonqMainWindow::openFilteredURL( const QString & url, KonqOpenURLRequest & if ( filteredURL.isEmpty() ) // initially empty, or error (e.g. ~unknown_user) return; - m_currentDir = QString::null; + m_currentDir = TQString::null; - openURL( 0L, filteredURL, QString::null, req ); + openURL( 0L, filteredURL, TQString::null, req ); // #4070: Give focus to view after URL was entered manually // Note: we do it here if the view mode (i.e. part) wasn't changed @@ -464,7 +464,7 @@ void KonqMainWindow::openFilteredURL( const QString & url, KonqOpenURLRequest & } -void KonqMainWindow::openFilteredURL( const QString & _url, bool inNewTab, bool tempFile ) +void KonqMainWindow::openFilteredURL( const TQString & _url, bool inNewTab, bool tempFile ) { KonqOpenURLRequest req( _url ); req.newTab = inNewTab; @@ -475,7 +475,7 @@ void KonqMainWindow::openFilteredURL( const QString & _url, bool inNewTab, bool } void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, - const QString &_serviceType, KonqOpenURLRequest& req, + const TQString &_serviceType, KonqOpenURLRequest& req, bool trustedSource ) { #ifndef NDEBUG // needed for req.debug() @@ -485,7 +485,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, #endif KURL url( _url ); - QString serviceType( _serviceType ); + TQString serviceType( _serviceType ); if ( url.url() == "about:blank" ) { serviceType = "text/html"; @@ -501,11 +501,11 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, return; } - QString nameFilter = detectNameFilter( url ); + TQString nameFilter = detectNameFilter( url ); if ( !nameFilter.isEmpty() ) { req.nameFilter = nameFilter; - url.setFileName( QString::null ); + url.setFileName( TQString::null ); } KonqView *view = _view; @@ -518,8 +518,8 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, if ( !view && !req.newTab ) view = m_currentView; /* Note, this can be 0L, e.g. on startup */ else if ( !view && req.newTab ) { - view = m_pViewManager->addTab(QString::null, - QString::null, + view = m_pViewManager->addTab(TQString::null, + TQString::null, false, req.openAfterCurrentPage); if (view) { @@ -537,7 +537,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, req.newTab = false; } - const QString oldLocationBarURL = m_combo->currentText(); + const TQString oldLocationBarURL = m_combo->currentText(); if ( view ) { if ( view == m_currentView ) @@ -555,7 +555,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, // Fast mode for local files: do the stat ourselves instead of letting KRun do it. if ( serviceType.isEmpty() && url.isLocalFile() ) { - QCString _path( QFile::encodeName(url.path())); + TQCString _path( TQFile::encodeName(url.path())); KDE_struct_stat buff; if ( KDE_stat( _path.data(), &buff ) != -1 ) serviceType = KMimeType::findByURL( url, buff.st_mode )->name(); @@ -586,12 +586,12 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, if ( !url.isLocalFile() && KonqRun::isTextExecutable( serviceType ) ) serviceType = "text/plain"; // view, don't execute // Remote URL: save or open ? - QString protClass = KProtocolInfo::protocolClass(url.protocol()); + TQString protClass = KProtocolInfo::protocolClass(url.protocol()); bool open = url.isLocalFile() || protClass==":local"; if ( !open ) { KParts::BrowserRun::AskSaveResult res = KonqRun::askSave( url, offer, serviceType ); if ( res == KParts::BrowserRun::Save ) - KParts::BrowserRun::simpleSave( url, QString::null, this ); + KParts::BrowserRun::simpleSave( url, TQString::null, this ); open = ( res == KParts::BrowserRun::Open ); } if ( open ) @@ -638,16 +638,16 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, if ( view == m_currentView ) startAnimation(); - connect( run, SIGNAL( finished() ), this, SLOT( slotRunFinished() ) ); + connect( run, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotRunFinished() ) ); } } -bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView *childView, KonqOpenURLRequest& req ) +bool KonqMainWindow::openView( TQString serviceType, const KURL &_url, KonqView *childView, KonqOpenURLRequest& req ) { // Second argument is referring URL if ( !kapp->authorizeURLAction("open", childView ? childView->url() : KURL(), _url) ) { - QString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, _url.prettyURL()); + TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, _url.prettyURL()); KMessageBox::queuedMessageBox( this, KMessageBox::Error, msg ); return true; // Nothing else to do. } @@ -685,7 +685,7 @@ bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView * return bOthersFollowed; } - QString indexFile; + TQString indexFile; KURL url( _url ); @@ -697,7 +697,7 @@ bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView * KServiceType::Ptr ptr = KServiceType::serviceType( serviceType ); if ( ptr ) { - const QString protocol = ptr->property("X-KDE-LocalProtocol").toString(); + const TQString protocol = ptr->property("X-KDE-LocalProtocol").toString(); if ( !protocol.isEmpty() && KonqFMSettings::settings()->shouldEmbed( serviceType ) ) { url.setProtocol( protocol ); @@ -721,7 +721,7 @@ bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView * // to still display the original URL (so that 'up' uses that URL, // and since that's what the user entered). // changeViewMode will take care of setting and storing that url. - QString originalURL = url.pathOrURL(); + TQString originalURL = url.pathOrURL(); if ( !req.nameFilter.isEmpty() ) // keep filter in location bar { if (!originalURL.endsWith("/")) @@ -729,18 +729,18 @@ bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView * originalURL += req.nameFilter; } - QString serviceName; // default: none provided + TQString serviceName; // default: none provided if ( url.url().startsWith("about:konqueror") || url.url() == "about:plugins" ) { serviceType = "KonqAboutPage"; // not KParts/ReadOnlyPart, it fills the Location menu ! :) serviceName = "konq_aboutpage"; - originalURL = req.typedURL.isEmpty() ? QString::null : url.url(); + originalURL = req.typedURL.isEmpty() ? TQString::null : url.url(); // empty if from profile, about:konqueror if the user typed it (not req.typedURL, it could be "about:") } else if ( url.url() == "about:blank" && req.typedURL.isEmpty() ) { - originalURL = QString::null; + originalURL = TQString::null; } // Look for which view mode to use, if a directory - not if view locked @@ -758,7 +758,7 @@ bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView * KURL urlDotDir( url ); urlDotDir.addPath(".directory"); bool HTMLAllowed = m_bHTMLAllowed; - QFile f( urlDotDir.path() ); + TQFile f( urlDotDir.path() ); if ( f.open(IO_ReadOnly) ) { f.close(); @@ -769,12 +769,12 @@ bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView * kdDebug(1202) << "serviceName=" << serviceName << endl; } if ( HTMLAllowed && - ( ( indexFile = findIndexFile( url.path() ) ) != QString::null ) ) + ( ( indexFile = findIndexFile( url.path() ) ) != TQString::null ) ) { serviceType = "text/html"; url = KURL(); url.setPath( indexFile ); - serviceName = QString::null; // cancel what we just set, this is not a dir finally + serviceName = TQString::null; // cancel what we just set, this is not a dir finally } // Reflect this setting in the menu @@ -826,7 +826,7 @@ bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView * return false; // It didn't work out. childView->setViewName( m_initialFrameName.isEmpty() ? req.args.frameName : m_initialFrameName ); - m_initialFrameName = QString::null; + m_initialFrameName = TQString::null; } else // We know the child view { @@ -848,7 +848,7 @@ bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView * // So (if embedding would succeed, hence the checks above) we ask the user // Otherwise the user will get asked 'open or save' in openURL anyway. if ( ok && !forceAutoEmbed && !KProtocolInfo::supportsWriting( url ) ) { - QString suggestedFilename; + TQString suggestedFilename; KonqRun* run = childView->run(); int attachment = 0; @@ -898,14 +898,14 @@ void KonqMainWindow::slotOpenURLRequest( const KURL &url, const KParts::URLArgs kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl; KParts::ReadOnlyPart *callingPart = static_cast( sender()->parent() ); - QString frameName = args.frameName; + TQString frameName = args.frameName; if ( !frameName.isEmpty() ) { - static QString _top = QString::fromLatin1( "_top" ); - static QString _self = QString::fromLatin1( "_self" ); - static QString _parent = QString::fromLatin1( "_parent" ); - static QString _blank = QString::fromLatin1( "_blank" ); + static TQString _top = TQString::fromLatin1( "_top" ); + static TQString _self = TQString::fromLatin1( "_self" ); + static TQString _parent = TQString::fromLatin1( "_parent" ); + static TQString _blank = TQString::fromLatin1( "_blank" ); if ( frameName.lower() == _blank ) { @@ -960,7 +960,7 @@ void KonqMainWindow::openURL( KonqView *childView, const KURL &url, const KParts if ( !args.doPost() && !args.reload && childView && urlcmp( url.url(), childView->url().url(), true, true ) ) { - QString serviceType = args.serviceType; + TQString serviceType = args.serviceType; if ( serviceType.isEmpty() ) serviceType = childView->serviceType(); @@ -975,12 +975,12 @@ void KonqMainWindow::openURL( KonqView *childView, const KURL &url, const KParts openURL( childView, url, args.serviceType, req, args.trustedSource ); } -QObject *KonqMainWindow::lastFrame( KonqView *view ) +TQObject *KonqMainWindow::lastFrame( KonqView *view ) { - QObject *nextFrame, *viewFrame; + TQObject *nextFrame, *viewFrame; nextFrame = view->frame(); viewFrame = 0; - while ( nextFrame != 0 && ! nextFrame->inherits( "QWidgetStack" ) ) { + while ( nextFrame != 0 && ! nextFrame->inherits( "TQWidgetStack" ) ) { viewFrame = nextFrame; nextFrame = nextFrame->parent(); } @@ -989,7 +989,7 @@ QObject *KonqMainWindow::lastFrame( KonqView *view ) // Linked-views feature, plus "sidebar follows URL opened in the active view" feature bool KonqMainWindow::makeViewsFollow( const KURL & url, const KParts::URLArgs &args, - const QString & serviceType, KonqView * senderView ) + const TQString & serviceType, KonqView * senderView ) { if ( !senderView->isLinkedView() && senderView != m_currentView ) return false; // none of those features apply -> return @@ -1001,13 +1001,13 @@ bool KonqMainWindow::makeViewsFollow( const KURL & url, const KParts::URLArgs &a req.args = args; // We can't iterate over the map here, and openURL for each, because the map can get modified // (e.g. by part changes). Better copy the views into a list. - QPtrList listViews; + TQPtrList listViews; MapViews::ConstIterator it = m_mapViews.begin(); MapViews::ConstIterator end = m_mapViews.end(); for (; it != end; ++it ) listViews.append( it.data() ); - QObject *senderFrame = lastFrame( senderView ); + TQObject *senderFrame = lastFrame( senderView ); for ( KonqView * view = listViews.first() ; view ; view = listViews.next()) { @@ -1015,7 +1015,7 @@ bool KonqMainWindow::makeViewsFollow( const KURL & url, const KParts::URLArgs &a // Views that should follow this URL as both views are linked if ( (view != senderView) && view->isLinkedView() && senderView->isLinkedView() ) { - QObject *viewFrame = lastFrame( view ); + TQObject *viewFrame = lastFrame( view ); // Only views in the same tab of the sender will follow if ( senderFrame && viewFrame && viewFrame != senderFrame ) @@ -1084,7 +1084,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs if (KApplication::keyboardMouseState() & Qt::ShiftButton) req.newTabInFront = !req.newTabInFront; req.args = args; - openURL( 0L, url, QString::null, req ); + openURL( 0L, url, TQString::null, req ); } else { @@ -1125,13 +1125,13 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs if ( windowArgs.lowerWindow ) newtabsinfront =! newtabsinfront; - KonqView* newView = m_pViewManager->addTab(QString::null, QString::null, false, aftercurrentpage); + KonqView* newView = m_pViewManager->addTab(TQString::null, TQString::null, false, aftercurrentpage); if (newView == 0L) return; if (newtabsinfront) m_pViewManager->showTab( newView ); - openURL( newView, url.isEmpty() ? KURL("about:blank") : url, QString::null); + openURL( newView, url.isEmpty() ? KURL("about:blank") : url, TQString::null); newView->setViewName( args.frameName ); part=newView->part(); @@ -1146,7 +1146,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs req.args = args; if ( args.serviceType.isEmpty() ) - mainWindow->openURL( 0L, url, QString::null, req ); + mainWindow->openURL( 0L, url, TQString::null, req ); else if ( !mainWindow->openView( args.serviceType, url, 0L, req ) ) { // we have problems. abort. @@ -1170,7 +1170,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs mainWindow->viewManager()->setActivePart( part, true ); } - QString profileName = QString::fromLatin1( url.isLocalFile() ? "konqueror/profiles/filemanagement" : "konqueror/profiles/webbrowsing" ); + TQString profileName = TQString::fromLatin1( url.isLocalFile() ? "konqueror/profiles/filemanagement" : "konqueror/profiles/webbrowsing" ); KSimpleConfig cfg( locate( "data", profileName ), true ); cfg.setGroup( "Profile" ); @@ -1179,7 +1179,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs if ( windowArgs.y != -1 ) mainWindow->move( mainWindow->x(), windowArgs.y ); - QSize size = KonqViewManager::readConfigSize( cfg, mainWindow ); + TQSize size = KonqViewManager::readConfigSize( cfg, mainWindow ); int width; if ( windowArgs.width != -1 ) @@ -1205,7 +1205,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs if ( !windowArgs.toolBarsVisible ) { - for ( QPtrListIterator it( mainWindow->toolBarIterator() ); it.current(); ++it ) + for ( TQPtrListIterator it( mainWindow->toolBarIterator() ); it.current(); ++it ) { (*it)->hide(); } @@ -1220,7 +1220,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs if ( !windowArgs.resizable ) // ### this doesn't seem to work :-( - mainWindow->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); + mainWindow->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); // Trying to show the window initially behind the current window is a bit tricky, // as this involves the window manager, which may see things differently. @@ -1236,7 +1236,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs wm_usertime_support = wm_info.isSupported( NET::WM2UserTime ); if( wm_usertime_support ) { - // *sigh*, and I thought nobody would need QWidget::dontFocusOnShow(). + // *sigh*, and I thought nobody would need TQWidget::dontFocusOnShow(). // Avoid Qt's support for user time by setting it to 0, and // set the property ourselves. qt_x_user_time = 0; @@ -1269,16 +1269,16 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs void KonqMainWindow::slotNewWindow() { // Use profile from current window, if set - QString profile = m_pViewManager->currentProfile(); + TQString profile = m_pViewManager->currentProfile(); if ( profile.isEmpty() ) { if ( m_currentView && m_currentView->url().protocol().startsWith( "http" ) ) - profile = QString::fromLatin1("webbrowsing"); + profile = TQString::fromLatin1("webbrowsing"); else - profile = QString::fromLatin1("filemanagement"); + profile = TQString::fromLatin1("filemanagement"); } KonqMisc::createBrowserWindowFromProfile( - locate( "data", QString::fromLatin1("konqueror/profiles/")+profile ), + locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ), profile ); } @@ -1306,8 +1306,8 @@ void KonqMainWindow::slotDuplicateWindow() void KonqMainWindow::slotSendURL() { KURL::List lst = currentURLs(); - QString body; - QString fileNameList; + TQString body; + TQString fileNameList; for ( KURL::List::Iterator it = lst.begin() ; it != lst.end() ; ++it ) { if ( !body.isEmpty() ) body += '\n'; @@ -1315,36 +1315,36 @@ void KonqMainWindow::slotSendURL() if ( !fileNameList.isEmpty() ) fileNameList += ", "; fileNameList += (*it).fileName(); } - QString subject; + TQString subject; if ( m_currentView && !m_currentView->part()->inherits("KonqDirPart") ) subject = m_currentView->caption(); else subject = fileNameList; - kapp->invokeMailer(QString::null,QString::null,QString::null, + kapp->invokeMailer(TQString::null,TQString::null,TQString::null, subject, body); } void KonqMainWindow::slotSendFile() { KURL::List lst = currentURLs(); - QStringList urls; - QString fileNameList; + TQStringList urls; + TQString fileNameList; for ( KURL::List::Iterator it = lst.begin() ; it != lst.end() ; ++it ) { if ( !fileNameList.isEmpty() ) fileNameList += ", "; - if ( (*it).isLocalFile() && QFileInfo((*it).path()).isDir() ) + if ( (*it).isLocalFile() && TQFileInfo((*it).path()).isDir() ) { // Create a temp dir, so that we can put the ZIP file in it with a proper name KTempFile zipFile; - QString zipFileName = zipFile.name(); + TQString zipFileName = zipFile.name(); zipFile.unlink(); - QDir().mkdir(zipFileName,true); + TQDir().mkdir(zipFileName,true); zipFileName = zipFileName+"/"+(*it).fileName()+".zip"; KZip zip( zipFileName ); if ( !zip.open( IO_WriteOnly ) ) continue; // TODO error message - zip.addLocalDirectory( (*it).path(), QString::null ); + zip.addLocalDirectory( (*it).path(), TQString::null ); zip.close(); fileNameList += (*it).fileName()+".zip"; urls.append( zipFileName ); @@ -1355,22 +1355,22 @@ void KonqMainWindow::slotSendFile() urls.append( (*it).url() ); } } - QString subject; + TQString subject; if ( m_currentView && !m_currentView->part()->inherits("KonqDirPart") ) subject = m_currentView->caption(); else subject = fileNameList; - kapp->invokeMailer(QString::null, QString::null, QString::null, subject, - QString::null, //body - QString::null, + kapp->invokeMailer(TQString::null, TQString::null, TQString::null, subject, + TQString::null, //body + TQString::null, urls); // attachments } void KonqMainWindow::slotOpenTerminal() { - QString term = KonqSettings::terminalApplication(); + TQString term = KonqSettings::terminalApplication(); - QString dir ( QDir::homeDirPath() ); + TQString dir ( TQDir::homeDirPath() ); //Try to get the directory of the current view if ( m_currentView ) @@ -1384,7 +1384,7 @@ void KonqMainWindow::slotOpenTerminal() //If the URL is local after the above conversion, set the directory. if ( u.isLocalFile() ) { - QString mime = m_currentView->serviceType(); + TQString mime = m_currentView->serviceType(); if ( KMimeType::mimeType(mime)->is("inode/directory") ) dir = u.path(); else @@ -1396,8 +1396,8 @@ void KonqMainWindow::slotOpenTerminal() cmd.setWorkingDirectory(dir); // Compensate for terminal having arguments. - QStringList args = QStringList::split(' ', term); - for ( QStringList::iterator it = args.begin(); it != args.end(); ++it ) + TQStringList args = TQStringList::split(' ', term); + for ( TQStringList::iterator it = args.begin(); it != args.end(); ++it ) cmd << *it; kdDebug(1202) << "slotOpenTerminal: directory " << dir @@ -1410,11 +1410,11 @@ void KonqMainWindow::slotOpenLocation() // Don't pre-fill the url, as it is auto-selected and thus overwrites the // X clipboard, making it impossible to paste in the url you really wanted. // Another example of why the X clipboard sux - KURLRequesterDlg dlg( QString::null, this, 0, true); + KURLRequesterDlg dlg( TQString::null, this, 0, true); dlg.setCaption( i18n("Open Location") ); // Set current directory for relative paths. // Testcase: konqueror www.kde.org; Ctrl+O; file in $HOME; would open http://$file - QString currentDir; + TQString currentDir; if (m_currentView && m_currentView->url().isLocalFile()) currentDir = m_currentView->url().path(1); dlg.urlRequester()->completionObject()->setDir( currentDir ); @@ -1454,8 +1454,8 @@ void KonqMainWindow::slotToolFind() findPart->widget()->show(); findPart->widget()->setFocus(); - connect( dirPart, SIGNAL( findClosed(KonqDirPart *) ), - this, SLOT( slotFindClosed(KonqDirPart *) ) ); + connect( dirPart, TQT_SIGNAL( findClosed(KonqDirPart *) ), + this, TQT_SLOT( slotFindClosed(KonqDirPart *) ) ); } else if ( sender()->inherits( "KAction" ) ) // don't go there if called by the singleShot below { @@ -1463,13 +1463,13 @@ void KonqMainWindow::slotToolFind() if ( m_currentView && m_currentView->url().isLocalFile() ) url = m_currentView->locationBarURL(); else - url.setPath( QDir::homeDirPath() ); + url.setPath( TQDir::homeDirPath() ); KonqMainWindow * mw = KonqMisc::createBrowserWindowFromProfile( - locate( "data", QString::fromLatin1("konqueror/profiles/filemanagement") ), + locate( "data", TQString::fromLatin1("konqueror/profiles/filemanagement") ), "filemanagement", url, KParts::URLArgs(), true /* forbid "use html"*/ ); mw->m_paFindFiles->setChecked(true); // Delay it after the openURL call (hacky!) - QTimer::singleShot( 1, mw, SLOT(slotToolFind())); + TQTimer::singleShot( 1, mw, TQT_SLOT(slotToolFind())); m_paFindFiles->setChecked(false); } } @@ -1506,7 +1506,7 @@ void KonqMainWindow::slotOpenWith() KURL::List lst; lst.append( m_currentView->url() ); - QString serviceName = sender()->name(); + TQString serviceName = sender()->name(); KTrader::OfferList offers = m_currentView->appServiceOffers(); KTrader::OfferList::ConstIterator it = offers.begin(); @@ -1524,7 +1524,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle ) if ( !toggle ) return; - QString modeName = sender()->name(); + TQString modeName = sender()->name(); if ( m_currentView->service()->desktopEntryName() == modeName ) return; @@ -1536,8 +1536,8 @@ void KonqMainWindow::slotViewModeToggle( bool toggle ) // Save those, because changeViewMode will lose them KURL url = m_currentView->url(); - QString locationBarURL = m_currentView->locationBarURL(); - QStringList filesToSelect; + TQString locationBarURL = m_currentView->locationBarURL(); + TQStringList filesToSelect; if( m_currentView->part()->inherits( "KonqDirPart" ) ) { KFileItemList fileItemsToSelect = static_cast(m_currentView->part())->selectedFileItems(); KFileItemListIterator it( fileItemsToSelect ); @@ -1555,7 +1555,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle ) const KTrader::OfferList offers = m_currentView->partServiceOffers(); KTrader::OfferList::ConstIterator oIt = offers.begin(); KTrader::OfferList::ConstIterator oEnd = offers.end(); - const QString currentServiceKey = viewModeActionKey( m_currentView->service() ); + const TQString currentServiceKey = viewModeActionKey( m_currentView->service() ); for (; oIt != oEnd; ++oIt ) { KService::Ptr service = *oIt; @@ -1569,13 +1569,13 @@ void KonqMainWindow::slotViewModeToggle( bool toggle ) // updateViewModeActions // (I'm saying iconview/listview here, but theoretically it could be // any view :) - const QString serviceKey = viewModeActionKey( service ); + const TQString serviceKey = viewModeActionKey( service ); m_viewModeToolBarServices[ serviceKey ] = service; if ( serviceKey == currentServiceKey ) { - QVariant modeProp = service->property( "X-KDE-BrowserView-ModeProperty" ); - QVariant modePropValue = service->property( "X-KDE-BrowserView-ModePropertyValue" ); + TQVariant modeProp = service->property( "X-KDE-BrowserView-ModeProperty" ); + TQVariant modePropValue = service->property( "X-KDE-BrowserView-ModePropertyValue" ); if ( !modeProp.isValid() || !modePropValue.isValid() ) break; @@ -1587,16 +1587,16 @@ void KonqMainWindow::slotViewModeToggle( bool toggle ) // quick viewmode change (iconview) -> find the iconview-konqviewmode // action and set new text,icon,etc. properties, to show the new // current viewmode - QPtrListIterator it( m_toolBarViewModeActions ); + TQPtrListIterator it( m_toolBarViewModeActions ); for (; it.current(); ++it ) - if ( QString::fromLatin1( it.current()->name() ) == oldService->desktopEntryName() ) + if ( TQString::fromLatin1( it.current()->name() ) == oldService->desktopEntryName() ) { assert( it.current()->inherits( "KonqViewModeAction" ) ); KonqViewModeAction *action = static_cast( it.current() ); action->setChecked( true ); - QString servicename = service->genericName(); + TQString servicename = service->genericName(); if (servicename.isEmpty()) servicename = service->name(); action->setText( servicename ); @@ -1618,7 +1618,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle ) { m_currentView->changeViewMode( m_currentView->serviceType(), modeName ); KURL locURL = KURL::fromPathOrURL( locationBarURL ); - QString nameFilter = detectNameFilter( locURL ); + TQString nameFilter = detectNameFilter( locURL ); if( m_currentView->part()->inherits( "KonqDirPart" ) ) static_cast( m_currentView->part() )->setFilesToSelect( filesToSelect ); m_currentView->openURL( locURL, locationBarURL, nameFilter ); @@ -1680,7 +1680,7 @@ void KonqMainWindow::showHTML( KonqView * _view, bool b, bool _activateView ) else if ( !b && _view->supportsServiceType( "text/html" ) ) { KURL u( _view->url() ); - QString fileName = u.fileName().lower(); + TQString fileName = u.fileName().lower(); if ( KProtocolInfo::supportsListing( u ) && fileName.startsWith("index.htm") ) { _view->lockHistory(); u.setPath( u.directory() ); @@ -1753,7 +1753,7 @@ void KonqMainWindow::slotReload( KonqView* reloadView ) return; if ( reloadView->part() && (reloadView->part()->metaObject()->findProperty("modified") != -1) ) { - QVariant prop = reloadView->part()->property("modified"); + TQVariant prop = reloadView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, i18n("This page contains changes that have not been submitted.\nReloading the page will discard these changes."), @@ -1767,7 +1767,7 @@ void KonqMainWindow::slotReload( KonqView* reloadView ) { reloadView->lockHistory(); // Reuse current servicetype for local files, but not for remote files (it could have changed, e.g. over HTTP) - QString serviceType = reloadView->url().isLocalFile() ? reloadView->serviceType() : QString::null; + TQString serviceType = reloadView->url().isLocalFile() ? reloadView->serviceType() : TQString::null; openURL( reloadView, reloadView->url(), serviceType, req ); } } @@ -1783,14 +1783,14 @@ void KonqMainWindow::slotReloadStop() { } void KonqMainWindow::toggleReloadStopButton(bool isReload) { - //m_paStop = new KAction( i18n( "&Stop" ), "stop", Key_Escape, this, SLOT( slotStop() ), actionCollection(), "stop" ); + //m_paStop = new KAction( i18n( "&Stop" ), "stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" ); if (isReload) { m_paReloadStop->setIcon("stop"); m_paReloadStop->setWhatsThis( i18n( "Stop loading the document

" "All network transfers will be stopped and Konqueror will display the content " "that has been received so far." ) ); m_paReloadStop->setToolTip( i18n( "Stop loading the document" ) ); - //m_paReloadStop = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, SLOT( slotReloadStop() ), actionCollection(), "reload" ); + //m_paReloadStop = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload" ); } else { m_paReloadStop->setIcon("reload"); m_paReloadStop->setWhatsThis( i18n( "Reload the currently displayed document

" @@ -1808,7 +1808,7 @@ void KonqMainWindow::slotReloadPopup() void KonqMainWindow::slotHome(KAction::ActivationReason, Qt::ButtonState state) { - QString homeURL = m_pViewManager->profileHomeURL(); + TQString homeURL = m_pViewManager->profileHomeURL(); if (homeURL.isEmpty()) homeURL = KonqFMSettings::settings()->homeURL(); @@ -1897,7 +1897,7 @@ void KonqMainWindow::slotGoHistory() // Show the sidebar if (!static_cast(a)->isChecked()) { a->activate(); - QTimer::singleShot( 0, this, SLOT(slotGoHistory())); + TQTimer::singleShot( 0, this, TQT_SLOT(slotGoHistory())); return; } @@ -1916,7 +1916,7 @@ void KonqMainWindow::slotGoHistory() } } -QStringList KonqMainWindow::configModules() const +TQStringList KonqMainWindow::configModules() const { return m_configureModules; } @@ -1933,10 +1933,10 @@ void KonqMainWindow::slotConfigure() { m_configureDialog = new KCMultiDialog( this, "configureDialog" ); - QStringList modules = configModules(); - QStringList::ConstIterator end( modules.end() ); + TQStringList modules = configModules(); + TQStringList::ConstIterator end( modules.end() ); - for( QStringList::ConstIterator it = modules.begin(); + for( TQStringList::ConstIterator it = modules.begin(); it != end; ++it ) { if ( kapp->authorizeControlModule( *it ) ) @@ -1961,15 +1961,15 @@ void KonqMainWindow::slotConfigureToolbars() if ( autoSaveSettings() ) saveMainWindowSettings( KGlobal::config(), "KonqMainWindow" ); KEditToolbar dlg(factory()); - connect(&dlg,SIGNAL(newToolbarConfig()),this,SLOT(slotNewToolbarConfig())); - connect(&dlg,SIGNAL(newToolbarConfig()),this,SLOT(initBookmarkBar())); + connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(initBookmarkBar())); dlg.exec(); } void KonqMainWindow::slotNewToolbarConfig() // This is called when OK or Apply is clicked { if ( m_toggleViewGUIClient ) - plugActionList( QString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); + plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); if ( m_currentView && m_currentView->appServiceOffers().count() > 0 ) plugActionList( "openwith", m_openWithActions ); @@ -1984,10 +1984,10 @@ void KonqMainWindow::slotUndoAvailable( bool avail ) if ( avail && m_currentView && m_currentView->part() ) { - // Avoid qWarning from QObject::property if it doesn't exist + // Avoid qWarning from TQObject::property if it doesn't exist if ( m_currentView->part()->metaObject()->findProperty( "supportsUndo" ) != -1 ) { - QVariant prop = m_currentView->part()->property( "supportsUndo" ); + TQVariant prop = m_currentView->part()->property( "supportsUndo" ); if ( prop.isValid() && prop.toBool() ) enable = true; } @@ -2027,11 +2027,11 @@ void KonqMainWindow::slotRunFinished() } if ( run->hasError() ) { // we had an error - QByteArray data; - QDataStream s( data, IO_WriteOnly ); + TQByteArray data; + TQDataStream s( data, IO_WriteOnly ); s << run->url().prettyURL() << kapp->dcopClient()->defaultObject(); kapp->dcopClient()->send( "konqueror*", "KonquerorIface", - "removeFromCombo(QString,QCString)", data); + "removeFromCombo(TQString,TQCString)", data); } KonqView *childView = run->childView(); @@ -2072,9 +2072,9 @@ void KonqMainWindow::slotRunFinished() void KonqMainWindow::applyKonqMainWindowSettings() { - QStringList toggableViewsShown = KonqSettings::toggableViewsShown(); - QStringList::ConstIterator togIt = toggableViewsShown.begin(); - QStringList::ConstIterator togEnd = toggableViewsShown.end(); + TQStringList toggableViewsShown = KonqSettings::toggableViewsShown(); + TQStringList::ConstIterator togIt = toggableViewsShown.begin(); + TQStringList::ConstIterator togEnd = toggableViewsShown.end(); for ( ; togIt != togEnd ; ++togIt ) { // Find the action by name @@ -2087,7 +2087,7 @@ void KonqMainWindow::applyKonqMainWindowSettings() } } -void KonqMainWindow::slotSetStatusBarText( const QString & ) +void KonqMainWindow::slotSetStatusBarText( const TQString & ) { // Reimplemented to disable KParts::MainWindow default behaviour // Does nothing here, see konq_frame.cc @@ -2210,22 +2210,22 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part ) { // if we just toggled the view mode via the view mode actions, then // we don't need to do all the time-taking stuff below (Simon) - const QString currentServiceDesktopEntryName = m_currentView->service()->desktopEntryName(); - QPtrListIterator it( m_viewModeActions ); + const TQString currentServiceDesktopEntryName = m_currentView->service()->desktopEntryName(); + TQPtrListIterator it( m_viewModeActions ); for (; it.current(); ++it ) { if ( it.current()->name() == currentServiceDesktopEntryName ) { it.current()->setChecked( true ); break; } } - const QString currentServiceLibrary = viewModeActionKey( m_currentView->service() ); - QPtrListIterator ittb( m_toolBarViewModeActions ); + const TQString currentServiceLibrary = viewModeActionKey( m_currentView->service() ); + TQPtrListIterator ittb( m_toolBarViewModeActions ); for (; ittb.current(); ++ittb ) { KService::Ptr serv = KService::serviceByDesktopName( ittb.current()->name() ); if ( serv && viewModeActionKey( serv ) == currentServiceLibrary ) { KToggleAction* ta = static_cast( ittb.current() ); ta->setChecked( false ); - QString servicename = m_currentView->service()->genericName(); + TQString servicename = m_currentView->service()->genericName(); if (servicename.isEmpty()) servicename = m_currentView->service()->name(); ta->setText( servicename ); @@ -2264,8 +2264,8 @@ void KonqMainWindow::insertChildView( KonqView *childView ) kdDebug(1202) << "KonqMainWindow::insertChildView " << childView << endl; m_mapViews.insert( childView->part(), childView ); - connect( childView, SIGNAL( viewCompleted( KonqView * ) ), - this, SLOT( slotViewCompleted( KonqView * ) ) ); + connect( childView, TQT_SIGNAL( viewCompleted( KonqView * ) ), + this, TQT_SLOT( slotViewCompleted( KonqView * ) ) ); if ( !m_pViewManager->isLoadingProfile() ) // see KonqViewManager::loadViewProfile viewCountChanged(); @@ -2277,8 +2277,8 @@ void KonqMainWindow::removeChildView( KonqView *childView ) { kdDebug(1202) << "KonqMainWindow::removeChildView childView " << childView << endl; - disconnect( childView, SIGNAL( viewCompleted( KonqView * ) ), - this, SLOT( slotViewCompleted( KonqView * ) ) ); + disconnect( childView, TQT_SIGNAL( viewCompleted( KonqView * ) ), + this, TQT_SLOT( slotViewCompleted( KonqView * ) ) ); #ifndef NDEBUG dumpViewList(); @@ -2358,7 +2358,7 @@ KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *view ) return 0L; } -KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) +KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const TQString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) { kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; @@ -2367,7 +2367,7 @@ KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const Q for (; it != end; ++it ) { KonqView* view = it.data(); - QString viewName = view->viewName(); + TQString viewName = view->viewName(); kdDebug() << " - viewName=" << viewName << " " << "frame names:" << view->frameNames().join( "," ) << endl; @@ -2395,8 +2395,8 @@ KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const Q if ( ext ) { - QPtrList frames = ext->frames(); - QPtrListIterator frameIt( frames ); + TQPtrList frames = ext->frames(); + TQPtrListIterator frameIt( frames ); for ( ; frameIt.current() ; ++frameIt ) { if ( frameIt.current()->name() == name ) @@ -2416,12 +2416,12 @@ KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const Q } // static -KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) +KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const TQString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) { if ( !s_lstViews ) return 0; - QPtrListIterator it( *s_lstViews ); + TQPtrListIterator it( *s_lstViews ); for (; it.current(); ++it ) { KonqView *res = it.current()->childView( callingPart, name, hostExtension, part ); @@ -2484,7 +2484,7 @@ KParts::ReadOnlyPart * KonqMainWindow::currentPart() const return 0L; } -void KonqMainWindow::customEvent( QCustomEvent *event ) +void KonqMainWindow::customEvent( TQCustomEvent *event ) { KParts::MainWindow::customEvent( event ); @@ -2495,7 +2495,7 @@ void KonqMainWindow::customEvent( QCustomEvent *event ) MapViews::ConstIterator it = m_mapViews.begin(); MapViews::ConstIterator end = m_mapViews.end(); for (; it != end; ++it ) - QApplication::sendEvent( (*it)->part(), event ); + TQApplication::sendEvent( (*it)->part(), event ); return; } if ( KParts::OpenURLEvent::test( event ) ) @@ -2516,7 +2516,7 @@ void KonqMainWindow::customEvent( QCustomEvent *event ) if (it.key() != ev->part()) { //kdDebug(1202) << "Sending event to view " << it.key()->className() << endl; - QApplication::sendEvent( it.key(), event ); + TQApplication::sendEvent( it.key(), event ); } } @@ -2529,14 +2529,14 @@ void KonqMainWindow::updateLocalPropsActions() if ( m_currentView && m_currentView->url().isLocalFile() ) { // Can we write ? - QFileInfo info( m_currentView->url().path() ); + TQFileInfo info( m_currentView->url().path() ); canWrite = info.isDir() && info.isWritable(); } m_paSaveViewPropertiesLocally->setEnabled( canWrite ); m_paRemoveLocalProperties->setEnabled( canWrite ); } -void KonqMainWindow::slotURLEntered( const QString &text, int state ) +void KonqMainWindow::slotURLEntered( const TQString &text, int state ) { if ( m_bURLEnterLock || text.isEmpty() ) return; @@ -2545,7 +2545,7 @@ void KonqMainWindow::slotURLEntered( const QString &text, int state ) if (state & ControlButton || state & AltButton) { - m_combo->setURL( m_currentView ? m_currentView->url().prettyURL() : QString::null ); + m_combo->setURL( m_currentView ? m_currentView->url().prettyURL() : TQString::null ); openFilteredURL( text.stripWhiteSpace(), true ); } else @@ -2578,12 +2578,12 @@ void KonqMainWindow::slotSplitViewVertical() void KonqMainWindow::slotAddTab() { - KonqView* newView = m_pViewManager->addTab(QString("text/html"), // this is what about:blank will use anyway - QString::null, + KonqView* newView = m_pViewManager->addTab(TQString("text/html"), // this is what about:blank will use anyway + TQString::null, false, KonqSettings::openAfterCurrentPage()); if (newView == 0L) return; - openURL( newView, KURL("about:blank"),QString::null); + openURL( newView, KURL("about:blank"),TQString::null); m_pViewManager->showTab( newView ); focusLocationBar(); m_pWorkingTab = 0L; @@ -2603,7 +2603,7 @@ void KonqMainWindow::slotBreakOffTab() { if (m_currentView && m_currentView->part() && (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { - QVariant prop = m_currentView->part()->property("modified"); + TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, i18n("This tab contains changes that have not been submitted.\nDetaching the tab will discard these changes."), @@ -2620,7 +2620,7 @@ void KonqMainWindow::slotBreakOffTabPopup() KonqView* originalView = m_currentView; KonqView *view = m_pWorkingTab->activeChildView(); if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { - QVariant prop = view->part()->property("modified"); + TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); if ( KMessageBox::warningContinueCancel( this, @@ -2636,7 +2636,7 @@ void KonqMainWindow::slotBreakOffTabPopup() //Can't do this safely here as the tabbar may disappear and we're //hanging off here. - QTimer::singleShot(0, this, SLOT( slotBreakOffTabPopupDelayed() ) ); + TQTimer::singleShot(0, this, TQT_SLOT( slotBreakOffTabPopupDelayed() ) ); } void KonqMainWindow::slotBreakOffTabPopupDelayed() @@ -2701,7 +2701,7 @@ void KonqMainWindow::popupNewTab(bool infront, bool openAfterCurrentPage) { req.newTabInFront = true; } - openURL( 0L, (*it)->url(), QString::null, req ); + openURL( 0L, (*it)->url(), TQString::null, req ); } } @@ -2714,7 +2714,7 @@ void KonqMainWindow::openMultiURL( KURL::List url ) KonqView* newView = m_pViewManager->addTab(); Q_ASSERT( newView ); if (newView == 0L) continue; - openURL( newView, *it,QString::null); + openURL( newView, *it,TQString::null); m_pViewManager->showTab( newView ); focusLocationBar(); m_pWorkingTab = 0L; @@ -2725,7 +2725,7 @@ void KonqMainWindow::slotRemoveView() { if (m_currentView && m_currentView->part() && (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { - QVariant prop = m_currentView->part()->property("modified"); + TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, i18n("This view contains changes that have not been submitted.\nClosing the view will discard these changes."), @@ -2741,7 +2741,7 @@ void KonqMainWindow::slotRemoveTab() { if (m_currentView && m_currentView->part() && (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { - QVariant prop = m_currentView->part()->property("modified"); + TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, i18n("This tab contains changes that have not been submitted.\nClosing the tab will discard these changes."), @@ -2757,7 +2757,7 @@ void KonqMainWindow::slotRemoveTabPopup() KonqView *originalView = m_currentView; KonqView *view = m_pWorkingTab->activeChildView(); if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { - QVariant prop = view->part()->property("modified"); + TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); if ( KMessageBox::warningContinueCancel( this, @@ -2772,7 +2772,7 @@ void KonqMainWindow::slotRemoveTabPopup() } //Can't do immediately - may kill the tabbar, and we're in an event path down from it - QTimer::singleShot( 0, this, SLOT( slotRemoveTabPopupDelayed() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotRemoveTabPopupDelayed() ) ); } void KonqMainWindow::slotRemoveTabPopupDelayed() @@ -2794,7 +2794,7 @@ void KonqMainWindow::slotRemoveOtherTabsPopup() for (; it != end; ++it ) { KonqView *view = it.data(); if ( view != originalView && view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { - QVariant prop = view->part()->property("modified"); + TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); if ( KMessageBox::warningContinueCancel( this, @@ -2810,7 +2810,7 @@ void KonqMainWindow::slotRemoveOtherTabsPopup() m_pViewManager->showTab( originalView ); //Can't do immediately - kills the tabbar, and we're in an event path down from it - QTimer::singleShot( 0, this, SLOT( slotRemoveOtherTabsPopupDelayed() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotRemoveOtherTabsPopupDelayed() ) ); } void KonqMainWindow::slotRemoveOtherTabsPopupDelayed() @@ -2827,7 +2827,7 @@ void KonqMainWindow::slotReloadAllTabs() for (; it != end; ++it ) { KonqView *view = it.data(); if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { - QVariant prop = view->part()->property("modified"); + TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); if ( KMessageBox::warningContinueCancel( this, @@ -2859,7 +2859,7 @@ void KonqMainWindow::slotActivatePrevTab() void KonqMainWindow::slotActivateTab() { - m_pViewManager->activateTab( QString( sender()->name() ).right( 2 ).toInt() -1 ); + m_pViewManager->activateTab( TQString( sender()->name() ).right( 2 ).toInt() -1 ); } void KonqMainWindow::slotDumpDebugInfo() @@ -2890,7 +2890,7 @@ void KonqMainWindow::slotRemoveLocalProperties() u.addPath(".directory"); if ( u.isLocalFile() ) { - QFile f( u.path() ); + TQFile f( u.path() ); if ( f.open(IO_ReadWrite) ) { f.close(); @@ -2902,16 +2902,16 @@ void KonqMainWindow::slotRemoveLocalProperties() slotReload(); } else { - Q_ASSERT( QFile::exists(u.path()) ); // The action shouldn't be enabled, otherwise. + Q_ASSERT( TQFile::exists(u.path()) ); // The action shouldn't be enabled, otherwise. KMessageBox::sorry( this, i18n("No permissions to write to %1").arg(u.path()) ); } } } -bool KonqMainWindow::askForTarget(const QString& text, KURL& url) +bool KonqMainWindow::askForTarget(const TQString& text, KURL& url) { const KURL initialUrl = (viewCount()==2) ? otherView(m_currentView)->url() : m_currentView->url(); - QString label = text.arg( m_currentView->url().pathOrURL() ); + TQString label = text.arg( m_currentView->url().pathOrURL() ); KURLRequesterDlg dlg(initialUrl.pathOrURL(), label, this, "urlrequester", true); dlg.setCaption(i18n("Enter Target")); dlg.urlRequester()->setMode( KFile::File | KFile::ExistingOnly | KFile::Directory ); @@ -3014,7 +3014,7 @@ void KonqMainWindow::slotSaveViewProfile() void KonqMainWindow::slotUpAboutToShow() { - QPopupMenu *popup = m_paUp->popupMenu(); + TQPopupMenu *popup = m_paUp->popupMenu(); popup->clear(); @@ -3042,13 +3042,13 @@ void KonqMainWindow::slotUpAboutToShow() void KonqMainWindow::slotUp(KAction::ActivationReason, Qt::ButtonState state) { m_goState = state; - QTimer::singleShot( 0, this, SLOT( slotUpDelayed() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) ); } void KonqMainWindow::slotUp() { m_goState = Qt::LeftButton; - QTimer::singleShot( 0, this, SLOT( slotUpDelayed() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) ); } void KonqMainWindow::slotUpDelayed() @@ -3062,7 +3062,7 @@ void KonqMainWindow::slotUpDelayed() if (m_goState & Qt::ShiftButton) req.newTabInFront = !req.newTabInFront; - const QString& url = m_currentView->upURL().url(); + const TQString& url = m_currentView->upURL().url(); if(m_goState & Qt::ControlButton) openFilteredURL(url, req ); else if(m_goState & Qt::MidButton) @@ -3106,7 +3106,7 @@ void KonqMainWindow::slotGoHistoryActivated( int steps, Qt::ButtonState state ) // Only start 1 timer. m_goBuffer = steps; m_goState = state; - QTimer::singleShot( 0, this, SLOT(slotGoHistoryDelayed())); + TQTimer::singleShot( 0, this, TQT_SLOT(slotGoHistoryDelayed())); } } @@ -3198,10 +3198,10 @@ void KonqMainWindow::initCombo() m_combo->init( s_pCompletion ); - connect( m_combo, SIGNAL(activated(const QString&,int)), - this, SLOT(slotURLEntered(const QString&,int)) ); - connect( m_combo, SIGNAL(showPageSecurity()), - this, SLOT(showPageSecurity()) ); + connect( m_combo, TQT_SIGNAL(activated(const TQString&,int)), + this, TQT_SLOT(slotURLEntered(const TQString&,int)) ); + connect( m_combo, TQT_SIGNAL(showPageSecurity()), + this, TQT_SLOT(showPageSecurity()) ); m_pURLCompletion = new KURLCompletion(); m_pURLCompletion->setCompletionMode( s_pCompletion->completionMode() ); @@ -3210,18 +3210,18 @@ void KonqMainWindow::initCombo() // We do want completion of user names, right? //m_pURLCompletion->setReplaceHome( false ); // Leave ~ alone! Will be taken care of by filters!! - connect( m_combo, SIGNAL(completionModeChanged(KGlobalSettings::Completion)), - SLOT( slotCompletionModeChanged( KGlobalSettings::Completion ))); - connect( m_combo, SIGNAL( completion( const QString& )), - SLOT( slotMakeCompletion( const QString& ))); - connect( m_combo, SIGNAL( substringCompletion( const QString& )), - SLOT( slotSubstringcompletion( const QString& ))); - connect( m_combo, SIGNAL( textRotation( KCompletionBase::KeyBindingType) ), - SLOT( slotRotation( KCompletionBase::KeyBindingType ))); - connect( m_combo, SIGNAL( cleared() ), - SLOT ( slotClearHistory() ) ); - connect( m_pURLCompletion, SIGNAL( match(const QString&) ), - SLOT( slotMatch(const QString&) )); + connect( m_combo, TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), + TQT_SLOT( slotCompletionModeChanged( KGlobalSettings::Completion ))); + connect( m_combo, TQT_SIGNAL( completion( const TQString& )), + TQT_SLOT( slotMakeCompletion( const TQString& ))); + connect( m_combo, TQT_SIGNAL( substringCompletion( const TQString& )), + TQT_SLOT( slotSubstringcompletion( const TQString& ))); + connect( m_combo, TQT_SIGNAL( textRotation( KCompletionBase::KeyBindingType) ), + TQT_SLOT( slotRotation( KCompletionBase::KeyBindingType ))); + connect( m_combo, TQT_SIGNAL( cleared() ), + TQT_SLOT ( slotClearHistory() ) ); + connect( m_pURLCompletion, TQT_SIGNAL( match(const TQString&) ), + TQT_SLOT( slotMatch(const TQString&) )); m_combo->lineEdit()->installEventFilter(this); @@ -3229,8 +3229,8 @@ void KonqMainWindow::initCombo() if ( !bookmarkCompletionInitialized ) { bookmarkCompletionInitialized = true; - DelayedInitializer *initializer = new DelayedInitializer( QEvent::KeyPress, m_combo->lineEdit() ); - connect( initializer, SIGNAL( initialize() ), this, SLOT( bookmarksIntoCompletion() ) ); + DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, m_combo->lineEdit() ); + connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT( bookmarksIntoCompletion() ) ); } } @@ -3261,15 +3261,15 @@ void KonqMainWindow::slotCompletionModeChanged( KGlobalSettings::Completion m ) // at first, try to find a completion in the current view, then use the global // completion (history) -void KonqMainWindow::slotMakeCompletion( const QString& text ) +void KonqMainWindow::slotMakeCompletion( const TQString& text ) { if( m_pURLCompletion ) { m_urlCompletionStarted = true; // flag for slotMatch() // kdDebug(1202) << "Local Completion object found!" << endl; - QString completion = m_pURLCompletion->makeCompletion( text ); - m_currentDir = QString::null; + TQString completion = m_pURLCompletion->makeCompletion( text ); + m_currentDir = TQString::null; if ( completion.isNull() && !m_pURLCompletion->isRunning() ) { @@ -3296,11 +3296,11 @@ void KonqMainWindow::slotMakeCompletion( const QString& text ) // kdDebug(1202) << "Current dir: " << m_currentDir << " Current text: " << text << endl; } -void KonqMainWindow::slotSubstringcompletion( const QString& text ) +void KonqMainWindow::slotSubstringcompletion( const TQString& text ) { bool filesFirst = currentURL().startsWith( "/" ) || currentURL().startsWith( "file:/" ); - QStringList items; + TQStringList items; if ( filesFirst && m_pURLCompletion ) items = m_pURLCompletion->substringCompletion( text ); @@ -3318,7 +3318,7 @@ void KonqMainWindow::slotRotation( KCompletionBase::KeyBindingType type ) bool prev = (type == KCompletionBase::PrevCompletionMatch); if ( prev || type == KCompletionBase::NextCompletionMatch ) { - QString completion = prev ? m_pURLCompletion->previousMatch() : + TQString completion = prev ? m_pURLCompletion->previousMatch() : m_pURLCompletion->nextMatch(); if( completion.isNull() ) { // try the history KCompletion object @@ -3333,7 +3333,7 @@ void KonqMainWindow::slotRotation( KCompletionBase::KeyBindingType type ) } // Handle match() from m_pURLCompletion -void KonqMainWindow::slotMatch( const QString &match ) +void KonqMainWindow::slotMatch( const TQString &match ) { if ( match.isEmpty() ) // this case is handled directly return; @@ -3345,7 +3345,7 @@ void KonqMainWindow::slotMatch( const QString &match ) // some special handling necessary for CompletionPopup if ( m_combo->completionMode() == KGlobalSettings::CompletionPopup || m_combo->completionMode() == KGlobalSettings::CompletionPopupAuto ) { - QStringList items = m_pURLCompletion->allMatches(); + TQStringList items = m_pURLCompletion->allMatches(); items += historyPopupCompletionItems( m_combo->currentText() ); // items.sort(); // should we? m_combo->setCompletedItems( items ); @@ -3373,15 +3373,15 @@ void KonqMainWindow::slotClearComboHistory() m_combo->clearHistory(); } -bool KonqMainWindow::eventFilter(QObject*obj,QEvent *ev) +bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) { - if ( ( ev->type()==QEvent::FocusIn || ev->type()==QEvent::FocusOut ) && + if ( ( ev->type()==TQEvent::FocusIn || ev->type()==TQEvent::FocusOut ) && m_combo && m_combo->lineEdit() == obj ) { //kdDebug(1202) << "KonqMainWindow::eventFilter " << obj << " " << obj->className() << " " << obj->name() << endl; - QFocusEvent * focusEv = static_cast(ev); - if (focusEv->reason() == QFocusEvent::Popup) + TQFocusEvent * focusEv = static_cast(ev); + if (focusEv->reason() == TQFocusEvent::Popup) { return KParts::MainWindow::eventFilter( obj, ev ); } @@ -3389,7 +3389,7 @@ bool KonqMainWindow::eventFilter(QObject*obj,QEvent *ev) KParts::BrowserExtension * ext = 0; if ( m_currentView ) ext = m_currentView->browserExtension(); - QStrList slotNames; + TQStrList slotNames; if (ext) slotNames = ext->metaObject()->slotNames(); @@ -3399,7 +3399,7 @@ bool KonqMainWindow::eventFilter(QObject*obj,QEvent *ev) //} - if (ev->type()==QEvent::FocusIn) + if (ev->type()==TQEvent::FocusIn) { //kdDebug(1202) << "ComboBox got the focus..." << endl; if (m_bLocationBarConnected) @@ -3409,31 +3409,31 @@ bool KonqMainWindow::eventFilter(QObject*obj,QEvent *ev) } m_bLocationBarConnected = true; - // Workaround for Qt issue: usually, QLineEdit reacts on Ctrl-D, + // Workaround for Qt issue: usually, TQLineEdit reacts on Ctrl-D, // but the duplicate_window action also has Ctrl-D as accel and // prevents the lineedit from getting this event. IMHO the accel // should be disabled in favor of the focus-widget. KAction *duplicate = actionCollection()->action("duplicate_window"); - if ( duplicate->shortcut() == QKeySequence(CTRL+Key_D) ) + if ( duplicate->shortcut() == TQKeySequence(CTRL+Key_D) ) duplicate->setEnabled( false ); if (slotNames.contains("cut()")) - disconnect( m_paCut, SIGNAL( activated() ), ext, SLOT( cut() ) ); + disconnect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) ); if (slotNames.contains("copy()")) - disconnect( m_paCopy, SIGNAL( activated() ), ext, SLOT( copy() ) ); + disconnect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) ); if (slotNames.contains("paste()")) - disconnect( m_paPaste, SIGNAL( activated() ), ext, SLOT( paste() ) ); + disconnect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); if (slotNames.contains("del()")) - disconnect( m_paDelete, SIGNAL( activated() ), ext, SLOT( del() ) ); - disconnect( m_paTrash, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), - this, SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) ); + disconnect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); + disconnect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), + this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) ); - connect( m_paCut, SIGNAL( activated() ), m_combo->lineEdit(), SLOT( cut() ) ); - connect( m_paCopy, SIGNAL( activated() ), m_combo->lineEdit(), SLOT( copy() ) ); - connect( m_paPaste, SIGNAL( activated() ), m_combo->lineEdit(), SLOT( paste() ) ); - connect( QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(slotClipboardDataChanged()) ); - connect( m_combo->lineEdit(), SIGNAL(textChanged(const QString &)), this, SLOT(slotCheckComboSelection()) ); - connect( m_combo->lineEdit(), SIGNAL(selectionChanged()), this, SLOT(slotCheckComboSelection()) ); + connect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); + connect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); + connect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) ); + connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); + connect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) ); + connect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) ); m_paTrash->setEnabled(false); m_paDelete->setEnabled(false); @@ -3441,7 +3441,7 @@ bool KonqMainWindow::eventFilter(QObject*obj,QEvent *ev) slotClipboardDataChanged(); } - else if ( ev->type()==QEvent::FocusOut) + else if ( ev->type()==TQEvent::FocusOut) { //kdDebug(1202) << "ComboBox lost focus..." << endl; if (!m_bLocationBarConnected) @@ -3455,26 +3455,26 @@ bool KonqMainWindow::eventFilter(QObject*obj,QEvent *ev) // we use new_window as reference, as it's always in the same state // as duplicate_window KAction *duplicate = actionCollection()->action("duplicate_window"); - if ( duplicate->shortcut() == QKeySequence(CTRL+Key_D) ) + if ( duplicate->shortcut() == TQKeySequence(CTRL+Key_D) ) duplicate->setEnabled( actionCollection()->action("new_window")->isEnabled() ); if (slotNames.contains("cut()")) - connect( m_paCut, SIGNAL( activated() ), ext, SLOT( cut() ) ); + connect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) ); if (slotNames.contains("copy()")) - connect( m_paCopy, SIGNAL( activated() ), ext, SLOT( copy() ) ); + connect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) ); if (slotNames.contains("paste()")) - connect( m_paPaste, SIGNAL( activated() ), ext, SLOT( paste() ) ); + connect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); if (slotNames.contains("del()")) - connect( m_paDelete, SIGNAL( activated() ), ext, SLOT( del() ) ); - connect( m_paTrash, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), - this, SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) ); + connect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); + connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), + this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) ); - disconnect( m_paCut, SIGNAL( activated() ), m_combo->lineEdit(), SLOT( cut() ) ); - disconnect( m_paCopy, SIGNAL( activated() ), m_combo->lineEdit(), SLOT( copy() ) ); - disconnect( m_paPaste, SIGNAL( activated() ), m_combo->lineEdit(), SLOT( paste() ) ); - disconnect( QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(slotClipboardDataChanged()) ); - disconnect( m_combo->lineEdit(), SIGNAL(textChanged(const QString &)), this, SLOT(slotCheckComboSelection()) ); - disconnect( m_combo->lineEdit(), SIGNAL(selectionChanged()), this, SLOT(slotCheckComboSelection()) ); + disconnect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); + disconnect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); + disconnect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) ); + disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); + disconnect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) ); + disconnect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) ); if ( ext ) { @@ -3500,7 +3500,7 @@ bool KonqMainWindow::eventFilter(QObject*obj,QEvent *ev) void KonqMainWindow::slotClipboardDataChanged() { //kdDebug(1202) << "KonqMainWindow::slotClipboardDataChanged()" << endl; - QMimeSource *data = QApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); m_paPaste->setEnabled( data->provides( "text/plain" ) ); slotCheckComboSelection(); } @@ -3520,7 +3520,7 @@ void KonqMainWindow::slotClearLocationBar( KAction::ActivationReason, Qt::Button m_combo->clearTemporary(); focusLocationBar(); if ( state & Qt::MidButton ) - m_combo->setURL( QApplication::clipboard()->text( QClipboard::Selection ) ); + m_combo->setURL( TQApplication::clipboard()->text( QClipboard::Selection ) ); } void KonqMainWindow::slotForceSaveMainWindowSettings() @@ -3553,7 +3553,7 @@ void KonqMainWindow::slotUpdateFullScreen( bool set ) bool haveFullScreenButton = false; //Walk over the toolbars and check whether there is a show fullscreen button in any of them - QPtrListIterator barIt = toolBarIterator(); + TQPtrListIterator barIt = toolBarIterator(); for (; barIt.current(); ++barIt ) { //Are we plugged here, in a visible toolbar? @@ -3567,7 +3567,7 @@ void KonqMainWindow::slotUpdateFullScreen( bool set ) if (!haveFullScreenButton) { - QPtrList lst; + TQPtrList lst; lst.append( m_ptaFullScreen ); plugActionList( "fullscreen", lst ); } @@ -3619,7 +3619,7 @@ void KonqMainWindow::setLocationBarURL( const KURL &url ) setLocationBarURL( url.pathOrURL() ); } -void KonqMainWindow::setLocationBarURL( const QString &url ) +void KonqMainWindow::setLocationBarURL( const TQString &url ) { kdDebug(1202) << "KonqMainWindow::setLocationBarURL: url = " << url << endl; @@ -3643,7 +3643,7 @@ void KonqMainWindow::showPageSecurity() } // called via DCOP from KonquerorIface -void KonqMainWindow::comboAction( int action, const QString& url, const QCString& objId ) +void KonqMainWindow::comboAction( int action, const TQString& url, const TQCString& objId ) { if (!s_lstViews) // this happens in "konqueror --silent" return; @@ -3676,7 +3676,7 @@ void KonqMainWindow::comboAction( int action, const QString& url, const QCString combo->saveItems(); } -QString KonqMainWindow::locationBarURL() const +TQString KonqMainWindow::locationBarURL() const { return m_combo->currentText(); } @@ -3729,77 +3729,77 @@ void KonqMainWindow::initActions() // File menu m_pMenuNew = new KNewMenu ( actionCollection(), this, "new_menu" ); - QObject::connect( m_pMenuNew->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotFileNewAboutToShow()) ); + TQObject::connect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(slotFileNewAboutToShow()) ); (void) new KAction( i18n( "&Edit File Type..." ), 0, actionCollection(), "editMimeType" ); (void) new KAction( i18n( "Properties" ), ALT+Key_Return, actionCollection(), "properties" ); - (void) new KAction( i18n( "New &Window" ), "window_new", KStdAccel::shortcut(KStdAccel::New), this, SLOT( slotNewWindow() ), actionCollection(), "new_window" ); - (void) new KAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, this, SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" ); - (void) new KAction( i18n( "Send &Link Address..." ), "mail_generic", 0, this, SLOT( slotSendURL() ), actionCollection(), "sendURL" ); - (void) new KAction( i18n( "S&end File..." ), "mail_generic", 0, this, SLOT( slotSendFile() ), actionCollection(), "sendPage" ); + (void) new KAction( i18n( "New &Window" ), "window_new", KStdAccel::shortcut(KStdAccel::New), this, TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" ); + (void) new KAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, this, TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" ); + (void) new KAction( i18n( "Send &Link Address..." ), "mail_generic", 0, this, TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" ); + (void) new KAction( i18n( "S&end File..." ), "mail_generic", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" ); if (kapp->authorize("shell_access")) { - (void) new KAction( i18n( "Open &Terminal" ), "openterm", Key_F4, this, SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" ); + (void) new KAction( i18n( "Open &Terminal" ), "openterm", Key_F4, this, TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" ); } - (void) new KAction( i18n( "&Open Location..." ), "fileopen", KStdAccel::shortcut(KStdAccel::Open), this, SLOT( slotOpenLocation() ), actionCollection(), "open_location" ); + (void) new KAction( i18n( "&Open Location..." ), "fileopen", KStdAccel::shortcut(KStdAccel::Open), this, TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" ); - m_paFindFiles = new KToggleAction( i18n( "&Find File..." ), "filefind", KStdAccel::shortcut(KStdAccel::Find), this, SLOT( slotToolFind() ), actionCollection(), "findfile" ); + m_paFindFiles = new KToggleAction( i18n( "&Find File..." ), "filefind", KStdAccel::shortcut(KStdAccel::Find), this, TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" ); m_paPrint = KStdAction::print( 0, 0, actionCollection(), "print" ); - (void) KStdAction::quit( this, SLOT( close() ), actionCollection(), "quit" ); + (void) KStdAction::quit( this, TQT_SLOT( close() ), actionCollection(), "quit" ); - m_ptaUseHTML = new KToggleAction( i18n( "&Use index.html" ), 0, this, SLOT( slotShowHTML() ), actionCollection(), "usehtml" ); - m_paLockView = new KToggleAction( i18n( "Lock to Current Location"), 0, this, SLOT( slotLockView() ), actionCollection(), "lock" ); - m_paLinkView = new KToggleAction( i18n( "Lin&k View"), 0, this, SLOT( slotLinkView() ), actionCollection(), "link" ); + m_ptaUseHTML = new KToggleAction( i18n( "&Use index.html" ), 0, this, TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" ); + m_paLockView = new KToggleAction( i18n( "Lock to Current Location"), 0, this, TQT_SLOT( slotLockView() ), actionCollection(), "lock" ); + m_paLinkView = new KToggleAction( i18n( "Lin&k View"), 0, this, TQT_SLOT( slotLinkView() ), actionCollection(), "link" ); // Go menu m_paUp = new KToolBarPopupAction( i18n( "&Up" ), "up", KStdAccel::shortcut(KStdAccel::Up), actionCollection(), "up" ); - connect( m_paUp, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this, - SLOT( slotUp(KAction::ActivationReason, Qt::ButtonState) ) ); - connect( m_paUp->popupMenu(), SIGNAL( aboutToShow() ), this, SLOT( slotUpAboutToShow() ) ); - connect( m_paUp->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotUpActivated( int ) ) ); + connect( m_paUp, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this, + TQT_SLOT( slotUp(KAction::ActivationReason, Qt::ButtonState) ) ); + connect( m_paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUpAboutToShow() ) ); + connect( m_paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUpActivated( int ) ) ); QPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward(); m_paBack = new KToolBarPopupAction( backForward.first, KStdAccel::shortcut(KStdAccel::Back), 0, "", actionCollection(), "back" ); - connect( m_paBack, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this, - SLOT( slotBack(KAction::ActivationReason, Qt::ButtonState) ) ); - connect( m_paBack->popupMenu(), SIGNAL( aboutToShow() ), this, SLOT( slotBackAboutToShow() ) ); - connect( m_paBack->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotBackActivated( int ) ) ); + connect( m_paBack, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this, + TQT_SLOT( slotBack(KAction::ActivationReason, Qt::ButtonState) ) ); + connect( m_paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotBackAboutToShow() ) ); + connect( m_paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotBackActivated( int ) ) ); m_paForward = new KToolBarPopupAction( backForward.second, KStdAccel::shortcut(KStdAccel::Forward), 0, "", actionCollection(), "forward" ); - connect( m_paForward, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this, - SLOT( slotForward(KAction::ActivationReason, Qt::ButtonState) ) ); - connect( m_paForward->popupMenu(), SIGNAL( aboutToShow() ), this, SLOT( slotForwardAboutToShow() ) ); - connect( m_paForward->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotForwardActivated( int ) ) ); + connect( m_paForward, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this, + TQT_SLOT( slotForward(KAction::ActivationReason, Qt::ButtonState) ) ); + connect( m_paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotForwardAboutToShow() ) ); + connect( m_paForward->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotForwardActivated( int ) ) ); m_paHistory = new KonqBidiHistoryAction( i18n("History"), actionCollection(), "history" ); - connect( m_paHistory, SIGNAL( menuAboutToShow() ), this, SLOT( slotGoMenuAboutToShow() ) ); - connect( m_paHistory, SIGNAL( activated( int ) ), this, SLOT( slotGoHistoryActivated( int ) ) ); + connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), this, TQT_SLOT( slotGoMenuAboutToShow() ) ); + connect( m_paHistory, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotGoHistoryActivated( int ) ) ); m_paHome = new KAction( i18n( "Home" ), "gohome", KStdAccel::shortcut(KStdAccel::Home), actionCollection(), "home" ); - connect( m_paHome, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this, - SLOT( slotHome(KAction::ActivationReason, Qt::ButtonState) ) ); - - (void) new KAction( i18n( "S&ystem" ), "system", 0, this, SLOT( slotGoSystem() ), actionCollection(), "go_system" ); - (void) new KAction( i18n( "App&lications" ), "kmenu", 0, this, SLOT( slotGoApplications() ), actionCollection(), "go_applications" ); - (void) new KAction( i18n( "&Storage Media" ), "system", 0, this, SLOT( slotGoMedia() ), actionCollection(), "go_media" ); - (void) new KAction( i18n( "&Network Folders" ), "network", 0, this, SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" ); - (void) new KAction( i18n( "Sett&ings" ), "kcontrol", 0, this, SLOT( slotGoSettings() ), actionCollection(), "go_settings" ); - //(void) new KAction( i18n( "Sidebar Configuration" ), 0, this, SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" ); - (void) new KAction( i18n( "Trash" ), "trashcan_full", 0, this, SLOT( slotGoTrash() ), actionCollection(), "go_trash" ); - (void) new KAction( i18n( "Autostart" ), 0, this, SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" ); + connect( m_paHome, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this, + TQT_SLOT( slotHome(KAction::ActivationReason, Qt::ButtonState) ) ); + + (void) new KAction( i18n( "S&ystem" ), "system", 0, this, TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" ); + (void) new KAction( i18n( "App&lications" ), "kmenu", 0, this, TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" ); + (void) new KAction( i18n( "&Storage Media" ), "system", 0, this, TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" ); + (void) new KAction( i18n( "&Network Folders" ), "network", 0, this, TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" ); + (void) new KAction( i18n( "Sett&ings" ), "kcontrol", 0, this, TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" ); + //(void) new KAction( i18n( "Sidebar Configuration" ), 0, this, TQT_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" ); + (void) new KAction( i18n( "Trash" ), "trashcan_full", 0, this, TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" ); + (void) new KAction( i18n( "Autostart" ), 0, this, TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" ); KonqMostOftenURLSAction *mostOften = new KonqMostOftenURLSAction( i18n("Most Often Visited"), actionCollection(), "go_most_often" ); - connect( mostOften, SIGNAL( activated( const KURL& )), - SLOT( slotOpenURL( const KURL& ))); - (void) new KAction( i18n( "History" ), "history", 0, this, SLOT( slotGoHistory() ), actionCollection(), "go_history" ); + connect( mostOften, TQT_SIGNAL( activated( const KURL& )), + TQT_SLOT( slotOpenURL( const KURL& ))); + (void) new KAction( i18n( "History" ), "history", 0, this, TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" ); // Settings menu - m_paSaveViewProfile = new KAction( i18n( "&Save View Profile..." ), 0, this, SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" ); - m_paSaveViewPropertiesLocally = new KToggleAction( i18n( "Save View Changes per &Folder" ), 0, this, SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" ); + m_paSaveViewProfile = new KAction( i18n( "&Save View Profile..." ), 0, this, TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" ); + m_paSaveViewPropertiesLocally = new KToggleAction( i18n( "Save View Changes per &Folder" ), 0, this, TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" ); // "Remove" ? "Reset" ? The former is more correct, the latter is more kcontrol-like... - m_paRemoveLocalProperties = new KAction( i18n( "Remove Folder Properties" ), 0, this, SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" ); + m_paRemoveLocalProperties = new KAction( i18n( "Remove Folder Properties" ), 0, this, TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" ); m_configureModules << "kde-filebehavior.desktop" << "kde-fileappearance.desktop" << @@ -3814,41 +3814,41 @@ void KonqMainWindow::initActions() if (!kapp->authorizeControlModules(configModules()).isEmpty()) - KStdAction::preferences (this, SLOT (slotConfigure()), actionCollection() ); + KStdAction::preferences (this, TQT_SLOT (slotConfigure()), actionCollection() ); - KStdAction::keyBindings( guiFactory(), SLOT( configureShortcuts() ), actionCollection() ); - KStdAction::configureToolbars( this, SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); + KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); - m_paConfigureExtensions = new KAction( i18n("Configure Extensions..."), 0, this, SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions"); - m_paConfigureSpellChecking = new KAction( i18n("Configure Spell Checking..."), "spellcheck", 0,this, SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck"); + m_paConfigureExtensions = new KAction( i18n("Configure Extensions..."), 0, this, TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions"); + m_paConfigureSpellChecking = new KAction( i18n("Configure Spell Checking..."), "spellcheck", 0,this, TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck"); // Window menu - m_paSplitViewHor = new KAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, this, SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" ); - m_paSplitViewVer = new KAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, this, SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" ); - m_paAddTab = new KAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, SLOT( slotAddTab() ), actionCollection(), "newtab" ); - m_paDuplicateTab = new KAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, this, SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" ); - m_paBreakOffTab = new KAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, this, SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" ); - m_paRemoveView = new KAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, this, SLOT( slotRemoveView() ), actionCollection(), "removeview" ); - m_paRemoveTab = new KAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, this, SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" ); - m_paRemoveOtherTabs = new KAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, this, SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" ); - - m_paActivateNextTab = new KAction( i18n( "Activate Next Tab" ), "tab_next", QApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(), this, SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" ); - m_paActivatePrevTab = new KAction( i18n( "Activate Previous Tab" ), "tab_previous", QApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::tabPrev(), this, SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" ); - - QCString actionname; + m_paSplitViewHor = new KAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, this, TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" ); + m_paSplitViewVer = new KAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, this, TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" ); + m_paAddTab = new KAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" ); + m_paDuplicateTab = new KAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, this, TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" ); + m_paBreakOffTab = new KAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, this, TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" ); + m_paRemoveView = new KAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, this, TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" ); + m_paRemoveTab = new KAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, this, TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" ); + m_paRemoveOtherTabs = new KAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, this, TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" ); + + m_paActivateNextTab = new KAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(), this, TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" ); + m_paActivatePrevTab = new KAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::tabPrev(), this, TQT_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" ); + + TQCString actionname; for (int i=1;i<13;i++) { actionname.sprintf("activate_tab_%02d", i); - new KAction(i18n("Activate Tab %1").arg(i), 0, this, SLOT(slotActivateTab()), actionCollection(), actionname); + new KAction(i18n("Activate Tab %1").arg(i), 0, this, TQT_SLOT(slotActivateTab()), actionCollection(), actionname); } - m_paMoveTabLeft = new KAction( i18n("Move Tab Left"), 0 , CTRL+SHIFT+Key_Left,this, SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left"); - m_paMoveTabRight = new KAction( i18n("Move Tab Right"), 0 , CTRL+SHIFT+Key_Right,this, SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right"); + m_paMoveTabLeft = new KAction( i18n("Move Tab Left"), 0 , CTRL+SHIFT+Key_Left,this, TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left"); + m_paMoveTabRight = new KAction( i18n("Move Tab Right"), 0 , CTRL+SHIFT+Key_Right,this, TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right"); #ifndef NDEBUG - (void) new KAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, this, SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" ); + (void) new KAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, this, TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" ); #endif - m_paSaveRemoveViewProfile = new KAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" ); + m_paSaveRemoveViewProfile = new KAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQT_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" ); m_pamLoadViewProfile = new KActionMenu( i18n( "Load &View Profile" ), actionCollection(), "loadviewprofile" ); m_pViewManager->setProfiles( m_pamLoadViewProfile ); @@ -3857,19 +3857,19 @@ void KonqMainWindow::initActions() KShortcut fullScreenShortcut = m_ptaFullScreen->shortcut(); fullScreenShortcut.append( KKey( Key_F11 ) ); m_ptaFullScreen->setShortcut( fullScreenShortcut ); - connect( m_ptaFullScreen, SIGNAL( toggled( bool )), this, SLOT( slotUpdateFullScreen( bool ))); + connect( m_ptaFullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload); reloadShortcut.append(KKey(CTRL + Key_R)); - m_paReload = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, SLOT( slotReload() ), actionCollection(), "reload" ); - m_paReloadAllTabs = new KAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, this, SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" ); + m_paReload = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReload() ), actionCollection(), "reload" ); + m_paReloadAllTabs = new KAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, this, TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" ); - m_paReloadStop = new KAction( i18n( "&Reload/Stop" ), "reload", 0, this, SLOT( slotReloadStop() ), actionCollection(), "reload_stop" ); + m_paReloadStop = new KAction( i18n( "&Reload/Stop" ), "reload", 0, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" ); - m_paUndo = KStdAction::undo( KonqUndoManager::self(), SLOT( undo() ), actionCollection(), "undo" ); + m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" ); //m_paUndo->setEnabled( KonqUndoManager::self()->undoAvailable() ); - connect( KonqUndoManager::self(), SIGNAL( undoTextChanged( const QString & ) ), - m_paUndo, SLOT( setText( const QString & ) ) ); + connect( KonqUndoManager::self(), TQT_SIGNAL( undoTextChanged( const TQString & ) ), + m_paUndo, TQT_SLOT( setText( const TQString & ) ) ); // Those are connected to the browserextension directly m_paCut = KStdAction::cut( 0, 0, actionCollection(), "cut" ); @@ -3879,20 +3879,20 @@ void KonqMainWindow::initActions() m_paCopy = KStdAction::copy( 0, 0, actionCollection(), "copy" ); m_paPaste = KStdAction::paste( 0, 0, actionCollection(), "paste" ); - m_paStop = new KAction( i18n( "&Stop" ), "stop", Key_Escape, this, SLOT( slotStop() ), actionCollection(), "stop" ); + m_paStop = new KAction( i18n( "&Stop" ), "stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" ); m_paRename = new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, actionCollection(), "rename" ); m_paTrash = new KAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, actionCollection(), "trash" ); - connect( m_paTrash, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), - this, SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) ); + connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), + this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) ); m_paDelete = new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, actionCollection(), "del" ); - m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, this, SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" ); + m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, this, TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" ); // Location bar m_locationLabel = new KonqDraggableLabel( this, i18n("L&ocation: ") ); - (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, this, SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" ); + (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, this, TQT_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" ); m_locationLabel->setBuddy( m_combo ); KWidgetAction* comboAction = new KWidgetAction( m_combo, i18n( "Location Bar" ), 0, @@ -3900,14 +3900,14 @@ void KonqMainWindow::initActions() comboAction->setShortcutConfigurable( false ); comboAction->setAutoSized( true ); - QWhatsThis::add( m_combo, i18n( "Location Bar

" + TQWhatsThis::add( m_combo, i18n( "Location Bar

" "Enter a web address or search term." ) ); KAction *clearLocation = new KAction( i18n( "Clear Location Bar" ), - QApplication::reverseLayout() ? "clear_left" : "locationbar_erase", + TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", CTRL+Key_L, actionCollection(), "clear_location" ); - connect( clearLocation, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), - SLOT( slotClearLocationBar( KAction::ActivationReason, Qt::ButtonState ) ) ); + connect( clearLocation, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), + TQT_SLOT( slotClearLocationBar( KAction::ActivationReason, Qt::ButtonState ) ) ); clearLocation->setWhatsThis( i18n( "Clear Location bar

" "Clears the content of the location bar." ) ); @@ -3923,21 +3923,21 @@ void KonqMainWindow::initActions() m_pBookmarkMenu = new KBookmarkMenu( KonqBookmarkManager::self(), m_pBookmarksOwner, m_pamBookmarks->popupMenu(), m_bookmarksActionCollection, true ); connect( m_pBookmarkMenu, - SIGNAL( aboutToShowContextMenu(const KBookmark &, QPopupMenu*) ), - this, SLOT( slotFillContextMenu(const KBookmark &, QPopupMenu*) )); + TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ), + this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) )); connect( m_pBookmarkMenu, - SIGNAL( openBookmark(const QString &, Qt::ButtonState) ), - this, SLOT( slotOpenBookmarkURL(const QString &, Qt::ButtonState) )); + TQT_SIGNAL( openBookmark(const TQString &, Qt::ButtonState) ), + this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, Qt::ButtonState) )); KAction *addBookmark = actionCollection()->action("add_bookmark"); if (addBookmark) addBookmark->setText(i18n("Bookmark This Location")); - m_paShowMenuBar = KStdAction::showMenubar( this, SLOT( slotShowMenuBar() ), actionCollection() ); + m_paShowMenuBar = KStdAction::showMenubar( this, TQT_SLOT( slotShowMenuBar() ), actionCollection() ); - (void) new KAction( i18n( "Kon&queror Introduction" ), 0, this, SLOT( slotIntro() ), actionCollection(), "konqintro" ); + (void) new KAction( i18n( "Kon&queror Introduction" ), 0, this, TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" ); - KAction *goUrl = new KAction( i18n( "Go" ), "key_enter", 0, this, SLOT( goURL() ), actionCollection(), "go_url" ); + KAction *goUrl = new KAction( i18n( "Go" ), "key_enter", 0, this, TQT_SLOT( goURL() ), actionCollection(), "go_url" ); goUrl->setWhatsThis( i18n( "Go

" "Goes to the page that has been entered into the location bar." ) ); @@ -4009,7 +4009,7 @@ void KonqMainWindow::initActions() m_paLinkView->setToolTip( i18n("Sets the view as 'linked'. A linked view follows folder changes made in other linked views.") ); } -void KonqMainWindow::slotFillContextMenu( const KBookmark &bk, QPopupMenu * pm ) +void KonqMainWindow::slotFillContextMenu( const KBookmark &bk, TQPopupMenu * pm ) { kdDebug() << "KonqMainWindow::slotFillContextMenu(bk, pm == " << pm << ")" << endl; popupItems.clear(); @@ -4017,7 +4017,7 @@ void KonqMainWindow::slotFillContextMenu( const KBookmark &bk, QPopupMenu * pm ) //Set tab_new_x to point to the correct icon based on NewTabsInFront bool newtabsinfront = KonqSettings::newTabsInFront(); - QString tab_new_x ; + TQString tab_new_x ; if ( newtabsinfront ) tab_new_x = "tab_new" ; else @@ -4026,21 +4026,21 @@ void KonqMainWindow::slotFillContextMenu( const KBookmark &bk, QPopupMenu * pm ) if ( bk.isGroup() ) { KBookmarkGroup grp = bk.toGroup(); - QValueList list = grp.groupUrlList(); - QValueList::Iterator it = list.begin(); + TQValueList list = grp.groupUrlList(); + TQValueList::Iterator it = list.begin(); for (; it != list.end(); ++it ) - popupItems.append( new KFileItem( (*it), QString::null, KFileItem::Unknown) ); - pm->insertItem( SmallIcon(tab_new_x), i18n( "Open Folder in Tabs" ), this, SLOT( slotPopupNewTabRight() ) ); + popupItems.append( new KFileItem( (*it), TQString::null, KFileItem::Unknown) ); + pm->insertItem( SmallIcon(tab_new_x), i18n( "Open Folder in Tabs" ), this, TQT_SLOT( slotPopupNewTabRight() ) ); } else { - popupItems.append( new KFileItem( bk.url(), QString::null, KFileItem::Unknown) ); - pm->insertItem( SmallIcon("window_new"), i18n( "Open in New Window" ), this, SLOT( slotPopupNewWindow() ) ); - pm->insertItem( SmallIcon(tab_new_x), i18n( "Open in New Tab" ), this, SLOT( slotPopupNewTabRight() ) ); + popupItems.append( new KFileItem( bk.url(), TQString::null, KFileItem::Unknown) ); + pm->insertItem( SmallIcon("window_new"), i18n( "Open in New Window" ), this, TQT_SLOT( slotPopupNewWindow() ) ); + pm->insertItem( SmallIcon(tab_new_x), i18n( "Open in New Tab" ), this, TQT_SLOT( slotPopupNewTabRight() ) ); } } -void KonqMainWindow::slotOpenBookmarkURL( const QString & url, Qt::ButtonState state) +void KonqMainWindow::slotOpenBookmarkURL( const TQString & url, Qt::ButtonState state) { kdDebug(1202) << "KonqMainWindow::slotOpenBookmarkURL(" << url << ", " << state << ")" << endl; @@ -4069,7 +4069,7 @@ void KonqMainWindow::slotOpenBookmarkURL( const QString & url, Qt::ButtonState s void KonqMainWindow::slotMoveTabLeft() { - if ( QApplication::reverseLayout() ) + if ( TQApplication::reverseLayout() ) m_pViewManager->moveTabForward(); else m_pViewManager->moveTabBackward(); @@ -4077,7 +4077,7 @@ void KonqMainWindow::slotMoveTabLeft() void KonqMainWindow::slotMoveTabRight() { - if ( QApplication::reverseLayout() ) + if ( TQApplication::reverseLayout() ) m_pViewManager->moveTabBackward(); else m_pViewManager->moveTabForward(); @@ -4108,8 +4108,8 @@ void KonqMainWindow::updateToolBarActions( bool pendingAction /*=false*/) m_ptaUseHTML->setEnabled( true ); else if ( m_currentView->serviceTypes().contains( "text/html" ) ) { // Currently viewing an index.html file via this feature (i.e. url points to a dir) - QString locPath = KURL( m_currentView->locationBarURL() ).path(); - m_ptaUseHTML->setEnabled( QFileInfo( locPath ).isDir() ); + TQString locPath = KURL( m_currentView->locationBarURL() ).path(); + m_ptaUseHTML->setEnabled( TQFileInfo( locPath ).isDir() ); } else m_ptaUseHTML->setEnabled( false ); } @@ -4168,11 +4168,11 @@ void KonqMainWindow::updateViewActions() m_paActivateNextTab->setEnabled( state ); m_paActivatePrevTab->setEnabled( state ); - QPtrList* childFrameList = tabContainer->childFrameList(); + TQPtrList* childFrameList = tabContainer->childFrameList(); m_paMoveTabLeft->setEnabled( currentView() ? currentView()->frame()!= - (QApplication::reverseLayout() ? childFrameList->last() : childFrameList->first()) : false ); + (TQApplication::reverseLayout() ? childFrameList->last() : childFrameList->first()) : false ); m_paMoveTabRight->setEnabled( currentView() ? currentView()->frame()!= - (QApplication::reverseLayout() ? childFrameList->first() : childFrameList->last()) : false ); + (TQApplication::reverseLayout() ? childFrameList->first() : childFrameList->last()) : false ); } else { @@ -4205,15 +4205,15 @@ void KonqMainWindow::updateViewActions() { // F5 is the default key binding for Reload.... a la Windows. // mc users want F5 for Copy and F6 for move, but I can't make that default. - m_paCopyFiles = new KAction( i18n("Copy &Files..."), Key_F7, this, SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" ); - m_paMoveFiles = new KAction( i18n("M&ove Files..."), Key_F8, this, SLOT( slotMoveFiles() ), actionCollection(), "movefiles" ); + m_paCopyFiles = new KAction( i18n("Copy &Files..."), Key_F7, this, TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" ); + m_paMoveFiles = new KAction( i18n("M&ove Files..."), Key_F8, this, TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" ); // This action doesn't appear in the GUI, it's for the shortcut only. // KNewMenu takes care of the GUI stuff. - m_paNewDir = new KAction( i18n("Create Folder..." ), Key_F10, this, SLOT( slotNewDir() ), + m_paNewDir = new KAction( i18n("Create Folder..." ), Key_F10, this, TQT_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" ); - QPtrList lst; + TQPtrList lst; lst.append( m_paCopyFiles ); lst.append( m_paMoveFiles ); m_paCopyFiles->setEnabled( false ); @@ -4238,23 +4238,23 @@ void KonqMainWindow::updateViewActions() } } -QString KonqMainWindow::findIndexFile( const QString &dir ) +TQString KonqMainWindow::findIndexFile( const TQString &dir ) { - QDir d( dir ); + TQDir d( dir ); - QString f = d.filePath( "index.html", false ); - if ( QFile::exists( f ) ) + TQString f = d.filePath( "index.html", false ); + if ( TQFile::exists( f ) ) return f; f = d.filePath( "index.htm", false ); - if ( QFile::exists( f ) ) + if ( TQFile::exists( f ) ) return f; f = d.filePath( "index.HTML", false ); - if ( QFile::exists( f ) ) + if ( TQFile::exists( f ) ) return f; - return QString::null; + return TQString::null; } void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext ) @@ -4264,7 +4264,7 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext ) KParts::BrowserExtension::ActionSlotMap::ConstIterator it = actionSlotMap->begin(); KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end(); - QStrList slotNames = ext->metaObject()->slotNames(); + TQStrList slotNames = ext->metaObject()->slotNames(); for ( ; it != itEnd ; ++it ) { @@ -4276,9 +4276,9 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext ) if ( slotNames.contains( it.key()+"()" ) ) { if ( it.key() != "trash" ) - connect( act, SIGNAL( activated() ), ext, it.data() /* SLOT(slot name) */ ); + connect( act, TQT_SIGNAL( activated() ), ext, it.data() /* TQT_SLOT(slot name) */ ); act->setEnabled( ext->isActionEnabled( it.key() ) ); - const QString text = ext->actionText( it.key() ); + const TQString text = ext->actionText( it.key() ); if ( !text.isEmpty() ) act->setText( text ); // TODO how to re-set the original action text, when switching to a part that didn't call setAction? @@ -4298,7 +4298,7 @@ void KonqMainWindow::disconnectExtension( KParts::BrowserExtension *ext ) KParts::BrowserExtension::ActionSlotMap::ConstIterator it = actionSlotMap->begin(); KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end(); - QStrList slotNames = ext->metaObject()->slotNames(); + TQStrList slotNames = ext->metaObject()->slotNames(); for ( ; it != itEnd ; ++it ) { @@ -4348,7 +4348,7 @@ void KonqMainWindow::enableAction( const char * name, bool enabled ) } } -void KonqMainWindow::setActionText( const char * name, const QString& text ) +void KonqMainWindow::setActionText( const char * name, const TQString& text ) { KAction * act = actionCollection()->action( name ); if (!act) @@ -4373,13 +4373,13 @@ void KonqMainWindow::enableAllActions( bool enable ) kdDebug(1202) << "KonqMainWindow::enableAllActions " << enable << endl; KParts::BrowserExtension::ActionSlotMap * actionSlotMap = KParts::BrowserExtension::actionSlotMapPtr(); - QValueList actions = actionCollection()->actions(); - QValueList::Iterator it = actions.begin(); - QValueList::Iterator end = actions.end(); + TQValueList actions = actionCollection()->actions(); + TQValueList::Iterator it = actions.begin(); + TQValueList::Iterator end = actions.end(); for (; it != end; ++it ) { KAction *act = *it; - if ( !QString(act->name()).startsWith("options_configure") /* do not touch the configureblah actions */ + if ( !TQString(act->name()).startsWith("options_configure") /* do not touch the configureblah actions */ && ( !enable || !actionSlotMap->contains( act->name() ) ) ) /* don't enable BE actions */ act->setEnabled( enable ); } @@ -4405,7 +4405,7 @@ void KonqMainWindow::enableAllActions( bool enable ) if (m_toggleViewGUIClient) { - QPtrList actions = m_toggleViewGUIClient->actions(); + TQPtrList actions = m_toggleViewGUIClient->actions(); for ( KAction * it = actions.first(); it ; it = actions.next() ) it->setEnabled( true ); } @@ -4432,7 +4432,7 @@ void KonqMainWindow::disableActionsNoView() m_paLinkView->setEnabled( false ); if (m_toggleViewGUIClient) { - QPtrList actions = m_toggleViewGUIClient->actions(); + TQPtrList actions = m_toggleViewGUIClient->actions(); for ( KAction * it = actions.first(); it ; it = actions.next() ) it->setEnabled( false ); } @@ -4458,12 +4458,12 @@ void KonqMainWindow::disableActionsNoView() updateLocalPropsActions(); } -void KonqExtendedBookmarkOwner::openBookmarkURL( const QString & /*url*/ ) +void KonqExtendedBookmarkOwner::openBookmarkURL( const TQString & /*url*/ ) { // Do nothing, we catch the signal } -void KonqMainWindow::setCaption( const QString &caption ) +void KonqMainWindow::setCaption( const TQString &caption ) { // KParts sends us empty captions when activating a brand new part // We can't change it there (in case of apps removing all parts altogether) @@ -4491,24 +4491,24 @@ void KonqMainWindow::show() KParts::MainWindow::show(); } -QString KonqExtendedBookmarkOwner::currentURL() const +TQString KonqExtendedBookmarkOwner::currentURL() const { return m_pKonqMainWindow->currentURL(); } -QString KonqMainWindow::currentProfile() const +TQString KonqMainWindow::currentProfile() const { return m_pViewManager->currentProfile(); } -QString KonqMainWindow::currentURL() const +TQString KonqMainWindow::currentURL() const { if ( !m_currentView ) - return QString::null; - QString url = m_currentView->url().prettyURL(); + return TQString::null; + TQString url = m_currentView->url().prettyURL(); if ( m_currentView->part() && m_currentView->part()->inherits("KonqDirPart") ) { - QString nameFilter = static_cast(m_currentView->part())->nameFilter(); + TQString nameFilter = static_cast(m_currentView->part())->nameFilter(); if ( !nameFilter.isEmpty() ) { if (!url.endsWith("/")) @@ -4527,8 +4527,8 @@ void KonqExtendedBookmarkOwner::slotFillBookmarksList( KExtendedBookmarkOwner::Q KonqFrameTabs* tabContainer = static_cast(docContainer); - QPtrList frameList = *tabContainer->childFrameList(); - QPtrListIterator it( frameList ); + TQPtrList frameList = *tabContainer->childFrameList(); + TQPtrListIterator it( frameList ); for ( it.toFirst(); it != 0L; ++it ) { @@ -4541,22 +4541,22 @@ void KonqExtendedBookmarkOwner::slotFillBookmarksList( KExtendedBookmarkOwner::Q } } -QString KonqExtendedBookmarkOwner::currentTitle() const +TQString KonqExtendedBookmarkOwner::currentTitle() const { return m_pKonqMainWindow->currentTitle(); } -QString KonqMainWindow::currentTitle() const +TQString KonqMainWindow::currentTitle() const { - return m_currentView ? m_currentView->caption() : QString::null; + return m_currentView ? m_currentView->caption() : TQString::null; } -void KonqMainWindow::slotPopupMenu( const QPoint &_global, const KURL &url, const QString &_mimeType, mode_t _mode ) +void KonqMainWindow::slotPopupMenu( const TQPoint &_global, const KURL &url, const TQString &_mimeType, mode_t _mode ) { slotPopupMenu( 0L, _global, url, _mimeType, _mode ); } -void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KURL &url, const QString &_mimeType, mode_t _mode ) +void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KURL &url, const TQString &_mimeType, mode_t _mode ) { KFileItem item( url, _mimeType, _mode ); KFileItemList items; @@ -4564,7 +4564,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global slotPopupMenu( client, _global, items, KParts::URLArgs(), KParts::BrowserExtension::DefaultPopupItems, false ); //BE CAREFUL WITH sender() ! } -void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KURL &url, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags f, mode_t _mode ) +void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KURL &url, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags f, mode_t _mode ) { KFileItem item( url, _args.serviceType, _mode ); KFileItemList items; @@ -4572,22 +4572,22 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global slotPopupMenu( client, _global, items, _args, f, false ); //BE CAREFUL WITH sender() ! } -void KonqMainWindow::slotPopupMenu( const QPoint &_global, const KFileItemList &_items ) +void KonqMainWindow::slotPopupMenu( const TQPoint &_global, const KFileItemList &_items ) { slotPopupMenu( 0L, _global, _items ); } -void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KFileItemList &_items ) +void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KFileItemList &_items ) { slotPopupMenu( client, _global, _items, KParts::URLArgs(), KParts::BrowserExtension::DefaultPopupItems, true ); } -void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KFileItemList &_items, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags _flags ) +void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KFileItemList &_items, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags _flags ) { slotPopupMenu( client, _global, _items, _args, _flags, true ); } -void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KFileItemList &_items, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags itemFlags, bool showProperties ) +void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KFileItemList &_items, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags itemFlags, bool showProperties ) { KonqView * m_oldView = m_currentView; @@ -4615,7 +4615,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global // This action collection is used to pass actions to KonqPopupMenu. // It has to be a KActionCollection instead of a KActionPtrList because we need // the actionStatusText signal... - KActionCollection popupMenuCollection( (QWidget*)0 ); + KActionCollection popupMenuCollection( (TQWidget*)0 ); popupMenuCollection.insert( m_paBack ); popupMenuCollection.insert( m_paForward ); popupMenuCollection.insert( m_paUp ); @@ -4632,7 +4632,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global popupMenuCollection.insert( m_paDelete ); // The pasteto action is used when clicking on a dir, to paste into it. - KAction *actPaste = KStdAction::paste( this, SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" ); + KAction *actPaste = KStdAction::paste( this, TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" ); actPaste->setEnabled( m_paPaste->isEnabled() ); popupMenuCollection.insert( actPaste ); @@ -4647,11 +4647,11 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global else { m_popupURL = KURL(); - m_popupServiceType = QString::null; + m_popupServiceType = TQString::null; } if ( (_items.count() == 1) && !m_popupServiceType.isEmpty() ) { - QString currentServiceName = currentView->service()->desktopEntryName(); + TQString currentServiceName = currentView->service()->desktopEntryName(); // List of services for the "Preview In" submenu. m_popupEmbeddingServices = KTrader::self()->query( @@ -4663,7 +4663,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global "and DesktopEntryName != '"+currentServiceName+"' " // I had an old local dirtree.desktop without lib, no need for invalid entries "and exist [Library]", - QString::null ); + TQString::null ); } @@ -4705,21 +4705,21 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global if( doTabHandling ) { if (_args.forcesNewWindow()) { - actNewWindow = new KAction( i18n( "Open in T&his Window" ), 0, this, SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" ); + actNewWindow = new KAction( i18n( "Open in T&his Window" ), 0, this, TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" ); actNewWindow->setToolTip( i18n( "Open the document in current window" ) ); } - actNewWindow = new KAction( i18n( "Open in New &Window" ), "window_new", 0, this, SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" ); + actNewWindow = new KAction( i18n( "Open in New &Window" ), "window_new", 0, this, TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" ); actNewWindow->setToolTip( i18n( "Open the document in a new window" ) ); //Set tab_new_x to point to the correct icon based on NewTabsInFront bool newtabsinfront = KonqSettings::newTabsInFront(); - QString tab_new_x ; + TQString tab_new_x ; if ( newtabsinfront ) tab_new_x = "tab_new" ; else tab_new_x = "tab_new_bg" ; - actNewTab = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" ); + actNewTab = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" ); actNewTab->setToolTip( i18n( "Open the document in a new tab" ) ); doTabHandling = true; } @@ -4733,7 +4733,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global else kpf |= KonqPopupMenu::IsLink; // HACK - QGuardedPtr pPopupMenu = new KonqPopupMenu( + TQGuardedPtr pPopupMenu = new KonqPopupMenu( KonqBookmarkManager::self(), _items, viewURL, popupMenuCollection, @@ -4750,7 +4750,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global // We will need these if we call the newTab slot popupItems = _items; popupUrlArgs = _args; - popupUrlArgs.serviceType = QString::null; // Reset so that Open in New Window/Tab does mimetype detection + popupUrlArgs.serviceType = TQString::null; // Reset so that Open in New Window/Tab does mimetype detection connectActionCollection( pPopupMenu->actionCollection() ); @@ -4763,15 +4763,15 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global if ( be ) { - QObject::connect( this, SIGNAL(popupItemsDisturbed()), pPopupMenu, SLOT(close()) ); - QObject::connect( be, SIGNAL(itemsRemoved(const KFileItemList &)), - this, SLOT(slotItemsRemoved(const KFileItemList &)) ); + TQObject::connect( this, TQT_SIGNAL(popupItemsDisturbed()), pPopupMenu, TQT_SLOT(close()) ); + TQObject::connect( be, TQT_SIGNAL(itemsRemoved(const KFileItemList &)), + this, TQT_SLOT(slotItemsRemoved(const KFileItemList &)) ); } - QObject::disconnect( m_pMenuNew->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotFileNewAboutToShow()) ); + TQObject::disconnect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(slotFileNewAboutToShow()) ); - QGuardedPtr guard(this); // #149736 + TQGuardedPtr guard(this); // #149736 pPopupMenu->exec( _global ); delete pPopupMenu; @@ -4788,13 +4788,13 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global return; } - QObject::connect( m_pMenuNew->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotFileNewAboutToShow()) ); + TQObject::connect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(slotFileNewAboutToShow()) ); if ( be ) { - QObject::disconnect( be, SIGNAL(itemsRemoved(const KFileItemList &)), - this, SLOT(slotItemsRemoved(const KFileItemList &)) ); + TQObject::disconnect( be, TQT_SIGNAL(itemsRemoved(const KFileItemList &)), + this, TQT_SLOT(slotItemsRemoved(const KFileItemList &)) ); } delete konqyMenuClient; @@ -4825,8 +4825,8 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global m_currentView = m_oldView; } // Special case: RMB + renaming in sidebar; setFocus would abort editing. - QWidget* fw = focusWidget(); - if ( !fw || !::qt_cast( fw ) ) + TQWidget* fw = focusWidget(); + if ( !fw || !::qt_cast( fw ) ) m_oldView->part()->widget()->setFocus(); } } @@ -4834,7 +4834,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global void KonqMainWindow::slotItemsRemoved( const KFileItemList &items ) { - QPtrListIterator it( items ); + TQPtrListIterator it( items ); for ( ; it.current(); ++it ) { if ( popupItems.contains( it.current() ) ) @@ -4847,20 +4847,20 @@ void KonqMainWindow::slotItemsRemoved( const KFileItemList &items ) void KonqMainWindow::slotOpenEmbedded() { - QCString name = sender()->name(); + TQCString name = sender()->name(); m_popupService = m_popupEmbeddingServices[ name.toInt() ]->desktopEntryName(); m_popupEmbeddingServices.clear(); - QTimer::singleShot( 0, this, SLOT( slotOpenEmbeddedDoIt() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotOpenEmbeddedDoIt() ) ); } void KonqMainWindow::slotOpenEmbeddedDoIt() { m_currentView->stop(); m_currentView->setLocationBarURL(m_popupURL); - m_currentView->setTypedURL(QString::null); + m_currentView->setTypedURL(TQString::null); if ( m_currentView->changeViewMode( m_popupServiceType, m_popupService ) ) m_currentView->openURL( m_popupURL, m_popupURL.pathOrURL() ); @@ -4912,15 +4912,15 @@ void KonqMainWindow::saveProperties( KConfig *config ) void KonqMainWindow::readProperties( KConfig *config ) { kdDebug(1202) << "KonqMainWindow::readProperties( KConfig *config )" << endl; - m_pViewManager->loadViewProfile( *config, QString::null /*no profile name*/ ); + m_pViewManager->loadViewProfile( *config, TQString::null /*no profile name*/ ); } -void KonqMainWindow::setInitialFrameName( const QString &name ) +void KonqMainWindow::setInitialFrameName( const TQString &name ) { m_initialFrameName = name; } -void KonqMainWindow::slotActionStatusText( const QString &text ) +void KonqMainWindow::slotActionStatusText( const TQString &text ) { if ( !m_currentView ) return; @@ -4963,8 +4963,8 @@ void KonqMainWindow::updateOpenWithActions() KAction *action = new KAction( i18n( "Open with %1" ).arg( (*it)->name() ), 0, 0, (*it)->desktopEntryName().latin1() ); action->setIcon( (*it)->icon() ); - connect( action, SIGNAL( activated() ), - this, SLOT( slotOpenWith() ) ); + connect( action, TQT_SIGNAL( activated() ), + this, TQT_SLOT( slotOpenWith() ) ); m_openWithActions.append( action ); } @@ -4975,11 +4975,11 @@ void KonqMainWindow::updateOpenWithActions() } } -QString KonqMainWindow::viewModeActionKey( KService::Ptr service ) +TQString KonqMainWindow::viewModeActionKey( KService::Ptr service ) { - QString library = service->library(); + TQString library = service->library(); // Group all non-builtin views together - QVariant builtIntoProp = service->property( "X-KDE-BrowserView-Built-Into" ); + TQVariant builtIntoProp = service->property( "X-KDE-BrowserView-Built-Into" ); if ( !builtIntoProp.isValid() || builtIntoProp.toString() != "konqueror" ) library = "external"; return library; @@ -4990,7 +4990,7 @@ void KonqMainWindow::updateViewModeActions() unplugViewModeActions(); if ( m_viewModeMenu ) { - QPtrListIterator it( m_viewModeActions ); + TQPtrListIterator it( m_viewModeActions ); for (; it.current(); ++it ) it.current()->unplugAll(); delete m_viewModeMenu; @@ -5025,10 +5025,10 @@ void KonqMainWindow::updateViewModeActions() // treeview, etc.) into to two groups -> icon/list // Although I wrote this now only of icon/listview it has to work for // any view, that's why it's so general :) - QMap groupedServiceMap; + TQMap groupedServiceMap; // Another temporary map, the preferred service for each library (2 entries in our example) - QMap preferredServiceMap; + TQMap preferredServiceMap; KConfig * config = KGlobal::config(); config->setGroup( "ModeToolBarServices" ); @@ -5037,18 +5037,18 @@ void KonqMainWindow::updateViewModeActions() KTrader::OfferList::ConstIterator end = services.end(); for (; it != end; ++it ) { - QVariant prop = (*it)->property( "X-KDE-BrowserView-Toggable" ); + TQVariant prop = (*it)->property( "X-KDE-BrowserView-Toggable" ); if ( prop.isValid() && prop.toBool() ) // No toggable views in view mode continue; KRadioAction *action; - QString itname = (*it)->genericName(); + TQString itname = (*it)->genericName(); if (itname.isEmpty()) itname = (*it)->name(); - QString icon = (*it)->icon(); - if ( icon != QString::fromLatin1( "unknown" ) ) + TQString icon = (*it)->icon(); + if ( icon != TQString::fromLatin1( "unknown" ) ) // we *have* to specify a parent qobject, otherwise the exclusive group stuff doesn't work!(Simon) action = new KRadioAction( itname, icon, 0, this, (*it)->desktopEntryName().ascii() ); else @@ -5056,31 +5056,31 @@ void KonqMainWindow::updateViewModeActions() action->setExclusiveGroup( "KonqMainWindow_ViewModes" ); - connect( action, SIGNAL( toggled( bool ) ), - this, SLOT( slotViewModeToggle( bool ) ) ); + connect( action, TQT_SIGNAL( toggled( bool ) ), + this, TQT_SLOT( slotViewModeToggle( bool ) ) ); m_viewModeActions.append( action ); action->plug( m_viewModeMenu->popupMenu() ); - const QString library = viewModeActionKey( *it ); + const TQString library = viewModeActionKey( *it ); // look if we already have a KonqViewModeAction (in the toolbar) // for this component - QMap::Iterator mapIt = groupedServiceMap.find( library ); + TQMap::Iterator mapIt = groupedServiceMap.find( library ); // if we don't have -> create one if ( mapIt == groupedServiceMap.end() ) { // default service on this action: the current one (i.e. the first one) - QString text = itname; - QString icon = (*it)->icon(); - QCString name = (*it)->desktopEntryName().latin1(); + TQString text = itname; + TQString icon = (*it)->icon(); + TQCString name = (*it)->desktopEntryName().latin1(); //kdDebug(1202) << " Creating action for " << library << ". Default service " << itname << endl; // if we previously changed the viewmode (see slotViewModeToggle!) // then we will want to use the previously used settings (previous as // in before the actions got deleted) - QMap::ConstIterator serviceIt = m_viewModeToolBarServices.find( library ); + TQMap::ConstIterator serviceIt = m_viewModeToolBarServices.find( library ); if ( serviceIt != m_viewModeToolBarServices.end() ) { kdDebug(1202) << " Setting action for " << library << " to " << (*serviceIt)->name() << endl; @@ -5093,7 +5093,7 @@ void KonqMainWindow::updateViewModeActions() { // if we don't have it in the map, we should look for a setting // for this library in the config file. - QString preferredService = config->readEntry( library ); + TQString preferredService = config->readEntry( library ); if ( !preferredService.isEmpty() && name != preferredService.latin1() ) { //kdDebug(1202) << " Inserting into preferredServiceMap(" << library << ") : " << preferredService << endl; @@ -5111,8 +5111,8 @@ void KonqMainWindow::updateViewModeActions() tbAction->setChecked( action->isChecked() ); - connect( tbAction, SIGNAL( toggled( bool ) ), - this, SLOT( slotViewModeToggle( bool ) ) ); + connect( tbAction, TQT_SIGNAL( toggled( bool ) ), + this, TQT_SLOT( slotViewModeToggle( bool ) ) ); m_toolBarViewModeActions.append( tbAction ); @@ -5133,7 +5133,7 @@ void KonqMainWindow::updateViewModeActions() { //kdDebug(1202) << " Changing action for " << library << " into service " << (*it)->name() << endl; - QString mapitname = (*it)->genericName(); + TQString mapitname = (*it)->genericName(); if (mapitname.isEmpty()) mapitname = (*it)->name(); (*mapIt)->setText( mapitname ); @@ -5150,8 +5150,8 @@ void KonqMainWindow::updateViewModeActions() // Note that this can happen (map not empty) when a inode/directory view is removed, // and remains in the KConfig file. Q_ASSERT( preferredServiceMap.isEmpty() ); - QMap::Iterator debugIt = preferredServiceMap.begin(); - QMap::Iterator debugEnd = preferredServiceMap.end(); + TQMap::Iterator debugIt = preferredServiceMap.begin(); + TQMap::Iterator debugEnd = preferredServiceMap.end(); for ( ; debugIt != debugEnd ; ++debugIt ) kdDebug(1202) << " STILL IN preferredServiceMap : " << debugIt.key() << " | " << debugIt.data() << endl; #endif @@ -5164,8 +5164,8 @@ void KonqMainWindow::updateViewModeActions() void KonqMainWindow::saveToolBarServicesMap() { - QMap::ConstIterator serviceIt = m_viewModeToolBarServices.begin(); - QMap::ConstIterator serviceEnd = m_viewModeToolBarServices.end(); + TQMap::ConstIterator serviceIt = m_viewModeToolBarServices.begin(); + TQMap::ConstIterator serviceEnd = m_viewModeToolBarServices.end(); KConfig * config = KGlobal::config(); config->setGroup( "ModeToolBarServices" ); for ( ; serviceIt != serviceEnd ; ++serviceIt ) @@ -5175,7 +5175,7 @@ void KonqMainWindow::saveToolBarServicesMap() void KonqMainWindow::plugViewModeActions() { - QPtrList lst; + TQPtrList lst; lst.append( m_viewModeMenu ); plugActionList( "viewmode", lst ); // display the toolbar viewmode icons only for inode/directory, as here we have dedicated icons @@ -5206,7 +5206,7 @@ void KonqMainWindow::updateBookmarkBar() } -void KonqMainWindow::closeEvent( QCloseEvent *e ) +void KonqMainWindow::closeEvent( TQCloseEvent *e ) { kdDebug(1202) << "KonqMainWindow::closeEvent begin" << endl; // This breaks session management (the window is withdrawn in kwin) @@ -5219,7 +5219,7 @@ void KonqMainWindow::closeEvent( QCloseEvent *e ) if ( tabContainer->count() > 1 ) { KConfig *config = KGlobal::config(); - KConfigGroupSaver cs( config, QString::fromLatin1("Notification Messages") ); + KConfigGroupSaver cs( config, TQString::fromLatin1("Notification Messages") ); if ( !config->hasKey( "MultipleTabConfirm" ) ) { @@ -5258,7 +5258,7 @@ void KonqMainWindow::closeEvent( QCloseEvent *e ) for (; it != end; ++it ) { KonqView *view = it.data(); if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { - QVariant prop = view->part()->property("modified"); + TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); if ( KMessageBox::warningContinueCancel( this, @@ -5277,7 +5277,7 @@ void KonqMainWindow::closeEvent( QCloseEvent *e ) else if ( m_currentView && m_currentView->part() && (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { - QVariant prop = m_currentView->part()->property("modified"); + TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, i18n("This page contains changes that have not been submitted.\nClosing the window will discard these changes."), @@ -5300,7 +5300,7 @@ void KonqMainWindow::closeEvent( QCloseEvent *e ) for (; it != end; ++it ) { if ( (*it)->part() && (*it)->part()->widget() ) - QApplication::sendEvent( (*it)->part()->widget(), e ); + TQApplication::sendEvent( (*it)->part()->widget(), e ); } KParts::MainWindow::closeEvent( e ); if( isPreloaded() && !kapp->sessionSaving()) @@ -5317,13 +5317,13 @@ bool KonqMainWindow::queryExit() return !stayPreloaded(); } -void KonqMainWindow::setIcon( const QPixmap& pix ) +void KonqMainWindow::setIcon( const TQPixmap& pix ) { KParts::MainWindow::setIcon( pix ); - QPixmap big = pix; + TQPixmap big = pix; - QString url = m_combo->currentText(); + TQString url = m_combo->currentText(); if ( !url.isEmpty() ) big = KonqPixmapProvider::self()->pixmapFor( url, KIcon::SizeMedium ); @@ -5338,12 +5338,12 @@ void KonqMainWindow::slotIntro() void KonqMainWindow::goURL() { - QLineEdit *lineEdit = m_combo->lineEdit(); + TQLineEdit *lineEdit = m_combo->lineEdit(); if ( !lineEdit ) return; - QKeyEvent event( QEvent::KeyPress, Key_Return, '\n', 0 ); - QApplication::sendEvent( lineEdit, &event ); + TQKeyEvent event( TQEvent::KeyPress, Key_Return, '\n', 0 ); + TQApplication::sendEvent( lineEdit, &event ); } void KonqMainWindow::slotLocationLabelActivated() @@ -5363,7 +5363,7 @@ KAction *a = m_toggleViewGUIClient->action("konq_sidebartng"); return (a && static_cast(a)->isChecked()); } -void KonqMainWindow::slotAddWebSideBar(const KURL& url, const QString& name) +void KonqMainWindow::slotAddWebSideBar(const KURL& url, const TQString& name) { if (url.url().isEmpty() && name.isEmpty()) return; @@ -5404,8 +5404,8 @@ void KonqMainWindow::slotAddWebSideBar(const KURL& url, const QString& name) void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group ) { - static const QString& http = KGlobal::staticQString( "http" ); - static const QString& ftp = KGlobal::staticQString( "ftp" ); + static const TQString& http = KGlobal::staticQString( "http" ); + static const TQString& ftp = KGlobal::staticQString( "ftp" ); if ( group.isNull() ) return; @@ -5421,7 +5421,7 @@ void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group ) if ( !url.isValid() ) continue; - QString u = url.prettyURL(); + TQString u = url.prettyURL(); s_pCompletion->addItem( u ); if ( url.isLocalFile() ) @@ -5436,18 +5436,18 @@ void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group ) void KonqMainWindow::connectActionCollection( KActionCollection *coll ) { - connect( coll, SIGNAL( actionStatusText( const QString & ) ), - this, SLOT( slotActionStatusText( const QString & ) ) ); - connect( coll, SIGNAL( clearStatusText() ), - this, SLOT( slotClearStatusText() ) ); + connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), + this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( coll, TQT_SIGNAL( clearStatusText() ), + this, TQT_SLOT( slotClearStatusText() ) ); } void KonqMainWindow::disconnectActionCollection( KActionCollection *coll ) { - disconnect( coll, SIGNAL( actionStatusText( const QString & ) ), - this, SLOT( slotActionStatusText( const QString & ) ) ); - disconnect( coll, SIGNAL( clearStatusText() ), - this, SLOT( slotClearStatusText() ) ); + disconnect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), + this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); + disconnect( coll, TQT_SIGNAL( clearStatusText() ), + this, TQT_SLOT( slotClearStatusText() ) ); } // @@ -5456,16 +5456,16 @@ void KonqMainWindow::disconnectActionCollection( KActionCollection *coll ) // prepend http://www. or http:// if there's no protocol in 's' // used only when there are no completion matches -static QString hp_tryPrepend( const QString& s ) +static TQString hp_tryPrepend( const TQString& s ) { if( s.isEmpty() || s[ 0 ] == '/' ) - return QString::null; + return TQString::null; for( unsigned int pos = 0; pos < s.length() - 2; // 4 = ://x ++pos ) { if( s[ pos ] == ':' && s[ pos + 1 ] == '/' && s[ pos + 2 ] == '/' ) - return QString::null; + return TQString::null; if( !s[ pos ].isLetter() ) break; } @@ -5473,7 +5473,7 @@ static QString hp_tryPrepend( const QString& s ) } -static void hp_removeDupe( KCompletionMatches& l, const QString& dupe, +static void hp_removeDupe( KCompletionMatches& l, const TQString& dupe, KCompletionMatches::Iterator it_orig ) { for( KCompletionMatches::Iterator it = l.begin(); @@ -5497,15 +5497,15 @@ static void hp_removeDupe( KCompletionMatches& l, const QString& dupe, // some duplicates are also created by prepending protocols static void hp_removeDuplicates( KCompletionMatches& l ) { - QString http = "http://"; - QString ftp = "ftp://ftp."; - QString file = "file:"; - QString file2 = "file://"; + TQString http = "http://"; + TQString ftp = "ftp://ftp."; + TQString file = "file:"; + TQString file2 = "file://"; l.removeDuplicates(); for( KCompletionMatches::Iterator it = l.begin(); it != l.end(); ++it ) { - QString str = (*it).value(); + TQString str = (*it).value(); if( str.startsWith( http )) { if( str.find( '/', 7 ) < 0 ) { // http://something hp_removeDupe( l, str + '/', it ); @@ -5525,7 +5525,7 @@ static void hp_removeDuplicates( KCompletionMatches& l ) } } -static void hp_removeCommonPrefix( KCompletionMatches& l, const QString& prefix ) +static void hp_removeCommonPrefix( KCompletionMatches& l, const TQString& prefix ) { for( KCompletionMatches::Iterator it = l.begin(); it != l.end(); @@ -5540,7 +5540,7 @@ static void hp_removeCommonPrefix( KCompletionMatches& l, const QString& prefix // don't include common prefixes like 'http://', i.e. when s == 'h', include // http://hotmail.com but don't include everything just starting with 'http://' -static void hp_checkCommonPrefixes( KCompletionMatches& matches, const QString& s ) +static void hp_checkCommonPrefixes( KCompletionMatches& matches, const TQString& s ) { static const char* const prefixes[] = { "http://", @@ -5556,43 +5556,43 @@ static void hp_checkCommonPrefixes( KCompletionMatches& matches, const QString& for( const char* const *pos = prefixes; *pos != NULL; ++pos ) { - QString prefix = *pos; + TQString prefix = *pos; if( prefix.startsWith( s )) { hp_removeCommonPrefix( matches, prefix ); } } } -QStringList KonqMainWindow::historyPopupCompletionItems( const QString& s) +TQStringList KonqMainWindow::historyPopupCompletionItems( const TQString& s) { - const QString http = "http://"; - const QString https = "https://"; - const QString www = "http://www."; - const QString wwws = "https://www."; - const QString ftp = "ftp://"; - const QString ftpftp = "ftp://ftp."; - const QString file = "file:"; // without /, because people enter /usr etc. - const QString file2 = "file://"; + const TQString http = "http://"; + const TQString https = "https://"; + const TQString www = "http://www."; + const TQString wwws = "https://www."; + const TQString ftp = "ftp://"; + const TQString ftpftp = "ftp://ftp."; + const TQString file = "file:"; // without /, because people enter /usr etc. + const TQString file2 = "file://"; if( s.isEmpty()) - return QStringList(); + return TQStringList(); KCompletionMatches matches= s_pCompletion->allWeightedMatches( s ); hp_checkCommonPrefixes( matches, s ); bool checkDuplicates = false; if ( !s.startsWith( ftp ) ) { matches += s_pCompletion->allWeightedMatches( ftp + s ); - if( QString( "ftp." ).startsWith( s )) + if( TQString( "ftp." ).startsWith( s )) hp_removeCommonPrefix( matches, ftpftp ); checkDuplicates = true; } if ( !s.startsWith( https ) ) { matches += s_pCompletion->allWeightedMatches( https + s ); - if( QString( "www." ).startsWith( s )) + if( TQString( "www." ).startsWith( s )) hp_removeCommonPrefix( matches, wwws ); checkDuplicates = true; } if ( !s.startsWith( http )) { matches += s_pCompletion->allWeightedMatches( http + s ); - if( QString( "www." ).startsWith( s )) + if( TQString( "www." ).startsWith( s )) hp_removeCommonPrefix( matches, www ); checkDuplicates = true; } @@ -5618,11 +5618,11 @@ QStringList KonqMainWindow::historyPopupCompletionItems( const QString& s) } if( checkDuplicates ) hp_removeDuplicates( matches ); - QStringList items = matches.list(); + TQStringList items = matches.list(); if( items.count() == 0 && !s.contains( ':' ) && s[ 0 ] != '/' ) { - QString pre = hp_tryPrepend( s ); + TQString pre = hp_tryPrepend( s ); if( !pre.isNull()) items += pre; } @@ -5665,37 +5665,37 @@ void KonqMainWindow::removeChildFrame( KonqFrameBase * /*frame*/ ) m_pActiveChild = 0L; } -void KonqMainWindow::saveConfig( KConfig* config, const QString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth ) { if( m_pChildFrame ) m_pChildFrame->saveConfig( config, prefix, saveURLs, docContainer, id, depth); } +void KonqMainWindow::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth ) { if( m_pChildFrame ) m_pChildFrame->saveConfig( config, prefix, saveURLs, docContainer, id, depth); } void KonqMainWindow::copyHistory( KonqFrameBase *other ) { if( m_pChildFrame ) m_pChildFrame->copyHistory( other ); } -void KonqMainWindow::printFrameInfo( const QString &spaces ) { if( m_pChildFrame ) m_pChildFrame->printFrameInfo( spaces ); } +void KonqMainWindow::printFrameInfo( const TQString &spaces ) { if( m_pChildFrame ) m_pChildFrame->printFrameInfo( spaces ); } -void KonqMainWindow::reparentFrame( QWidget* /*parent*/, - const QPoint & /*p*/, bool /*showIt*/ ) { return; } +void KonqMainWindow::reparentFrame( TQWidget* /*parent*/, + const TQPoint & /*p*/, bool /*showIt*/ ) { return; } KonqFrameContainerBase* KonqMainWindow::parentContainer()const { return 0L; } void KonqMainWindow::setParentContainer(KonqFrameContainerBase* /*parent*/) { return; } -void KonqMainWindow::setTitle( const QString &/*title*/ , QWidget* /*sender*/) { return; } -void KonqMainWindow::setTabIcon( const KURL &/*url*/, QWidget* /*sender*/ ) { return; } +void KonqMainWindow::setTitle( const TQString &/*title*/ , TQWidget* /*sender*/) { return; } +void KonqMainWindow::setTabIcon( const KURL &/*url*/, TQWidget* /*sender*/ ) { return; } -QWidget* KonqMainWindow::widget() { return this; } +TQWidget* KonqMainWindow::widget() { return this; } void KonqMainWindow::listViews( ChildViewList *viewList ) { if( m_pChildFrame ) m_pChildFrame->listViews( viewList ); } -QCString KonqMainWindow::frameType() { return QCString("MainWindow"); } +TQCString KonqMainWindow::frameType() { return TQCString("MainWindow"); } KonqFrameBase* KonqMainWindow::childFrame()const { return m_pChildFrame; } void KonqMainWindow::setActiveChild( KonqFrameBase* /*activeChild*/ ) { return; } -bool KonqMainWindow::isMimeTypeAssociatedWithSelf( const QString &mimeType ) +bool KonqMainWindow::isMimeTypeAssociatedWithSelf( const TQString &mimeType ) { return isMimeTypeAssociatedWithSelf( mimeType, KServiceTypeProfile::preferredService( mimeType, "Application" ) ); } -bool KonqMainWindow::isMimeTypeAssociatedWithSelf( const QString &/*mimeType*/, const KService::Ptr &offer ) +bool KonqMainWindow::isMimeTypeAssociatedWithSelf( const TQString &/*mimeType*/, const KService::Ptr &offer ) { // Prevention against user stupidity : if the associated app for this mimetype // is konqueror/kfmclient, then we'll loop forever. So we have to @@ -5739,7 +5739,7 @@ void KonqMainWindow::resetWindow() { char data[ 1 ]; // empty append to get current X timestamp - QWidget tmp_widget; + TQWidget tmp_widget; XChangeProperty( qt_xdisplay(), tmp_widget.winId(), XA_WM_CLASS, XA_STRING, 8, PropModeAppend, (unsigned char*) &data, 0 ); XEvent ev; @@ -5769,14 +5769,14 @@ void KonqMainWindow::resetWindow() kapp->setTopWidget( this ); // set again the default window icon } -bool KonqMainWindow::event( QEvent* e ) +bool KonqMainWindow::event( TQEvent* e ) { - if( e->type() == QEvent::DeferredDelete ) + if( e->type() == TQEvent::DeferredDelete ) { // since the preloading code tries to reuse KonqMainWindow, // the last window shouldn't be really deleted, but only hidden // deleting WDestructiveClose windows is done using deleteLater(), - // so catch QEvent::DefferedDelete and check if this window should stay + // so catch TQEvent::DefferedDelete and check if this window should stay if( stayPreloaded()) { setWFlags(WDestructiveClose); // was reset before deleteLater() @@ -5859,10 +5859,10 @@ static int current_memory_usage( int* limit ) { #ifdef __linux__ // Check whole memory usage - VmSize - QFile f( QCString().sprintf( "/proc/%i/statm", getpid())); + TQFile f( TQCString().sprintf( "/proc/%i/statm", getpid())); if( f.open( IO_ReadOnly )) { - QString line; + TQString line; if( f.readLine( line, 1024 ) > 0 ) { line = line.stripWhiteSpace(); @@ -5914,7 +5914,7 @@ static int current_memory_usage( int* limit ) void KonqMainWindow::saveWindowSize() const { - QString savedGroup = KGlobal::config()->group(); + TQString savedGroup = KGlobal::config()->group(); KGlobal::config()->setGroup( "KonqMainWindow_Size" ); KParts::MainWindow::saveWindowSize( KGlobal::config() ); @@ -5925,7 +5925,7 @@ void KonqMainWindow::saveWindowSize() const void KonqMainWindow::restoreWindowSize() { - QString savedGroup = KGlobal::config()->group(); + TQString savedGroup = KGlobal::config()->group(); KGlobal::config()->setGroup( "KonqMainWindow_Size" ); KParts::MainWindow::restoreWindowSize( KGlobal::config() ); diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h index 3dbba5658..c5f89f654 100644 --- a/konqueror/konq_mainwindow.h +++ b/konqueror/konq_mainwindow.h @@ -22,10 +22,10 @@ #ifndef __konq_mainwindow_h__ #define __konq_mainwindow_h__ -#include -#include -#include -#include +#include +#include +#include +#include #include #include "konq_openurlrequest.h" @@ -91,42 +91,42 @@ class KonqMainWindow : public KParts::MainWindow, public KonqFrameContainerBase Q_PROPERTY( int viewCount READ viewCount ) Q_PROPERTY( int activeViewsCount READ activeViewsCount ) Q_PROPERTY( int linkableViewsCount READ linkableViewsCount ) - Q_PROPERTY( QString locationBarURL READ locationBarURL ) + Q_PROPERTY( TQString locationBarURL READ locationBarURL ) Q_PROPERTY( bool fullScreenMode READ fullScreenMode ) - Q_PROPERTY( QString currentTitle READ currentTitle ) - Q_PROPERTY( QString currentURL READ currentURL ) + Q_PROPERTY( TQString currentTitle READ currentTitle ) + Q_PROPERTY( TQString currentURL READ currentURL ) Q_PROPERTY( bool isHTMLAllowed READ isHTMLAllowed ) - Q_PROPERTY( QString currentProfile READ currentProfile ) + Q_PROPERTY( TQString currentProfile READ currentProfile ) public: enum ComboAction { ComboClear, ComboAdd, ComboRemove }; enum PageSecurity { NotCrypted, Encrypted, Mixed }; - KonqMainWindow( const KURL &initialURL = KURL(), bool openInitialURL = true, const char *name = 0, const QString& xmluiFile="konqueror.rc"); + KonqMainWindow( const KURL &initialURL = KURL(), bool openInitialURL = true, const char *name = 0, const TQString& xmluiFile="konqueror.rc"); ~KonqMainWindow(); /** * Filters the URL and calls the main openURL method. */ - void openFilteredURL( const QString & _url, KonqOpenURLRequest& _req); + void openFilteredURL( const TQString & _url, KonqOpenURLRequest& _req); /** * Filters the URL and calls the main openURL method. */ - void openFilteredURL( const QString &_url, bool inNewTab = false, bool tempFile = false ); + void openFilteredURL( const TQString &_url, bool inNewTab = false, bool tempFile = false ); /** * The main openURL method. */ void openURL( KonqView * view, const KURL & url, - const QString &serviceType = QString::null, + const TQString &serviceType = TQString::null, KonqOpenURLRequest & req = KonqOpenURLRequest::null, bool trustedSource = false ); /** * Called by openURL when it knows the service type (either directly, * or using KonqRun) */ - bool openView( QString serviceType, const KURL &_url, KonqView *childView, + bool openView( TQString serviceType, const KURL &_url, KonqView *childView, KonqOpenURLRequest & req = KonqOpenURLRequest::null ); @@ -137,15 +137,15 @@ public: KonqViewManager *viewManager() const { return m_pViewManager; } // Central widget of the mainwindow, never 0L - QWidget *mainWidget() const; + TQWidget *mainWidget() const; - virtual QWidget *createContainer( QWidget *parent, int index, const QDomElement &element, int &id ); - virtual void removeContainer( QWidget *container, QWidget *parent, QDomElement &element, int id ); + virtual TQWidget *createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id ); + virtual void removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id ); virtual void saveProperties( KConfig *config ); virtual void readProperties( KConfig *config ); - void setInitialFrameName( const QString &name ); + void setInitialFrameName( const TQString &name ); KonqMainWindowIface * dcopObject(); @@ -154,10 +154,10 @@ public: void insertChildView( KonqView *childView ); void removeChildView( KonqView *childView ); KonqView *childView( KParts::ReadOnlyPart *view ); - KonqView *childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); + KonqView *childView( KParts::ReadOnlyPart *callingPart, const TQString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); // dcop idl bug! it can't handle KonqMainWindow *&mainWindow - static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); + static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const TQString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); // Total number of views int viewCount() const { return m_mapViews.count(); } @@ -171,7 +171,7 @@ public: // Number of main views (non-toggle non-passive views) int mainViewsCount() const; - typedef QMap MapViews; + typedef TQMap MapViews; const MapViews & viewMap() const { return m_mapViews; } @@ -185,10 +185,10 @@ public: // Only valid if there are one or two views KonqView * otherView( KonqView * view ) const; - virtual void customEvent( QCustomEvent *event ); + virtual void customEvent( TQCustomEvent *event ); /// Overloaded of KMainWindow - virtual void setCaption( const QString &caption ); + virtual void setCaption( const TQString &caption ); /** * Reimplemented for internal reasons. The API is not affected. @@ -198,7 +198,7 @@ public: /** * Change URL displayed in the location bar */ - void setLocationBarURL( const QString &url ); + void setLocationBarURL( const TQString &url ); /** * Overload for convenience */ @@ -206,7 +206,7 @@ public: /** * Return URL displayed in the location bar - for KonqViewManager */ - QString locationBarURL() const; + TQString locationBarURL() const; void focusLocationBar(); /** @@ -237,7 +237,7 @@ public: KToggleAction * linkViewAction()const { return m_paLinkView; } void enableAction( const char * name, bool enabled ); - void setActionText( const char * name, const QString& text ); + void setActionText( const char * name, const TQString& text ); /** * The default settings "allow HTML" - the one used when creating a new view @@ -247,7 +247,7 @@ public: bool saveViewPropertiesLocally() const { return m_bSaveViewPropertiesLocally; } - static QPtrList *mainWindowList() { return s_lstViews; } + static TQPtrList *mainWindowList() { return s_lstViews; } // public for konq_guiclients void viewCountChanged(); @@ -257,8 +257,8 @@ public: // operates on all combos of all mainwindows of this instance // up to now adds an entry or clears all entries - static void comboAction( int action, const QString& url, - const QCString& objId ); + static void comboAction( int action, const TQString& url, + const TQCString& objId ); #ifndef NDEBUG void dumpViewList(); @@ -275,25 +275,25 @@ public: */ void removeChildFrame( KonqFrameBase * frame ); - void saveConfig( KConfig* config, const QString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 ); + void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 ); void copyHistory( KonqFrameBase *other ); - void printFrameInfo( const QString &spaces ); + void printFrameInfo( const TQString &spaces ); - void reparentFrame( QWidget* parent, - const QPoint & p, bool showIt=FALSE ); + void reparentFrame( TQWidget* parent, + const TQPoint & p, bool showIt=FALSE ); KonqFrameContainerBase* parentContainer()const; void setParentContainer(KonqFrameContainerBase* parent); - void setTitle( const QString &title , QWidget* sender); - void setTabIcon( const KURL &url, QWidget* sender ); + void setTitle( const TQString &title , TQWidget* sender); + void setTabIcon( const KURL &url, TQWidget* sender ); - QWidget* widget(); + TQWidget* widget(); void listViews( ChildViewList *viewList ); - QCString frameType(); + TQCString frameType(); KonqFrameBase* childFrame()const; @@ -304,8 +304,8 @@ public: KonqFrameBase* workingTab()const { return m_pWorkingTab; } void setWorkingTab( KonqFrameBase* tab ) { m_pWorkingTab = tab; } - static bool isMimeTypeAssociatedWithSelf( const QString &mimeType ); - static bool isMimeTypeAssociatedWithSelf( const QString &mimeType, const KService::Ptr &offer ); + static bool isMimeTypeAssociatedWithSelf( const TQString &mimeType ); + static bool isMimeTypeAssociatedWithSelf( const TQString &mimeType, const KService::Ptr &offer ); void resetWindow(); @@ -316,11 +316,11 @@ public: void toggleReloadStopButton(bool isStop); - QString currentTitle() const; - QString currentURL() const; - QString currentProfile() const; + TQString currentTitle() const; + TQString currentURL() const; + TQString currentProfile() const; - QStringList configModules() const; + TQStringList configModules() const; void saveWindowSize() const; void restoreWindowSize(); @@ -334,19 +334,19 @@ public slots: void slotCtrlTabPressed(); // for KBookmarkMenu and KBookmarkBar - void slotFillContextMenu( const KBookmark &, QPopupMenu * ); - void slotOpenBookmarkURL( const QString & url, Qt::ButtonState state ); + void slotFillContextMenu( const KBookmark &, TQPopupMenu * ); + void slotOpenBookmarkURL( const TQString & url, Qt::ButtonState state ); - void slotPopupMenu( const QPoint &_global, const KURL &_url, const QString &_mimeType, mode_t mode ); - void slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KURL &_url, const QString &_mimeType, mode_t mode ); - void slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KURL &_url, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags f, mode_t mode ); + void slotPopupMenu( const TQPoint &_global, const KURL &_url, const TQString &_mimeType, mode_t mode ); + void slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KURL &_url, const TQString &_mimeType, mode_t mode ); + void slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KURL &_url, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags f, mode_t mode ); - void slotPopupMenu( const QPoint &_global, const KFileItemList &_items ); - void slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KFileItemList &_items ); - void slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KFileItemList &_items, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags _flags ); + void slotPopupMenu( const TQPoint &_global, const KFileItemList &_items ); + void slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KFileItemList &_items ); + void slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KFileItemList &_items, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags _flags ); - void slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KFileItemList &_items, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags f, bool showProperties ); + void slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KFileItemList &_items, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags f, bool showProperties ); /** * __NEEEEVER__ call this method directly. It relies on sender() (the part) @@ -413,12 +413,12 @@ public slots: void slotClearLocationBar( KAction::ActivationReason reason, Qt::ButtonState state ); // reimplement from KParts::MainWindow - virtual void slotSetStatusBarText( const QString &text ); + virtual void slotSetStatusBarText( const TQString &text ); // public for KonqViewManager void slotPartActivated( KParts::Part *part ); - virtual void setIcon( const QPixmap& ); + virtual void setIcon( const TQPixmap& ); void slotGoHistoryActivated( int steps ); void slotGoHistoryActivated( int steps, Qt::ButtonState state ); @@ -429,7 +429,7 @@ public slots: protected slots: void slotViewCompleted( KonqView * view ); - void slotURLEntered( const QString &text, int ); + void slotURLEntered( const TQString &text, int ); void slotFileNewAboutToShow(); void slotLocationLabelActivated(); @@ -491,10 +491,10 @@ protected slots: void slotGoHistoryDelayed(); void slotCompletionModeChanged( KGlobalSettings::Completion ); - void slotMakeCompletion( const QString& ); - void slotSubstringcompletion( const QString& ); + void slotMakeCompletion( const TQString& ); + void slotSubstringcompletion( const TQString& ); void slotRotation( KCompletionBase::KeyBindingType ); - void slotMatch( const QString& ); + void slotMatch( const TQString& ); void slotClearHistory(); void slotClearComboHistory(); @@ -505,7 +505,7 @@ protected slots: void slotOpenURL( const KURL& ); - void slotActionStatusText( const QString &text ); + void slotActionStatusText( const TQString &text ); void slotClearStatusText(); void slotFindOpen( KonqDirPart * dirPart ); @@ -513,21 +513,21 @@ protected slots: void slotIconsChanged(); - virtual bool event( QEvent* ); + virtual bool event( TQEvent* ); void slotMoveTabLeft(); void slotMoveTabRight(); - void slotAddWebSideBar(const KURL& url, const QString& name); + void slotAddWebSideBar(const KURL& url, const TQString& name); void slotUpdateFullScreen( bool set ); // do not call directly protected: - virtual bool eventFilter(QObject*obj,QEvent *ev); + virtual bool eventFilter(TQObject*obj,TQEvent *ev); - void fillHistoryPopup( QPopupMenu *menu, const QPtrList &history ); + void fillHistoryPopup( TQPopupMenu *menu, const TQPtrList &history ); - bool makeViewsFollow( const KURL & url, const KParts::URLArgs &args, const QString & serviceType, + bool makeViewsFollow( const KURL & url, const KParts::URLArgs &args, const TQString & serviceType, KonqView * senderView ); void applyKonqMainWindowSettings(); @@ -538,10 +538,10 @@ protected: void updateLocalPropsActions(); - virtual void closeEvent( QCloseEvent * ); + virtual void closeEvent( TQCloseEvent * ); virtual bool queryExit(); - bool askForTarget(const QString& text, KURL& url); + bool askForTarget(const TQString& text, KURL& url); private slots: void slotRequesterClicked( KURLRequester * ); @@ -578,7 +578,7 @@ private: * still no match, then http://www. Due to that, this is only usable for * popupcompletion and not for manual or auto-completion. */ - static QStringList historyPopupCompletionItems( const QString& s = QString::null); + static TQStringList historyPopupCompletionItems( const TQString& s = TQString::null); void startAnimation(); void stopAnimation(); @@ -593,14 +593,14 @@ private: /** * Tries to find a index.html (.kde.html) file in the specified directory */ - static QString findIndexFile( const QString &directory ); + static TQString findIndexFile( const TQString &directory ); void connectExtension( KParts::BrowserExtension *ext ); void disconnectExtension( KParts::BrowserExtension *ext ); void plugViewModeActions(); void unplugViewModeActions(); - static QString viewModeActionKey( KService::Ptr service ); + static TQString viewModeActionKey( KService::Ptr service ); void connectActionCollection( KActionCollection *coll ); void disconnectActionCollection( KActionCollection *coll ); @@ -608,7 +608,7 @@ private: bool stayPreloaded(); bool checkPreloadResourceUsage(); - QObject* lastFrame( KonqView *view ); + TQObject* lastFrame( KonqView *view ); KNewMenu * m_pMenuNew; @@ -693,7 +693,7 @@ private: MapViews m_mapViews; - QGuardedPtr m_currentView; + TQGuardedPtr m_currentView; KBookmarkMenu* m_pBookmarkMenu; KonqExtendedBookmarkOwner *m_pBookmarksOwner; @@ -710,7 +710,7 @@ private: KonqRun *m_initialKonqRun; - QString m_title; + TQString m_title; /** * @since 3.4 @@ -722,10 +722,10 @@ private: * the configure dialog. * @since 3.4 */ - QStringList m_configureModules; + TQStringList m_configureModules; - QLabel* m_locationLabel; - QGuardedPtr m_combo; + TQLabel* m_locationLabel; + TQGuardedPtr m_combo; static KConfig *s_comboConfig; KURLCompletion *m_pURLCompletion; // just a reference to KonqHistoryManager's completionObject @@ -734,28 +734,28 @@ private: ToggleViewGUIClient *m_toggleViewGUIClient; KTrader::OfferList m_popupEmbeddingServices; - QString m_popupService; - QString m_popupServiceType; + TQString m_popupService; + TQString m_popupServiceType; KURL m_popupURL; - QString m_initialFrameName; + TQString m_initialFrameName; - QPtrList m_openWithActions; + TQPtrList m_openWithActions; KActionMenu *m_viewModeMenu; - QPtrList m_toolBarViewModeActions; // basically holds two KonqViewActions, one of + TQPtrList m_toolBarViewModeActions; // basically holds two KonqViewActions, one of // iconview and one for listview - QPtrList m_viewModeActions; - QMap m_viewModeToolBarServices; // similar to m_toolBarViewModeActions + TQPtrList m_viewModeActions; + TQMap m_viewModeToolBarServices; // similar to m_toolBarViewModeActions // it holds a map library name (libkonqiconview/libkonqlistview) ==> service (service for // iconview, multicolumnview, treeview, etc .) KonqMainWindowIface * m_dcopObject; - static QStringList *s_plstAnimatedLogo; + static TQStringList *s_plstAnimatedLogo; - static QPtrList *s_lstViews; + static TQPtrList *s_lstViews; - QString m_currentDir; // stores current dir for relative URLs whenever applicable + TQString m_currentDir; // stores current dir for relative URLs whenever applicable bool m_urlCompletionStarted; @@ -769,7 +769,7 @@ private: public: - static QFile *s_crashlog_file; + static TQFile *s_crashlog_file; }; #endif diff --git a/konqueror/konq_mainwindow_p.h b/konqueror/konq_mainwindow_p.h index 74b5e6eed..d463ec193 100644 --- a/konqueror/konq_mainwindow_p.h +++ b/konqueror/konq_mainwindow_p.h @@ -27,9 +27,9 @@ class KonqExtendedBookmarkOwner : public KExtendedBookmarkOwner public: KonqExtendedBookmarkOwner(KonqMainWindow *); // for KBookmarkOwner - virtual void openBookmarkURL( const QString & _url ); - virtual QString currentTitle() const; - virtual QString currentURL() const; + virtual void openBookmarkURL( const TQString & _url ); + virtual TQString currentTitle() const; + virtual TQString currentURL() const; public slots: // for KExtendedBookmarkOwner void slotFillBookmarksList( KExtendedBookmarkOwner::QStringPairList & list ); diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cc index 788462098..66aeaba41 100644 --- a/konqueror/konq_misc.cc +++ b/konqueror/konq_misc.cc @@ -18,9 +18,9 @@ */ -#include -#include -#include +#include +#include +#include #include #include @@ -47,10 +47,10 @@ // Terminates fullscreen-mode for any full-screen window on the current desktop void KonqMisc::abortFullScreenMode() { - QPtrList *mainWindows = KonqMainWindow::mainWindowList(); + TQPtrList *mainWindows = KonqMainWindow::mainWindowList(); if ( mainWindows ) { - QPtrListIterator it( *mainWindows ); + TQPtrListIterator it( *mainWindows ); for (; it.current(); ++it ) { if ( it.current()->fullScreenMode() ) @@ -64,14 +64,14 @@ void KonqMisc::abortFullScreenMode() } // #### this can probably be removed -KonqMainWindow * KonqMisc::createSimpleWindow( const KURL & _url, const QString &frameName ) +KonqMainWindow * KonqMisc::createSimpleWindow( const KURL & _url, const TQString &frameName ) { abortFullScreenMode(); // If _url is 0L, open $HOME [this doesn't happen anymore] KURL url; if (_url.isEmpty()) - url.setPath(QDir::homeDirPath()); + url.setPath(TQDir::homeDirPath()); else url = _url; @@ -91,28 +91,28 @@ KonqMainWindow * KonqMisc::createSimpleWindow( const KURL & url, const KParts::U req.args = args; req.tempFile = tempFile; KonqMainWindow *win = new KonqMainWindow( KURL(), false ); - win->openURL( 0L, url, QString::null, req ); + win->openURL( 0L, url, TQString::null, req ); win->show(); return win; } -KonqMainWindow * KonqMisc::createNewWindow( const KURL &url, const KParts::URLArgs &args, bool forbidUseHTML, QStringList filesToSelect, bool tempFile, bool openURL ) +KonqMainWindow * KonqMisc::createNewWindow( const KURL &url, const KParts::URLArgs &args, bool forbidUseHTML, TQStringList filesToSelect, bool tempFile, bool openURL ) { kdDebug() << "KonqMisc::createNewWindow url=" << url << endl; // For HTTP or html files, use the web browsing profile, otherwise use filemanager profile - QString profileName = (!(KProtocolInfo::supportsListing(url)) || + TQString profileName = (!(KProtocolInfo::supportsListing(url)) || KMimeType::findByURL(url)->name() == "text/html") ? "webbrowsing" : "filemanagement"; - QString profile = locate( "data", QString::fromLatin1("konqueror/profiles/") + profileName ); + TQString profile = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profileName ); return createBrowserWindowFromProfile(profile, profileName, url, args, forbidUseHTML, filesToSelect, tempFile, openURL ); } -KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const QString &path, const QString &filename, const KURL &url, const KParts::URLArgs &args, bool forbidUseHTML, const QStringList& filesToSelect, bool tempFile, bool openURL ) +KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const TQString &path, const TQString &filename, const KURL &url, const KParts::URLArgs &args, bool forbidUseHTML, const TQStringList& filesToSelect, bool tempFile, bool openURL ) { kdDebug(1202) << "void KonqMisc::createBrowserWindowFromProfile() " << endl; kdDebug(1202) << "path=" << path << ",filename=" << filename << ",url=" << url.prettyURL() << endl; @@ -147,7 +147,7 @@ KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const QString &path, KConfig cfg( path, true ); cfg.setDollarExpansion( true ); cfg.setGroup( "Profile" ); - QString xmluiFile=cfg.readEntry("XMLUIFile","konqueror.rc"); + TQString xmluiFile=cfg.readEntry("XMLUIFile","konqueror.rc"); mainWindow = new KonqMainWindow( KURL(), false, 0, xmluiFile ); if ( forbidUseHTML ) @@ -173,7 +173,7 @@ KonqMainWindow * KonqMisc::newWindowFromHistory( KonqView* view, int steps ) return 0L; KonqMainWindow* mainwindow = createNewWindow(he->url, KParts::URLArgs(), - false, QStringList(), false, /*openURL*/false); + false, TQStringList(), false, /*openURL*/false); if(!mainwindow) return 0L; KonqView* newView = mainwindow->currentView(); @@ -187,7 +187,7 @@ KonqMainWindow * KonqMisc::newWindowFromHistory( KonqView* view, int steps ) return mainwindow; } -QString KonqMisc::konqFilteredURL( QWidget* parent, const QString& _url, const QString& _path ) +TQString KonqMisc::konqFilteredURL( TQWidget* parent, const TQString& _url, const TQString& _path ) { if ( !_url.startsWith( "about:" ) ) // Don't filter "about:" URLs { @@ -205,7 +205,7 @@ QString KonqMisc::konqFilteredURL( QWidget* parent, const QString& _url, const Q if( data.uriType() == KURIFilterData::ERROR && !data.errorMsg().isEmpty() ) { KMessageBox::sorry( parent, i18n( data.errorMsg().utf8() ) ); - return QString::null; + return TQString::null; } else return data.uri().url(); @@ -220,56 +220,56 @@ QString KonqMisc::konqFilteredURL( QWidget* parent, const QString& _url, const Q return _url; // return the original url if it cannot be filtered. } -KonqDraggableLabel::KonqDraggableLabel( KonqMainWindow* mw, const QString& text ) - : QLabel( text, 0L, "kde toolbar widget" ) // Use this name for it to be styled! +KonqDraggableLabel::KonqDraggableLabel( KonqMainWindow* mw, const TQString& text ) + : TQLabel( text, 0L, "kde toolbar widget" ) // Use this name for it to be styled! , m_mw(mw) { setBackgroundMode( Qt::PaletteButton ); - setAlignment( (QApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | + setAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | Qt::AlignVCenter | Qt::ShowPrefix ); setAcceptDrops(true); adjustSize(); validDrag = false; } -void KonqDraggableLabel::mousePressEvent( QMouseEvent * ev ) +void KonqDraggableLabel::mousePressEvent( TQMouseEvent * ev ) { validDrag = true; startDragPos = ev->pos(); } -void KonqDraggableLabel::mouseMoveEvent( QMouseEvent * ev ) +void KonqDraggableLabel::mouseMoveEvent( TQMouseEvent * ev ) { - if ((startDragPos - ev->pos()).manhattanLength() > QApplication::startDragDistance()) + if ((startDragPos - ev->pos()).manhattanLength() > TQApplication::startDragDistance()) { validDrag = false; if ( m_mw->currentView() ) { KURL::List lst; lst.append( m_mw->currentView()->url() ); - QDragObject * drag = new KURLDrag( lst, m_mw ); + TQDragObject * drag = new KURLDrag( lst, m_mw ); drag->setPixmap( KMimeType::pixmapForURL( lst.first(), 0, KIcon::Small ) ); drag->dragCopy(); } } } -void KonqDraggableLabel::mouseReleaseEvent( QMouseEvent * ) +void KonqDraggableLabel::mouseReleaseEvent( TQMouseEvent * ) { validDrag = false; } -void KonqDraggableLabel::dragEnterEvent( QDragEnterEvent *ev ) +void KonqDraggableLabel::dragEnterEvent( TQDragEnterEvent *ev ) { if ( KURLDrag::canDecode( ev ) ) ev->acceptAction(); } -void KonqDraggableLabel::dropEvent( QDropEvent* ev ) +void KonqDraggableLabel::dropEvent( TQDropEvent* ev ) { _savedLst.clear(); if ( KURLDrag::decode( ev, _savedLst ) ) { - QTimer::singleShot(0, this, SLOT(delayedOpenURL())); + TQTimer::singleShot(0, this, TQT_SLOT(delayedOpenURL())); } } diff --git a/konqueror/konq_misc.h b/konqueror/konq_misc.h index f3d736b13..9696151e6 100644 --- a/konqueror/konq_misc.h +++ b/konqueror/konq_misc.h @@ -54,7 +54,7 @@ public: /** * Create a new window with a single view, showing @p url */ - static KonqMainWindow * createSimpleWindow( const KURL &url, const QString &frameName = QString::null ); + static KonqMainWindow * createSimpleWindow( const KURL &url, const TQString &frameName = TQString::null ); /** * Create a new window with a single view, showing @p url, using @p args @@ -70,7 +70,7 @@ public: static KonqMainWindow * createNewWindow( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs(), bool forbidUseHTML = false, - QStringList filesToSelect = QStringList(), + TQStringList filesToSelect = TQStringList(), bool tempFile = false, bool openURL = true); @@ -80,12 +80,12 @@ public: * @param forbidUseHTML internal. True when called by "Find Files" * @param openURL If false no url is opened */ - static KonqMainWindow * createBrowserWindowFromProfile( const QString &path, - const QString &filename, + static KonqMainWindow * createBrowserWindowFromProfile( const TQString &path, + const TQString &filename, const KURL &url = KURL(), const KParts::URLArgs &args = KParts::URLArgs(), bool forbidUseHTML = false, - const QStringList& filesToSelect = QStringList(), + const TQStringList& filesToSelect = TQStringList(), bool tempFile = false, bool openURL = true); @@ -103,30 +103,30 @@ public: * @p _url to be filtered. * @p _path the absolute path to append to the url before filtering it. */ - static QString konqFilteredURL( QWidget* /*parent*/, const QString& /*_url*/, const QString& _path = QString::null ); + static TQString konqFilteredURL( TQWidget* /*parent*/, const TQString& /*_url*/, const TQString& _path = TQString::null ); }; -#include +#include class KonqDraggableLabel : public QLabel { Q_OBJECT public: - KonqDraggableLabel( KonqMainWindow * mw, const QString & text ); + KonqDraggableLabel( KonqMainWindow * mw, const TQString & text ); protected: - void mousePressEvent( QMouseEvent * ev ); - void mouseMoveEvent( QMouseEvent * ev ); - void mouseReleaseEvent( QMouseEvent * ); - void dragEnterEvent( QDragEnterEvent *ev ); - void dropEvent( QDropEvent* ev ); + void mousePressEvent( TQMouseEvent * ev ); + void mouseMoveEvent( TQMouseEvent * ev ); + void mouseReleaseEvent( TQMouseEvent * ); + void dragEnterEvent( TQDragEnterEvent *ev ); + void dropEvent( TQDropEvent* ev ); private slots: void delayedOpenURL(); private: - QPoint startDragPos; + TQPoint startDragPos; bool validDrag; KonqMainWindow * m_mw; KURL::List _savedLst; diff --git a/konqueror/konq_openurlrequest.h b/konqueror/konq_openurlrequest.h index f3256c81f..dffc0025d 100644 --- a/konqueror/konq_openurlrequest.h +++ b/konqueror/konq_openurlrequest.h @@ -1,7 +1,7 @@ #ifndef __konqopenurlrequest_h #define __konqopenurlrequest_h -#include +#include #include @@ -12,14 +12,14 @@ struct KonqOpenURLRequest { openAfterCurrentPage(false), forceAutoEmbed(false), tempFile(false), userRequestedReload(false) {} - KonqOpenURLRequest( const QString & url ) : + KonqOpenURLRequest( const TQString & url ) : typedURL(url), followMode(false), newTab(false), newTabInFront(false), openAfterCurrentPage(false), forceAutoEmbed(false), tempFile(false), userRequestedReload(false) {} - QString debug() const { + TQString debug() const { #ifndef NDEBUG - QStringList s; + TQStringList s; if ( !args.frameName.isEmpty() ) s << "frameName=" + args.frameName; if ( !nameFilter.isEmpty() ) @@ -42,12 +42,12 @@ struct KonqOpenURLRequest { s << "userRequestedReload"; return "[" + s.join(" ") + "]"; #else - return QString::null; + return TQString::null; #endif } - QString typedURL; // empty if URL wasn't typed manually - QString nameFilter; // like *.cpp, extracted from the URL + TQString typedURL; // empty if URL wasn't typed manually + TQString nameFilter; // like *.cpp, extracted from the URL bool followMode; // true if following another view - avoids loops bool newTab; // open url in new tab bool newTabInFront; // new tab in front or back @@ -56,7 +56,7 @@ struct KonqOpenURLRequest { bool tempFile; // if true, the url should be deleted after use bool userRequestedReload; // args.reload because the user requested it, not a website KParts::URLArgs args; - QStringList filesToSelect; // files to select in a konqdirpart + TQStringList filesToSelect; // files to select in a konqdirpart static KonqOpenURLRequest null; }; diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc index a0e103a12..2a3547068 100644 --- a/konqueror/konq_profiledlg.cc +++ b/konqueror/konq_profiledlg.cc @@ -21,12 +21,12 @@ #include "konq_viewmgr.h" #include "konq_settingsxt.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -42,13 +42,13 @@ KonqProfileMap KonqProfileDlg::readAllProfiles() { KonqProfileMap mapProfiles; - QStringList profiles = KGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true ); - QStringList::ConstIterator pIt = profiles.begin(); - QStringList::ConstIterator pEnd = profiles.end(); + TQStringList profiles = KGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true ); + TQStringList::ConstIterator pIt = profiles.begin(); + TQStringList::ConstIterator pEnd = profiles.end(); for (; pIt != pEnd; ++pIt ) { - QFileInfo info( *pIt ); - QString profileName = KIO::decodeFileName( info.baseName() ); + TQFileInfo info( *pIt ); + TQString profileName = KIO::decodeFileName( info.baseName() ); KSimpleConfig cfg( *pIt, true ); if ( cfg.hasGroup( "Profile" ) ) { @@ -63,8 +63,8 @@ KonqProfileMap KonqProfileDlg::readAllProfiles() return mapProfiles; } -KonqProfileItem::KonqProfileItem( KListView *parent, const QString & text ) - : QListViewItem( parent, text ), m_profileName( text ) +KonqProfileItem::KonqProfileItem( KListView *parent, const TQString & text ) + : TQListViewItem( parent, text ), m_profileName( text ) { } @@ -72,7 +72,7 @@ KonqProfileItem::KonqProfileItem( KListView *parent, const QString & text ) #define BTN_DELETE KDialogBase::User2 #define BTN_SAVE KDialogBase::User3 -KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const QString & preselectProfile, QWidget *parent ) +KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & preselectProfile, TQWidget *parent ) : KDialogBase( parent, "konq_profile_dialog", true, i18n( "Profile Management" ), KDialogBase::Close | BTN_RENAME | BTN_DELETE | BTN_SAVE, BTN_SAVE, true, KGuiItem( i18n( "&Rename Profile" ) ), @@ -81,13 +81,13 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const QString & presel { m_pViewManager = manager; - QVBox* box = new QVBox( this ); + TQVBox* box = new TQVBox( this ); box->setSpacing( KDialog::spacingHint() ); setMainWidget( box ); - QLabel *lblName = new QLabel( i18n( "&Profile name:" ), box ); + TQLabel *lblName = new TQLabel( i18n( "&Profile name:" ), box ); - m_pProfileNameLineEdit = new QLineEdit( box ); + m_pProfileNameLineEdit = new TQLineEdit( box ); m_pProfileNameLineEdit->setFocus(); lblName->setBuddy( m_pProfileNameLineEdit ); @@ -100,23 +100,23 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const QString & presel box->setStretchFactor( m_pListView, 1 ); - connect( m_pListView, SIGNAL( itemRenamed( QListViewItem * ) ), - SLOT( slotItemRenamed( QListViewItem * ) ) ); + connect( m_pListView, TQT_SIGNAL( itemRenamed( TQListViewItem * ) ), + TQT_SLOT( slotItemRenamed( TQListViewItem * ) ) ); loadAllProfiles( preselectProfile ); m_pListView->setMinimumSize( m_pListView->sizeHint() ); - m_cbSaveURLs = new QCheckBox( i18n("Save &URLs in profile"), box ); + m_cbSaveURLs = new TQCheckBox( i18n("Save &URLs in profile"), box ); m_cbSaveURLs->setChecked( KonqSettings::saveURLInProfile() ); - m_cbSaveSize = new QCheckBox( i18n("Save &window size in profile"), box ); + m_cbSaveSize = new TQCheckBox( i18n("Save &window size in profile"), box ); m_cbSaveSize->setChecked( KonqSettings::saveWindowSizeInProfile() ); - connect( m_pListView, SIGNAL( selectionChanged( QListViewItem * ) ), - this, SLOT( slotSelectionChanged( QListViewItem * ) ) ); + connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); - connect( m_pProfileNameLineEdit, SIGNAL( textChanged( const QString & ) ), - this, SLOT( slotTextChanged( const QString & ) ) ); + connect( m_pProfileNameLineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), + this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); enableButton( BTN_RENAME, m_pListView->selectedItem ()!=0 ); enableButton( BTN_DELETE, m_pListView->selectedItem ()!=0 ); @@ -130,7 +130,7 @@ KonqProfileDlg::~KonqProfileDlg() KonqSettings::setSaveWindowSizeInProfile( m_cbSaveSize->isChecked() ); } -void KonqProfileDlg::loadAllProfiles(const QString & preselectProfile) +void KonqProfileDlg::loadAllProfiles(const TQString & preselectProfile) { bool profileFound = false; m_mapEntries.clear(); @@ -140,8 +140,8 @@ void KonqProfileDlg::loadAllProfiles(const QString & preselectProfile) KonqProfileMap::ConstIterator eEnd = m_mapEntries.end(); for (; eIt != eEnd; ++eIt ) { - QListViewItem *item = new KonqProfileItem( m_pListView, eIt.key() ); - QString filename = eIt.data().mid( eIt.data().findRev( '/' ) + 1 ); + TQListViewItem *item = new KonqProfileItem( m_pListView, eIt.key() ); + TQString filename = eIt.data().mid( eIt.data().findRev( '/' ) + 1 ); kdDebug(1202) << filename << endl; if ( filename == preselectProfile ) { @@ -156,7 +156,7 @@ void KonqProfileDlg::loadAllProfiles(const QString & preselectProfile) void KonqProfileDlg::slotUser3() // Save button { - QString name = KIO::encodeFileName( m_pProfileNameLineEdit->text() ); // in case of '/' + TQString name = KIO::encodeFileName( m_pProfileNameLineEdit->text() ); // in case of '/' // Reuse filename of existing item, if any if ( m_pListView->selectedItem() ) @@ -164,7 +164,7 @@ void KonqProfileDlg::slotUser3() // Save button KonqProfileMap::Iterator it = m_mapEntries.find( m_pListView->selectedItem()->text(0) ); if ( it != m_mapEntries.end() ) { - QFileInfo info( it.data() ); + TQFileInfo info( it.data() ); name = info.baseName(); } } @@ -182,7 +182,7 @@ void KonqProfileDlg::slotUser2() // Delete button return; KonqProfileMap::Iterator it = m_mapEntries.find( m_pListView->selectedItem()->text(0) ); - if ( it != m_mapEntries.end() && QFile::remove( it.data() ) ) + if ( it != m_mapEntries.end() && TQFile::remove( it.data() ) ) loadAllProfiles(); enableButton( BTN_RENAME, m_pListView->selectedItem() != 0 ); @@ -191,18 +191,18 @@ void KonqProfileDlg::slotUser2() // Delete button void KonqProfileDlg::slotUser1() // Rename button { - QListViewItem *item = m_pListView->selectedItem(); + TQListViewItem *item = m_pListView->selectedItem(); if ( item ) m_pListView->rename( item, 0 ); } -void KonqProfileDlg::slotItemRenamed( QListViewItem * item ) +void KonqProfileDlg::slotItemRenamed( TQListViewItem * item ) { KonqProfileItem * profileItem = static_cast( item ); - QString newName = profileItem->text(0); - QString oldName = profileItem->m_profileName; + TQString newName = profileItem->text(0); + TQString oldName = profileItem->m_profileName; if (!newName.isEmpty()) { @@ -210,7 +210,7 @@ void KonqProfileDlg::slotItemRenamed( QListViewItem * item ) if ( it != m_mapEntries.end() ) { - QString fileName = it.data(); + TQString fileName = it.data(); KSimpleConfig cfg( fileName ); cfg.setGroup( "Profile" ); cfg.writeEntry( "Name", newName ); @@ -224,19 +224,19 @@ void KonqProfileDlg::slotItemRenamed( QListViewItem * item ) } } -void KonqProfileDlg::slotSelectionChanged( QListViewItem * item ) +void KonqProfileDlg::slotSelectionChanged( TQListViewItem * item ) { - m_pProfileNameLineEdit->setText( item ? item->text(0) : QString::null ); + m_pProfileNameLineEdit->setText( item ? item->text(0) : TQString::null ); } -void KonqProfileDlg::slotTextChanged( const QString & text ) +void KonqProfileDlg::slotTextChanged( const TQString & text ) { enableButton( KDialogBase::User3, !text.isEmpty() ); // If we type the name of a profile, select it in the list bool itemSelected = false; - QListViewItem * item; + TQListViewItem * item; for ( item = m_pListView->firstChild() ; item ; item = item->nextSibling() ) if ( item->text(0) == text /*only full text, not partial*/ ) @@ -251,7 +251,7 @@ void KonqProfileDlg::slotTextChanged( const QString & text ) if ( itemSelected ) { - QFileInfo fi( m_mapEntries[ item->text( 0 ) ] ); + TQFileInfo fi( m_mapEntries[ item->text( 0 ) ] ); itemSelected = itemSelected && fi.isWritable(); } diff --git a/konqueror/konq_profiledlg.h b/konqueror/konq_profiledlg.h index becb8e8fb..a473a7d67 100644 --- a/konqueror/konq_profiledlg.h +++ b/konqueror/konq_profiledlg.h @@ -22,8 +22,8 @@ #include -#include -#include +#include +#include class KonqViewManager; class QListViewItem; @@ -33,22 +33,22 @@ class QLineEdit; class KPushButton; class KListView; -typedef QMap KonqProfileMap; +typedef TQMap KonqProfileMap; class KonqProfileItem : public QListViewItem { public: - KonqProfileItem( KListView *, const QString & ); + KonqProfileItem( KListView *, const TQString & ); ~KonqProfileItem() {} - QString m_profileName; + TQString m_profileName; }; class KonqProfileDlg : public KDialogBase { Q_OBJECT public: - KonqProfileDlg( KonqViewManager *manager, const QString &preselectProfile, QWidget *parent = 0L ); + KonqProfileDlg( KonqViewManager *manager, const TQString &preselectProfile, TQWidget *parent = 0L ); ~KonqProfileDlg(); /** @@ -61,21 +61,21 @@ protected slots: virtual void slotUser1(); // User1 is "Rename Profile" button virtual void slotUser2(); // User2 is "Delete Profile" button virtual void slotUser3(); // User3 is Save button - void slotTextChanged( const QString & ); - void slotSelectionChanged( QListViewItem * item ); + void slotTextChanged( const TQString & ); + void slotSelectionChanged( TQListViewItem * item ); - void slotItemRenamed( QListViewItem * ); + void slotItemRenamed( TQListViewItem * ); private: - void loadAllProfiles(const QString & = QString::null); + void loadAllProfiles(const TQString & = TQString::null); KonqViewManager *m_pViewManager; KonqProfileMap m_mapEntries; - QLineEdit *m_pProfileNameLineEdit; + TQLineEdit *m_pProfileNameLineEdit; - QCheckBox *m_cbSaveURLs; - QCheckBox *m_cbSaveSize; + TQCheckBox *m_cbSaveURLs; + TQCheckBox *m_cbSaveSize; KListView *m_pListView; }; diff --git a/konqueror/konq_run.cc b/konqueror/konq_run.cc index 96256f8c3..fbac4e65c 100644 --- a/konqueror/konq_run.cc +++ b/konqueror/konq_run.cc @@ -55,11 +55,11 @@ KonqRun::~KonqRun() m_pView->setRun(0L); } -void KonqRun::foundMimeType( const QString & _type ) +void KonqRun::foundMimeType( const TQString & _type ) { //kdDebug(1202) << "KonqRun::foundMimeType " << _type << " m_req=" << m_req.debug() << endl; - QString mimeType = _type; // this ref comes from the job, we lose it when using KIO again + TQString mimeType = _type; // this ref comes from the job, we lose it when using KIO again m_bFoundMimeType = true; @@ -150,8 +150,8 @@ void KonqRun::init() // (in case it goes to scanFile, this will be done below) KIO::StatJob *job = dynamic_cast( m_job ); if ( job && !job->error() && m_pView ) { - connect( job, SIGNAL( infoMessage( KIO::Job*, const QString& ) ), - m_pView, SLOT( slotInfoMessage(KIO::Job*, const QString& ) ) ); + connect( job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ), + m_pView, TQT_SLOT( slotInfoMessage(KIO::Job*, const TQString& ) ) ); } } @@ -162,11 +162,11 @@ void KonqRun::scanFile() // BrowserRun changes KIO::TransferJob *job = dynamic_cast( m_job ); if ( job && !job->error() ) { - connect( job, SIGNAL( redirection( KIO::Job *, const KURL& )), - SLOT( slotRedirection( KIO::Job *, const KURL& ) )); + connect( job, TQT_SIGNAL( redirection( KIO::Job *, const KURL& )), + TQT_SLOT( slotRedirection( KIO::Job *, const KURL& ) )); if ( m_pView && m_pView->service()->desktopEntryName() != "konq_sidebartng") { - connect( job, SIGNAL( infoMessage( KIO::Job*, const QString& ) ), - m_pView, SLOT( slotInfoMessage(KIO::Job*, const QString& ) ) ); + connect( job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ), + m_pView, TQT_SLOT( slotInfoMessage(KIO::Job*, const TQString& ) ) ); } } } diff --git a/konqueror/konq_run.h b/konqueror/konq_run.h index 50a393435..4084584a7 100644 --- a/konqueror/konq_run.h +++ b/konqueror/konq_run.h @@ -21,7 +21,7 @@ #define __kfm_run_h__ #include -#include +#include #include #include "konq_openurlrequest.h" @@ -49,12 +49,12 @@ public: KonqView *childView() const { return m_pView; } - const QString & typedURL() const { return m_req.typedURL; } + const TQString & typedURL() const { return m_req.typedURL; } KURL mailtoURL() const { return m_mailto; } protected: - virtual void foundMimeType( const QString & _type ); + virtual void foundMimeType( const TQString & _type ); virtual void handleError( KIO::Job * job ); virtual void init(); virtual void scanFile(); @@ -63,8 +63,8 @@ protected slots: void slotRedirection( KIO::Job *, const KURL& ); protected: - QGuardedPtr m_pMainWindow; - QGuardedPtr m_pView; + TQGuardedPtr m_pMainWindow; + TQGuardedPtr m_pView; bool m_bFoundMimeType; KonqOpenURLRequest m_req; KURL m_mailto; diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc index 25af00bc8..3cc5cc60d 100644 --- a/konqueror/konq_tabs.cc +++ b/konqueror/konq_tabs.cc @@ -21,12 +21,12 @@ #include "konq_tabs.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -43,9 +43,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #define DUPLICATE_ID 3 #define RELOAD_ID 4 @@ -55,14 +55,14 @@ //################################################################### -KonqFrameTabs::KonqFrameTabs(QWidget* parent, KonqFrameContainerBase* parentContainer, +KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentContainer, KonqViewManager* viewManager, const char * name) : KTabWidget(parent, name), m_rightWidget(0), m_leftWidget(0), m_alwaysTabBar(false), m_closeOtherTabsId(0) { KAcceleratorManager::setNoAccel(this); - QWhatsThis::add( tabBar(), i18n( "This bar contains the list of currently open tabs. Click on a tab to make it " + TQWhatsThis::add( tabBar(), i18n( "This bar contains the list of currently open tabs. Click on a tab to make it " "active. The option to show a close button instead of the website icon in the left " "corner of the tab is configurable. You can also use keyboard shortcuts to " "navigate through tabs. The text on the tab is the title of the website " @@ -71,53 +71,53 @@ KonqFrameTabs::KonqFrameTabs(QWidget* parent, KonqFrameContainerBase* parentCont //kdDebug(1202) << "KonqFrameTabs::KonqFrameTabs()" << endl; m_pParentContainer = parentContainer; - m_pChildFrameList = new QPtrList; + m_pChildFrameList = new TQPtrList; m_pChildFrameList->setAutoDelete(false); m_pActiveChild = 0L; m_pViewManager = viewManager; - connect( this, SIGNAL( currentChanged ( QWidget * ) ), - this, SLOT( slotCurrentChanged( QWidget* ) ) ); + connect( this, TQT_SIGNAL( currentChanged ( TQWidget * ) ), + this, TQT_SLOT( slotCurrentChanged( TQWidget* ) ) ); - m_pPopupMenu = new QPopupMenu( this ); + m_pPopupMenu = new TQPopupMenu( this ); m_pPopupMenu->insertItem( SmallIcon( "tab_new" ), i18n("&New Tab"), m_pViewManager->mainWindow(), - SLOT( slotAddTab() ), + TQT_SLOT( slotAddTab() ), m_pViewManager->mainWindow()->action("newtab")->shortcut() ); m_pPopupMenu->insertItem( SmallIconSet( "reload" ), i18n( "&Reload Tab" ), m_pViewManager->mainWindow(), - SLOT( slotReloadPopup() ), + TQT_SLOT( slotReloadPopup() ), m_pViewManager->mainWindow()->action("reload")->shortcut(), RELOAD_ID ); m_pPopupMenu->insertItem( SmallIconSet( "tab_duplicate" ), i18n("&Duplicate Tab"), m_pViewManager->mainWindow(), - SLOT( slotDuplicateTabPopup() ), + TQT_SLOT( slotDuplicateTabPopup() ), m_pViewManager->mainWindow()->action("duplicatecurrenttab")->shortcut(), DUPLICATE_ID ); m_pPopupMenu->insertItem( SmallIconSet( "tab_breakoff" ), i18n("D&etach Tab"), m_pViewManager->mainWindow(), - SLOT( slotBreakOffTabPopup() ), + TQT_SLOT( slotBreakOffTabPopup() ), m_pViewManager->mainWindow()->action("breakoffcurrenttab")->shortcut(), BREAKOFF_ID ); m_pPopupMenu->insertSeparator(); - m_pSubPopupMenuTab = new QPopupMenu( this ); + m_pSubPopupMenuTab = new TQPopupMenu( this ); m_pPopupMenu->insertItem( i18n("Other Tabs" ), m_pSubPopupMenuTab, OTHERTABS_ID ); - connect( m_pSubPopupMenuTab, SIGNAL( activated ( int ) ), - this, SLOT( slotSubPopupMenuTabActivated( int ) ) ); + connect( m_pSubPopupMenuTab, TQT_SIGNAL( activated ( int ) ), + this, TQT_SLOT( slotSubPopupMenuTabActivated( int ) ) ); m_pPopupMenu->insertSeparator(); m_pPopupMenu->insertItem( SmallIconSet( "tab_remove" ), i18n("&Close Tab"), m_pViewManager->mainWindow(), - SLOT( slotRemoveTabPopup() ), + TQT_SLOT( slotRemoveTabPopup() ), m_pViewManager->mainWindow()->action("removecurrenttab")->shortcut(), CLOSETAB_ID ); - connect( this, SIGNAL( contextMenu( QWidget *, const QPoint & ) ), - SLOT(slotContextMenu( QWidget *, const QPoint & ) ) ); - connect( this, SIGNAL( contextMenu( const QPoint & ) ), - SLOT(slotContextMenu( const QPoint & ) ) ); + connect( this, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ), + TQT_SLOT(slotContextMenu( TQWidget *, const TQPoint & ) ) ); + connect( this, TQT_SIGNAL( contextMenu( const TQPoint & ) ), + TQT_SLOT(slotContextMenu( const TQPoint & ) ) ); m_MouseMiddleClickClosesTab = KonqSettings::mouseMiddleClickClosesTab(); @@ -130,49 +130,49 @@ KonqFrameTabs::KonqFrameTabs(QWidget* parent, KonqFrameContainerBase* parentCont setHoverCloseButton( KonqSettings::hoverCloseButton() ); setTabCloseActivatePrevious( KonqSettings::tabCloseActivatePrevious() ); if (KonqSettings::tabPosition()=="Bottom") - setTabPosition(QTabWidget::Bottom); - connect( this, SIGNAL( closeRequest( QWidget * )), SLOT(slotCloseRequest( QWidget * ))); - connect( this, SIGNAL( removeTabPopup() ), - m_pViewManager->mainWindow(), SLOT( slotRemoveTabPopup() ) ); + setTabPosition(TQTabWidget::Bottom); + connect( this, TQT_SIGNAL( closeRequest( TQWidget * )), TQT_SLOT(slotCloseRequest( TQWidget * ))); + connect( this, TQT_SIGNAL( removeTabPopup() ), + m_pViewManager->mainWindow(), TQT_SLOT( slotRemoveTabPopup() ) ); if ( KonqSettings::addTabButton() ) { - m_leftWidget = new QToolButton( this ); - connect( m_leftWidget, SIGNAL( clicked() ), - m_pViewManager->mainWindow(), SLOT( slotAddTab() ) ); + m_leftWidget = new TQToolButton( this ); + connect( m_leftWidget, TQT_SIGNAL( clicked() ), + m_pViewManager->mainWindow(), TQT_SLOT( slotAddTab() ) ); m_leftWidget->setIconSet( SmallIcon( "tab_new" ) ); m_leftWidget->adjustSize(); - QToolTip::add(m_leftWidget, i18n("Open a new tab")); + TQToolTip::add(m_leftWidget, i18n("Open a new tab")); setCornerWidget( m_leftWidget, TopLeft ); } if ( KonqSettings::closeTabButton() ) { - m_rightWidget = new QToolButton( this ); - connect( m_rightWidget, SIGNAL( clicked() ), - m_pViewManager->mainWindow(), SLOT( slotRemoveTab() ) ); + m_rightWidget = new TQToolButton( this ); + connect( m_rightWidget, TQT_SIGNAL( clicked() ), + m_pViewManager->mainWindow(), TQT_SLOT( slotRemoveTab() ) ); m_rightWidget->setIconSet( SmallIconSet( "tab_remove" ) ); m_rightWidget->adjustSize(); - QToolTip::add(m_rightWidget, i18n("Close the current tab")); + TQToolTip::add(m_rightWidget, i18n("Close the current tab")); setCornerWidget( m_rightWidget, TopRight ); } setAutomaticResizeTabs( true ); setTabReorderingEnabled( true ); - connect( this, SIGNAL( movedTab( int, int ) ), - SLOT( slotMovedTab( int, int ) ) ); - connect( this, SIGNAL( mouseMiddleClick() ), - SLOT( slotMouseMiddleClick() ) ); - connect( this, SIGNAL( mouseMiddleClick( QWidget * ) ), - SLOT( slotMouseMiddleClick( QWidget * ) ) ); - connect( this, SIGNAL( mouseDoubleClick() ), - m_pViewManager->mainWindow(), SLOT( slotAddTab() ) ); - - connect( this, SIGNAL( testCanDecode(const QDragMoveEvent *, bool & )), - SLOT( slotTestCanDecode(const QDragMoveEvent *, bool & ) ) ); - connect( this, SIGNAL( receivedDropEvent( QDropEvent * )), - SLOT( slotReceivedDropEvent( QDropEvent * ) ) ); - connect( this, SIGNAL( receivedDropEvent( QWidget *, QDropEvent * )), - SLOT( slotReceivedDropEvent( QWidget *, QDropEvent * ) ) ); - connect( this, SIGNAL( initiateDrag( QWidget * )), - SLOT( slotInitiateDrag( QWidget * ) ) ); + connect( this, TQT_SIGNAL( movedTab( int, int ) ), + TQT_SLOT( slotMovedTab( int, int ) ) ); + connect( this, TQT_SIGNAL( mouseMiddleClick() ), + TQT_SLOT( slotMouseMiddleClick() ) ); + connect( this, TQT_SIGNAL( mouseMiddleClick( TQWidget * ) ), + TQT_SLOT( slotMouseMiddleClick( TQWidget * ) ) ); + connect( this, TQT_SIGNAL( mouseDoubleClick() ), + m_pViewManager->mainWindow(), TQT_SLOT( slotAddTab() ) ); + + connect( this, TQT_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )), + TQT_SLOT( slotTestCanDecode(const TQDragMoveEvent *, bool & ) ) ); + connect( this, TQT_SIGNAL( receivedDropEvent( TQDropEvent * )), + TQT_SLOT( slotReceivedDropEvent( TQDropEvent * ) ) ); + connect( this, TQT_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )), + TQT_SLOT( slotReceivedDropEvent( TQWidget *, TQDropEvent * ) ) ); + connect( this, TQT_SIGNAL( initiateDrag( TQWidget * )), + TQT_SLOT( slotInitiateDrag( TQWidget * ) ) ); } KonqFrameTabs::~KonqFrameTabs() @@ -183,29 +183,29 @@ KonqFrameTabs::~KonqFrameTabs() } void KonqFrameTabs::listViews( ChildViewList *viewList ) { - for( QPtrListIterator it( *m_pChildFrameList ); *it; ++it ) + for( TQPtrListIterator it( *m_pChildFrameList ); *it; ++it ) it.current()->listViews(viewList); } -void KonqFrameTabs::saveConfig( KConfig* config, const QString &prefix, bool saveURLs, +void KonqFrameTabs::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth ) { //write children - QStringList strlst; + TQStringList strlst; int i = 0; - QString newPrefix; + TQString newPrefix; for (KonqFrameBase* it = m_pChildFrameList->first(); it; it = m_pChildFrameList->next()) { - newPrefix = QString::fromLatin1( it->frameType() ) + "T" + QString::number(i); + newPrefix = TQString::fromLatin1( it->frameType() ) + "T" + TQString::number(i); strlst.append( newPrefix ); newPrefix.append( '_' ); it->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + i ); i++; } - config->writeEntry( QString::fromLatin1( "Children" ).prepend( prefix ), strlst ); + config->writeEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), strlst ); - config->writeEntry( QString::fromLatin1( "activeChildIndex" ).prepend( prefix ), + config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), currentPageIndex() ); } @@ -222,10 +222,10 @@ void KonqFrameTabs::copyHistory( KonqFrameBase *other ) } } -void KonqFrameTabs::printFrameInfo( const QString& spaces ) +void KonqFrameTabs::printFrameInfo( const TQString& spaces ) { kdDebug(1202) << spaces << "KonqFrameTabs " << this << " visible=" - << QString("%1").arg(isVisible()) << " activeChild=" + << TQString("%1").arg(isVisible()) << " activeChild=" << m_pActiveChild << endl; if (!m_pActiveChild) @@ -242,21 +242,21 @@ void KonqFrameTabs::printFrameInfo( const QString& spaces ) } } -void KonqFrameTabs::reparentFrame( QWidget* parent, const QPoint & p, bool showIt ) +void KonqFrameTabs::reparentFrame( TQWidget* parent, const TQPoint & p, bool showIt ) { - QWidget::reparent( parent, p, showIt ); + TQWidget::reparent( parent, p, showIt ); } -void KonqFrameTabs::setTitle( const QString &title , QWidget* sender) +void KonqFrameTabs::setTitle( const TQString &title , TQWidget* sender) { // kdDebug(1202) << "KonqFrameTabs::setTitle( " << title << " , " << sender << " )" << endl; setTabLabel( sender,title ); } -void KonqFrameTabs::setTabIcon( const KURL &url, QWidget* sender ) +void KonqFrameTabs::setTabIcon( const KURL &url, TQWidget* sender ) { //kdDebug(1202) << "KonqFrameTabs::setTabIcon( " << url << " , " << sender << " )" << endl; - QIconSet iconSet; + TQIconSet iconSet; if (m_permanentCloseButtons) iconSet = SmallIcon( "fileclose" ); else @@ -319,7 +319,7 @@ void KonqFrameTabs::removeChildFrame( KonqFrameBase * frame ) //kdDebug(1202) << "KonqFrameTabs::RemoveChildFrame finished" << endl; } -void KonqFrameTabs::slotCurrentChanged( QWidget* newPage ) +void KonqFrameTabs::slotCurrentChanged( TQWidget* newPage ) { setTabColor( newPage, KGlobalSettings::textColor() ); KonqFrameBase* currentFrame = dynamic_cast(newPage); @@ -357,7 +357,7 @@ void KonqFrameTabs::slotMovedTab( int from, int to ) } } -void KonqFrameTabs::slotContextMenu( const QPoint &p ) +void KonqFrameTabs::slotContextMenu( const TQPoint &p ) { refreshSubPopupMenuTab(); @@ -371,7 +371,7 @@ void KonqFrameTabs::slotContextMenu( const QPoint &p ) m_pPopupMenu->exec( p ); } -void KonqFrameTabs::slotContextMenu( QWidget *w, const QPoint &p ) +void KonqFrameTabs::slotContextMenu( TQWidget *w, const TQPoint &p ) { refreshSubPopupMenuTab(); @@ -398,7 +398,7 @@ void KonqFrameTabs::refreshSubPopupMenuTab() m_pSubPopupMenuTab->insertItem( SmallIcon( "reload_all_tabs" ), i18n( "&Reload All Tabs" ), m_pViewManager->mainWindow(), - SLOT( slotReloadAllTabs() ), + TQT_SLOT( slotReloadAllTabs() ), m_pViewManager->mainWindow()->action("reload_all_tabs")->shortcut() ); m_pSubPopupMenuTab->insertSeparator(); for (KonqFrameBase* it = m_pChildFrameList->first(); it; it = m_pChildFrameList->next()) @@ -406,11 +406,11 @@ void KonqFrameTabs::refreshSubPopupMenuTab() KonqFrame* frame = dynamic_cast(it); if ( frame && frame->activeChildView() ) { - QString title = frame->title().stripWhiteSpace(); + TQString title = frame->title().stripWhiteSpace(); if ( title.isEmpty() ) title = frame->activeChildView()->url().url(); title = KStringHandler::csqueeze( title, 50 ); - m_pSubPopupMenuTab->insertItem( QIconSet( KonqPixmapProvider::self()->pixmapFor( frame->activeChildView()->url().url() ) ), title, i ); + m_pSubPopupMenuTab->insertItem( TQIconSet( KonqPixmapProvider::self()->pixmapFor( frame->activeChildView()->url().url() ) ), title, i ); } i++; @@ -420,11 +420,11 @@ void KonqFrameTabs::refreshSubPopupMenuTab() m_pSubPopupMenuTab->insertItem( SmallIconSet( "tab_remove_other" ), i18n( "Close &Other Tabs" ), m_pViewManager->mainWindow(), - SLOT( slotRemoveOtherTabsPopup() ), + TQT_SLOT( slotRemoveOtherTabsPopup() ), m_pViewManager->mainWindow()->action("removeothertabs")->shortcut() ); } -void KonqFrameTabs::slotCloseRequest( QWidget *w ) +void KonqFrameTabs::slotCloseRequest( TQWidget *w ) { if ( m_pChildFrameList->count() > 1 ) { // Yes, I know this is an unchecked dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls. @@ -440,18 +440,18 @@ void KonqFrameTabs::slotSubPopupMenuTabActivated( int _id) void KonqFrameTabs::slotMouseMiddleClick() { - QApplication::clipboard()->setSelectionMode( QClipboard::Selection ); - KURL filteredURL ( KonqMisc::konqFilteredURL( this, QApplication::clipboard()->text() ) ); + TQApplication::clipboard()->setSelectionMode( QClipboard::Selection ); + KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) ); if ( !filteredURL.isEmpty() ) { - KonqView* newView = m_pViewManager->addTab(QString::null, QString::null, false, false); + KonqView* newView = m_pViewManager->addTab(TQString::null, TQString::null, false, false); if (newView == 0L) return; - m_pViewManager->mainWindow()->openURL( newView, filteredURL, QString::null ); + m_pViewManager->mainWindow()->openURL( newView, filteredURL, TQString::null ); m_pViewManager->showTab( newView ); m_pViewManager->mainWindow()->focusLocationBar(); } } -void KonqFrameTabs::slotMouseMiddleClick( QWidget *w ) +void KonqFrameTabs::slotMouseMiddleClick( TQWidget *w ) { if ( m_MouseMiddleClickClosesTab ) { if ( m_pChildFrameList->count() > 1 ) { @@ -461,8 +461,8 @@ void KonqFrameTabs::slotMouseMiddleClick( QWidget *w ) } } else { - QApplication::clipboard()->setSelectionMode( QClipboard::Selection ); - KURL filteredURL ( KonqMisc::konqFilteredURL( this, QApplication::clipboard()->text() ) ); + TQApplication::clipboard()->setSelectionMode( QClipboard::Selection ); + KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) ); if ( !filteredURL.isEmpty() ) { KonqFrameBase* frame = dynamic_cast(w); if (frame) { @@ -472,25 +472,25 @@ void KonqFrameTabs::slotMouseMiddleClick( QWidget *w ) } } -void KonqFrameTabs::slotTestCanDecode(const QDragMoveEvent *e, bool &accept /* result */) +void KonqFrameTabs::slotTestCanDecode(const TQDragMoveEvent *e, bool &accept /* result */) { accept = KURLDrag::canDecode( e ); } -void KonqFrameTabs::slotReceivedDropEvent( QDropEvent *e ) +void KonqFrameTabs::slotReceivedDropEvent( TQDropEvent *e ) { KURL::List lstDragURLs; bool ok = KURLDrag::decode( e, lstDragURLs ); if ( ok && lstDragURLs.first().isValid() ) { - KonqView* newView = m_pViewManager->addTab(QString::null, QString::null, false, false); + KonqView* newView = m_pViewManager->addTab(TQString::null, TQString::null, false, false); if (newView == 0L) return; - m_pViewManager->mainWindow()->openURL( newView, lstDragURLs.first(), QString::null ); + m_pViewManager->mainWindow()->openURL( newView, lstDragURLs.first(), TQString::null ); m_pViewManager->showTab( newView ); m_pViewManager->mainWindow()->focusLocationBar(); } } -void KonqFrameTabs::slotReceivedDropEvent( QWidget *w, QDropEvent *e ) +void KonqFrameTabs::slotReceivedDropEvent( TQWidget *w, TQDropEvent *e ) { KURL::List lstDragURLs; bool ok = KURLDrag::decode( e, lstDragURLs ); @@ -502,7 +502,7 @@ void KonqFrameTabs::slotReceivedDropEvent( QWidget *w, QDropEvent *e ) } } -void KonqFrameTabs::slotInitiateDrag( QWidget *w ) +void KonqFrameTabs::slotInitiateDrag( TQWidget *w ) { KonqFrameBase* frame = dynamic_cast( w ); if (frame) { diff --git a/konqueror/konq_tabs.h b/konqueror/konq_tabs.h index 98060e0bb..ccae6e84f 100644 --- a/konqueror/konq_tabs.h +++ b/konqueror/konq_tabs.h @@ -47,25 +47,25 @@ class KonqFrameTabs : public KTabWidget, public KonqFrameContainerBase friend class KonqFrame; //for emitting ctrlTabPressed() only, aleXXX public: - KonqFrameTabs(QWidget* parent, KonqFrameContainerBase* parentContainer, + KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentContainer, KonqViewManager* viewManager, const char * name = 0); virtual ~KonqFrameTabs(); virtual void listViews( ChildViewList *viewList ); - virtual void saveConfig( KConfig* config, const QString &prefix, bool saveURLs, + virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 ); virtual void copyHistory( KonqFrameBase *other ); - virtual void printFrameInfo( const QString& spaces ); + virtual void printFrameInfo( const TQString& spaces ); - QPtrList* childFrameList() { return m_pChildFrameList; } + TQPtrList* childFrameList() { return m_pChildFrameList; } - virtual void setTitle( const QString &title, QWidget* sender ); - virtual void setTabIcon( const KURL &url, QWidget* sender ); + virtual void setTitle( const TQString &title, TQWidget* sender ); + virtual void setTabIcon( const KURL &url, TQWidget* sender ); - virtual QWidget* widget() { return this; } - virtual QCString frameType() { return QCString("Tabs"); } + virtual TQWidget* widget() { return this; } + virtual TQCString frameType() { return TQCString("Tabs"); } void activateChild(); @@ -80,15 +80,15 @@ public: void removeChildFrame( KonqFrameBase * frame ); //inherited - virtual void reparentFrame(QWidget * parent, - const QPoint & p, bool showIt=FALSE ); + virtual void reparentFrame(TQWidget * parent, + const TQPoint & p, bool showIt=FALSE ); void moveTabBackward(int index); void moveTabForward(int index); public slots: - void slotCurrentChanged( QWidget* newPage ); + void slotCurrentChanged( TQWidget* newPage ); void setAlwaysTabbedMode( bool ); signals: @@ -99,28 +99,28 @@ protected: void refreshSubPopupMenuTab(); void hideTabBar(); - QPtrList* m_pChildFrameList; + TQPtrList* m_pChildFrameList; private slots: - void slotContextMenu( const QPoint& ); - void slotContextMenu( QWidget*, const QPoint& ); - void slotCloseRequest( QWidget* ); + void slotContextMenu( const TQPoint& ); + void slotContextMenu( TQWidget*, const TQPoint& ); + void slotCloseRequest( TQWidget* ); void slotMovedTab( int, int ); void slotMouseMiddleClick(); - void slotMouseMiddleClick( QWidget* ); + void slotMouseMiddleClick( TQWidget* ); - void slotTestCanDecode(const QDragMoveEvent *e, bool &accept /* result */); - void slotReceivedDropEvent( QDropEvent* ); - void slotInitiateDrag( QWidget * ); - void slotReceivedDropEvent( QWidget *, QDropEvent * ); + void slotTestCanDecode(const TQDragMoveEvent *e, bool &accept /* result */); + void slotReceivedDropEvent( TQDropEvent* ); + void slotInitiateDrag( TQWidget * ); + void slotReceivedDropEvent( TQWidget *, TQDropEvent * ); void slotSubPopupMenuTabActivated( int ); private: KonqViewManager* m_pViewManager; - QPopupMenu* m_pPopupMenu; - QPopupMenu* m_pSubPopupMenuTab; - QToolButton* m_rightWidget; - QToolButton* m_leftWidget; + TQPopupMenu* m_pPopupMenu; + TQPopupMenu* m_pSubPopupMenuTab; + TQToolButton* m_rightWidget; + TQToolButton* m_leftWidget; bool m_permanentCloseButtons; bool m_alwaysTabBar; bool m_MouseMiddleClickClosesTab; diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index 87222734c..aa96171fa 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -39,11 +39,11 @@ #include #include #include -#include +#include -#include -#include -#include +#include +#include +#include #include #include #include @@ -53,7 +53,7 @@ //#define DEBUG_HISTORY -template class QPtrList; +template class TQPtrList; KonqView::KonqView( KonqViewFactory &viewFactory, KonqFrame* viewFrame, @@ -61,7 +61,7 @@ KonqView::KonqView( KonqViewFactory &viewFactory, const KService::Ptr &service, const KTrader::OfferList &partServiceOffers, const KTrader::OfferList &appServiceOffers, - const QString &serviceType, + const TQString &serviceType, bool passiveMode ) { @@ -111,13 +111,13 @@ KonqView::~KonqView() //kdDebug(1202) << "KonqView::~KonqView : part = " << m_pPart << endl; if (KonqMainWindow::s_crashlog_file) { - QString part_url; + TQString part_url; if (m_pPart) part_url = m_pPart->url().url(); if (part_url.isNull()) part_url = ""; - QCString line; - line = ( QString("close(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8(); + TQCString line; + line = ( TQString("close(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8(); KonqMainWindow::s_crashlog_file->writeBlock(line, line.length()); KonqMainWindow::s_crashlog_file->flush(); } @@ -127,7 +127,7 @@ KonqView::~KonqView() { finishedWithCurrentURL(); if ( isPassiveMode() ) - disconnect( m_pPart, SIGNAL( destroyed() ), m_pMainWindow->viewManager(), SLOT( slotObjectDestroyed() ) ); + disconnect( m_pPart, TQT_SIGNAL( destroyed() ), m_pMainWindow->viewManager(), TQT_SLOT( slotObjectDestroyed() ) ); delete m_pPart; } @@ -136,28 +136,28 @@ KonqView::~KonqView() //kdDebug(1202) << "KonqView::~KonqView " << this << " done" << endl; } -void KonqView::openURL( const KURL &url, const QString & locationBarURL, - const QString & nameFilter, bool tempFile ) +void KonqView::openURL( const KURL &url, const TQString & locationBarURL, + const TQString & nameFilter, bool tempFile ) { kdDebug(1202) << "KonqView::openURL url=" << url << " locationBarURL=" << locationBarURL << endl; setServiceTypeInExtension(); if (KonqMainWindow::s_crashlog_file) { - QString part_url; + TQString part_url; if (m_pPart) part_url = m_pPart->url().url(); if (part_url.isNull()) part_url = ""; - QString url_url = url.url(); + TQString url_url = url.url(); if (url_url.isNull()) - url_url = QString(""); + url_url = TQString(""); - QCString line; + TQCString line; - line = ( QString("closed(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8(); + line = ( TQString("closed(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8(); KonqMainWindow::s_crashlog_file->writeBlock(line,line.length()); - line = ( QString("opened(%3):%4\n").arg(m_randID,0,16).arg(url_url) ).utf8(); + line = ( TQString("opened(%3):%4\n").arg(m_randID,0,16).arg(url_url) ).utf8(); KonqMainWindow::s_crashlog_file->writeBlock(line,line.length()); KonqMainWindow::s_crashlog_file->flush(); } @@ -190,7 +190,7 @@ void KonqView::openURL( const KURL &url, const QString & locationBarURL, } else m_bLockHistory = false; - callExtensionStringMethod( "setNameFilter(const QString&)", nameFilter ); + callExtensionStringMethod( "setNameFilter(const TQString&)", nameFilter ); if ( m_bDisableScrolling ) callExtensionMethod( "disableScrolling()" ); @@ -224,7 +224,7 @@ void KonqView::openURL( const KURL &url, const QString & locationBarURL, updateHistoryEntry(false /* don't save location bar URL yet */); // add pending history entry - KonqHistoryManager::kself()->addPending( url, locationBarURL, QString::null); + KonqHistoryManager::kself()->addPending( url, locationBarURL, TQString::null); #ifdef DEBUG_HISTORY kdDebug(1202) << "Current position : " << m_lstHistory.at() << endl; @@ -255,7 +255,7 @@ void KonqView::switchView( KonqViewFactory &viewFactory ) connectPart(); - QVariant prop; + TQVariant prop; prop = m_service->property( "X-KDE-BrowserView-FollowActive"); if (prop.isValid() && prop.toBool()) @@ -304,8 +304,8 @@ void KonqView::switchView( KonqViewFactory &viewFactory ) } } -bool KonqView::changeViewMode( const QString &serviceType, - const QString &serviceName, +bool KonqView::changeViewMode( const TQString &serviceType, + const TQString &serviceName, bool forceAutoEmbed ) { // Caller should call stop first. @@ -372,16 +372,16 @@ bool KonqView::changeViewMode( const QString &serviceType, void KonqView::connectPart( ) { //kdDebug(1202) << "KonqView::connectPart" << endl; - connect( m_pPart, SIGNAL( started( KIO::Job * ) ), - this, SLOT( slotStarted( KIO::Job * ) ) ); - connect( m_pPart, SIGNAL( completed() ), - this, SLOT( slotCompleted() ) ); - connect( m_pPart, SIGNAL( completed(bool) ), - this, SLOT( slotCompleted(bool) ) ); - connect( m_pPart, SIGNAL( canceled( const QString & ) ), - this, SLOT( slotCanceled( const QString & ) ) ); - connect( m_pPart, SIGNAL( setWindowCaption( const QString & ) ), - this, SLOT( setCaption( const QString & ) ) ); + connect( m_pPart, TQT_SIGNAL( started( KIO::Job * ) ), + this, TQT_SLOT( slotStarted( KIO::Job * ) ) ); + connect( m_pPart, TQT_SIGNAL( completed() ), + this, TQT_SLOT( slotCompleted() ) ); + connect( m_pPart, TQT_SIGNAL( completed(bool) ), + this, TQT_SLOT( slotCompleted(bool) ) ); + connect( m_pPart, TQT_SIGNAL( canceled( const TQString & ) ), + this, TQT_SLOT( slotCanceled( const TQString & ) ) ); + connect( m_pPart, TQT_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQT_SLOT( setCaption( const TQString & ) ) ); KParts::BrowserExtension *ext = browserExtension(); @@ -389,8 +389,8 @@ void KonqView::connectPart( ) { ext->setBrowserInterface( m_browserIface ); - connect( ext, SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs &) ), - m_pMainWindow, SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect( ext, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs &) ), + m_pMainWindow, TQT_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); if ( m_bPopupMenuEnabled ) { @@ -398,90 +398,90 @@ void KonqView::connectPart( ) enablePopupMenu( true ); } - connect( ext, SIGNAL( setLocationBarURL( const QString & ) ), - this, SLOT( setLocationBarURL( const QString & ) ) ); + connect( ext, TQT_SIGNAL( setLocationBarURL( const TQString & ) ), + this, TQT_SLOT( setLocationBarURL( const TQString & ) ) ); - connect( ext, SIGNAL( setIconURL( const KURL & ) ), - this, SLOT( setIconURL( const KURL & ) ) ); + connect( ext, TQT_SIGNAL( setIconURL( const KURL & ) ), + this, TQT_SLOT( setIconURL( const KURL & ) ) ); - connect( ext, SIGNAL( setPageSecurity( int ) ), - this, SLOT( setPageSecurity( int ) ) ); + connect( ext, TQT_SIGNAL( setPageSecurity( int ) ), + this, TQT_SLOT( setPageSecurity( int ) ) ); - connect( ext, SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), - m_pMainWindow, SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs & ) ) ); + connect( ext, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), + m_pMainWindow, TQT_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs & ) ) ); - connect( ext, SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), - m_pMainWindow, SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ) ); + connect( ext, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), + m_pMainWindow, TQT_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ) ); - connect( ext, SIGNAL( loadingProgress( int ) ), - m_pKonqFrame->statusbar(), SLOT( slotLoadingProgress( int ) ) ); + connect( ext, TQT_SIGNAL( loadingProgress( int ) ), + m_pKonqFrame->statusbar(), TQT_SLOT( slotLoadingProgress( int ) ) ); - connect( ext, SIGNAL( speedProgress( int ) ), - m_pKonqFrame->statusbar(), SLOT( slotSpeedProgress( int ) ) ); + connect( ext, TQT_SIGNAL( speedProgress( int ) ), + m_pKonqFrame->statusbar(), TQT_SLOT( slotSpeedProgress( int ) ) ); - connect( ext, SIGNAL( selectionInfo( const KFileItemList & ) ), - this, SLOT( slotSelectionInfo( const KFileItemList & ) ) ); + connect( ext, TQT_SIGNAL( selectionInfo( const KFileItemList & ) ), + this, TQT_SLOT( slotSelectionInfo( const KFileItemList & ) ) ); - connect( ext, SIGNAL( mouseOverInfo( const KFileItem * ) ), - this, SLOT( slotMouseOverInfo( const KFileItem * ) ) ); + connect( ext, TQT_SIGNAL( mouseOverInfo( const KFileItem * ) ), + this, TQT_SLOT( slotMouseOverInfo( const KFileItem * ) ) ); - connect( ext, SIGNAL( openURLNotify() ), - this, SLOT( slotOpenURLNotify() ) ); + connect( ext, TQT_SIGNAL( openURLNotify() ), + this, TQT_SLOT( slotOpenURLNotify() ) ); - connect( ext, SIGNAL( enableAction( const char *, bool ) ), - this, SLOT( slotEnableAction( const char *, bool ) ) ); + connect( ext, TQT_SIGNAL( enableAction( const char *, bool ) ), + this, TQT_SLOT( slotEnableAction( const char *, bool ) ) ); - connect( ext, SIGNAL( setActionText( const char *, const QString& ) ), - this, SLOT( slotSetActionText( const char *, const QString& ) ) ); + connect( ext, TQT_SIGNAL( setActionText( const char *, const TQString& ) ), + this, TQT_SLOT( slotSetActionText( const char *, const TQString& ) ) ); - connect( ext, SIGNAL( moveTopLevelWidget( int, int ) ), - this, SLOT( slotMoveTopLevelWidget( int, int ) ) ); + connect( ext, TQT_SIGNAL( moveTopLevelWidget( int, int ) ), + this, TQT_SLOT( slotMoveTopLevelWidget( int, int ) ) ); - connect( ext, SIGNAL( resizeTopLevelWidget( int, int ) ), - this, SLOT( slotResizeTopLevelWidget( int, int ) ) ); + connect( ext, TQT_SIGNAL( resizeTopLevelWidget( int, int ) ), + this, TQT_SLOT( slotResizeTopLevelWidget( int, int ) ) ); - connect( ext, SIGNAL( requestFocus(KParts::ReadOnlyPart *) ), - this, SLOT( slotRequestFocus(KParts::ReadOnlyPart *) ) ); + connect( ext, TQT_SIGNAL( requestFocus(KParts::ReadOnlyPart *) ), + this, TQT_SLOT( slotRequestFocus(KParts::ReadOnlyPart *) ) ); if (service()->desktopEntryName() != "konq_sidebartng") { - connect( ext, SIGNAL( infoMessage( const QString & ) ), - m_pKonqFrame->statusbar(), SLOT( message( const QString & ) ) ); + connect( ext, TQT_SIGNAL( infoMessage( const TQString & ) ), + m_pKonqFrame->statusbar(), TQT_SLOT( message( const TQString & ) ) ); connect( ext, - SIGNAL( addWebSideBar(const KURL&, const QString&) ), + TQT_SIGNAL( addWebSideBar(const KURL&, const TQString&) ), m_pMainWindow, - SLOT( slotAddWebSideBar(const KURL&, const QString&) ) ); + TQT_SLOT( slotAddWebSideBar(const KURL&, const TQString&) ) ); } callExtensionBoolMethod( "setSaveViewPropertiesLocally(bool)", m_pMainWindow->saveViewPropertiesLocally() ); } - QVariant urlDropHandling; + TQVariant urlDropHandling; if ( ext ) urlDropHandling = ext->property( "urlDropHandling" ); else - urlDropHandling = QVariant( true, 0 ); + urlDropHandling = TQVariant( true, 0 ); // Handle url drops if // a) either the property says "ok" // or // b) the part is a plain krop (no BE) - m_bURLDropHandling = ( urlDropHandling.type() == QVariant::Bool && + m_bURLDropHandling = ( urlDropHandling.type() == TQVariant::Bool && urlDropHandling.toBool() ); m_pPart->widget()->installEventFilter( this ); - if (m_bBackRightClick && m_pPart->widget()->inherits("QScrollView") ) + if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") ) { - (static_cast(m_pPart->widget()))->viewport()->installEventFilter( this ); + (static_cast(m_pPart->widget()))->viewport()->installEventFilter( this ); } // KonqDirPart signal if ( m_pPart->inherits("KonqDirPart") ) { - connect( m_pPart, SIGNAL( findOpen( KonqDirPart * ) ), - m_pMainWindow, SLOT( slotFindOpen( KonqDirPart * ) ) ); + connect( m_pPart, TQT_SIGNAL( findOpen( KonqDirPart * ) ), + m_pMainWindow, TQT_SLOT( slotFindOpen( KonqDirPart * ) ) ); } } @@ -493,7 +493,7 @@ void KonqView::slotEnableAction( const char * name, bool enabled ) // stored inside the browser-extension. } -void KonqView::slotSetActionText( const char* name, const QString& text ) +void KonqView::slotSetActionText( const char* name, const TQString& text ) { if ( m_pMainWindow->currentView() == this ) m_pMainWindow->setActionText( name, text ); @@ -532,9 +532,9 @@ void KonqView::slotStarted( KIO::Job * job ) job->setWindow (m_pMainWindow->topLevelWidget ()); } - connect( job, SIGNAL( percent( KIO::Job *, unsigned long ) ), this, SLOT( slotPercent( KIO::Job *, unsigned long ) ) ); - connect( job, SIGNAL( speed( KIO::Job *, unsigned long ) ), this, SLOT( slotSpeed( KIO::Job *, unsigned long ) ) ); - connect( job, SIGNAL( infoMessage( KIO::Job *, const QString & ) ), this, SLOT( slotInfoMessage( KIO::Job *, const QString & ) ) ); + connect( job, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), this, TQT_SLOT( slotPercent( KIO::Job *, unsigned long ) ) ); + connect( job, TQT_SIGNAL( speed( KIO::Job *, unsigned long ) ), this, TQT_SLOT( slotSpeed( KIO::Job *, unsigned long ) ) ); + connect( job, TQT_SIGNAL( infoMessage( KIO::Job *, const TQString & ) ), this, TQT_SLOT( slotInfoMessage( KIO::Job *, const TQString & ) ) ); } } @@ -564,7 +564,7 @@ void KonqView::slotSpeed( KIO::Job *, unsigned long bytesPerSecond ) m_pKonqFrame->statusbar()->slotSpeedProgress( bytesPerSecond ); } -void KonqView::slotInfoMessage( KIO::Job *, const QString &msg ) +void KonqView::slotInfoMessage( KIO::Job *, const TQString &msg ) { m_pKonqFrame->statusbar()->message( msg ); } @@ -605,7 +605,7 @@ void KonqView::slotCompleted( bool hasPending ) } } -void KonqView::slotCanceled( const QString & errorMsg ) +void KonqView::slotCanceled( const TQString & errorMsg ) { kdDebug(1202) << "KonqView::slotCanceled" << endl; // The errorMsg comes from the ReadOnlyPart's job. @@ -619,13 +619,13 @@ void KonqView::slotCanceled( const QString & errorMsg ) void KonqView::slotSelectionInfo( const KFileItemList &items ) { KonqFileSelectionEvent ev( items, m_pPart ); - QApplication::sendEvent( m_pMainWindow, &ev ); + TQApplication::sendEvent( m_pMainWindow, &ev ); } void KonqView::slotMouseOverInfo( const KFileItem *item ) { KonqFileMouseOverEvent ev( item, m_pPart ); - QApplication::sendEvent( m_pMainWindow, &ev ); + TQApplication::sendEvent( m_pMainWindow, &ev ); } void KonqView::setLocationBarURL( const KURL& locationBarURL ) @@ -633,7 +633,7 @@ void KonqView::setLocationBarURL( const KURL& locationBarURL ) setLocationBarURL( locationBarURL.pathOrURL() ); } -void KonqView::setLocationBarURL( const QString & locationBarURL ) +void KonqView::setLocationBarURL( const TQString & locationBarURL ) { //kdDebug(1202) << "KonqView::setLocationBarURL " << locationBarURL << " this=" << this << endl; @@ -673,11 +673,11 @@ void KonqView::setTabIcon( const KURL &url ) if (!m_bPassiveMode) frame()->setTabIcon( url, 0L ); } -void KonqView::setCaption( const QString & caption ) +void KonqView::setCaption( const TQString & caption ) { if (caption.isEmpty()) return; - QString adjustedCaption = caption; + TQString adjustedCaption = caption; // For local URLs we prefer to use only the directory name if (url().isLocalFile()) { @@ -745,8 +745,8 @@ void KonqView::updateHistoryEntry( bool saveLocationBarURL ) if ( browserExtension() ) { - current->buffer = QByteArray(); // Start with empty buffer. - QDataStream stream( current->buffer, IO_WriteOnly ); + current->buffer = TQByteArray(); // Start with empty buffer. + TQDataStream stream( current->buffer, IO_WriteOnly ); browserExtension()->saveState( stream ); } @@ -772,8 +772,8 @@ void KonqView::updateHistoryEntry( bool saveLocationBarURL ) current->strServiceName = m_service->desktopEntryName(); current->doPost = m_doPost; - current->postData = m_doPost ? m_postData : QByteArray(); - current->postContentType = m_doPost ? m_postContentType : QString::null; + current->postData = m_doPost ? m_postData : TQByteArray(); + current->postContentType = m_doPost ? m_postContentType : TQString::null; current->pageReferrer = m_pageReferrer; } @@ -835,7 +835,7 @@ void KonqView::restoreHistory() #endif setLocationBarURL( h.locationBarURL ); setPageSecurity( h.pageSecurity ); - m_sTypedURL = QString::null; + m_sTypedURL = TQString::null; if ( ! changeViewMode( h.strServiceType, h.strServiceName ) ) { kdWarning(1202) << "Couldn't change view mode to " << h.strServiceType @@ -850,7 +850,7 @@ void KonqView::restoreHistory() if ( browserExtension() ) { //kdDebug(1202) << "Restoring view from stream" << endl; - QDataStream stream( h.buffer, IO_ReadOnly ); + TQDataStream stream( h.buffer, IO_ReadOnly ); browserExtension()->restoreState( stream ); @@ -884,7 +884,7 @@ void KonqView::copyHistory( KonqView *other ) { m_lstHistory.clear(); - QPtrListIterator it( other->m_lstHistory ); + TQPtrListIterator it( other->m_lstHistory ); for (; it.current(); ++it ) m_lstHistory.append( new HistoryEntry( *it.current() ) ); m_lstHistory.at(other->m_lstHistory.at()); @@ -963,8 +963,8 @@ void KonqView::finishedWithCurrentURL() if ( !m_tempFile.isEmpty() ) { kdDebug(1202) << "######### Deleting tempfile after use:" << m_tempFile << endl; - QFile::remove( m_tempFile ); - m_tempFile = QString::null; + TQFile::remove( m_tempFile ); + m_tempFile = TQString::null; } } @@ -1008,7 +1008,7 @@ void KonqView::setLockedLocation( bool b ) void KonqView::aboutToOpenURL( const KURL &url, const KParts::URLArgs &args ) { KParts::OpenURLEvent ev( m_pPart, url, args ); - QApplication::sendEvent( m_pMainWindow, &ev ); + TQApplication::sendEvent( m_pMainWindow, &ev ); m_bGotIconURL = false; m_bAborted = false; @@ -1025,14 +1025,14 @@ void KonqView::setServiceTypeInExtension() ext->setURLArgs( args ); } -QStringList KonqView::frameNames() const +TQStringList KonqView::frameNames() const { return childFrameNames( m_pPart ); } -QStringList KonqView::childFrameNames( KParts::ReadOnlyPart *part ) +TQStringList KonqView::childFrameNames( KParts::ReadOnlyPart *part ) { - QStringList res; + TQStringList res; KParts::BrowserHostExtension *hostExtension = KParts::BrowserHostExtension::childObject( part ); @@ -1041,15 +1041,15 @@ QStringList KonqView::childFrameNames( KParts::ReadOnlyPart *part ) res += hostExtension->frameNames(); - const QPtrList children = hostExtension->frames(); - QPtrListIterator it( children ); + const TQPtrList children = hostExtension->frames(); + TQPtrListIterator it( children ); for (; it.current(); ++it ) res += childFrameNames( it.current() ); return res; } -KParts::BrowserHostExtension* KonqView::hostExtension( KParts::ReadOnlyPart *part, const QString &name ) +KParts::BrowserHostExtension* KonqView::hostExtension( KParts::ReadOnlyPart *part, const TQString &name ) { KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( part ); @@ -1059,8 +1059,8 @@ KParts::BrowserHostExtension* KonqView::hostExtension( KParts::ReadOnlyPart *par if ( ext->frameNames().contains( name ) ) return ext; - const QPtrList children = ext->frames(); - QPtrListIterator it( children ); + const TQPtrList children = ext->frames(); + TQPtrListIterator it( children ); for (; it.current(); ++it ) { KParts::BrowserHostExtension *childHost = hostExtension( it.current(), name ); @@ -1073,7 +1073,7 @@ KParts::BrowserHostExtension* KonqView::hostExtension( KParts::ReadOnlyPart *par bool KonqView::callExtensionMethod( const char *methodName ) { - QObject *obj = KParts::BrowserExtension::childObject( m_pPart ); + TQObject *obj = KParts::BrowserExtension::childObject( m_pPart ); if ( !obj ) // not all views have a browser extension ! return false; @@ -1088,7 +1088,7 @@ bool KonqView::callExtensionMethod( const char *methodName ) bool KonqView::callExtensionBoolMethod( const char *methodName, bool value ) { - QObject *obj = KParts::BrowserExtension::childObject( m_pPart ); + TQObject *obj = KParts::BrowserExtension::childObject( m_pPart ); if ( !obj ) // not all views have a browser extension ! return false; @@ -1103,9 +1103,9 @@ bool KonqView::callExtensionBoolMethod( const char *methodName, bool value ) return true; } -bool KonqView::callExtensionStringMethod( const char *methodName, QString value ) +bool KonqView::callExtensionStringMethod( const char *methodName, TQString value ) { - QObject *obj = KParts::BrowserExtension::childObject( m_pPart ); + TQObject *obj = KParts::BrowserExtension::childObject( m_pPart ); if ( !obj ) // not all views have a browser extension ! return false; @@ -1122,7 +1122,7 @@ bool KonqView::callExtensionStringMethod( const char *methodName, QString value bool KonqView::callExtensionURLMethod( const char *methodName, const KURL& value ) { - QObject *obj = KParts::BrowserExtension::childObject( m_pPart ); + TQObject *obj = KParts::BrowserExtension::childObject( m_pPart ); if ( !obj ) // not all views have a browser extension ! return false; @@ -1137,16 +1137,16 @@ bool KonqView::callExtensionURLMethod( const char *methodName, const KURL& value return true; } -void KonqView::setViewName( const QString &name ) +void KonqView::setViewName( const TQString &name ) { //kdDebug() << "KonqView::setViewName this=" << this << " name=" << name << endl; if ( m_pPart ) m_pPart->setName( name.local8Bit().data() ); } -QString KonqView::viewName() const +TQString KonqView::viewName() const { - return m_pPart ? QString::fromLocal8Bit( m_pPart->name() ) : QString::null; + return m_pPart ? TQString::fromLocal8Bit( m_pPart->name() ) : TQString::null; } void KonqView::enablePopupMenu( bool b ) @@ -1165,39 +1165,39 @@ void KonqView::enablePopupMenu( bool b ) if ( b ) { m_bPopupMenuEnabled = true; - connect( ext, SIGNAL( popupMenu( const QPoint &, const KFileItemList & ) ), - m_pMainWindow, SLOT( slotPopupMenu( const QPoint &, const KFileItemList & ) ) ); + connect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), + m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) ); - connect( ext, SIGNAL( popupMenu( const QPoint &, const KURL &, const QString &, mode_t ) ), - m_pMainWindow, SLOT( slotPopupMenu( const QPoint &, const KURL &, const QString &, mode_t ) ) ); + connect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( ext, SIGNAL( popupMenu( KXMLGUIClient *, const QPoint &, const KFileItemList & ) ), - m_pMainWindow, SLOT( slotPopupMenu( KXMLGUIClient *, const QPoint &, const KFileItemList & ) ) ); + connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), + m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); - connect( ext, SIGNAL( popupMenu( KXMLGUIClient *, const QPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), - m_pMainWindow, SLOT( slotPopupMenu( KXMLGUIClient *, const QPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); + connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), + m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); - connect( ext, SIGNAL( popupMenu( KXMLGUIClient *, const QPoint &, const KURL &, const QString &, mode_t ) ), - m_pMainWindow, SLOT( slotPopupMenu( KXMLGUIClient *, const QPoint &, const KURL &, const QString &, mode_t ) ) ); + connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( ext, SIGNAL( popupMenu( KXMLGUIClient *, const QPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), - m_pMainWindow, SLOT( slotPopupMenu( KXMLGUIClient *, const QPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); + connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), + m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); } else // disable context popup { m_bPopupMenuEnabled = false; - disconnect( ext, SIGNAL( popupMenu( const QPoint &, const KFileItemList & ) ), - m_pMainWindow, SLOT( slotPopupMenu( const QPoint &, const KFileItemList & ) ) ); + disconnect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), + m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) ); - disconnect( ext, SIGNAL( popupMenu( const QPoint &, const KURL &, const QString &, mode_t ) ), - m_pMainWindow, SLOT( slotPopupMenu( const QPoint &, const KURL &, const QString &, mode_t ) ) ); + disconnect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - disconnect( ext, SIGNAL( popupMenu( KXMLGUIClient *, const QPoint &, const KFileItemList & ) ), - m_pMainWindow, SLOT( slotPopupMenu( KXMLGUIClient *, const QPoint &, const KFileItemList & ) ) ); + disconnect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), + m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); - disconnect( ext, SIGNAL( popupMenu( KXMLGUIClient *, const QPoint &, const KURL &, const QString &, mode_t ) ), - m_pMainWindow, SLOT( slotPopupMenu( KXMLGUIClient *, const QPoint &, const KURL &, const QString &, mode_t ) ) ); + disconnect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); } enableBackRightClick( m_bBackRightClick ); } @@ -1207,11 +1207,11 @@ void KonqView::enableBackRightClick( bool b ) { m_bBackRightClick = b; if ( b ) - connect( this, SIGNAL( backRightClick() ), - m_pMainWindow, SLOT( slotBack() ) ); + connect( this, TQT_SIGNAL( backRightClick() ), + m_pMainWindow, TQT_SLOT( slotBack() ) ); else - disconnect( this, SIGNAL( backRightClick() ), - m_pMainWindow, SLOT( slotBack() ) ); + disconnect( this, TQT_SIGNAL( backRightClick() ), + m_pMainWindow, TQT_SLOT( slotBack() ) ); } void KonqView::reparseConfiguration() @@ -1220,9 +1220,9 @@ void KonqView::reparseConfiguration() bool b = KonqSettings::backRightClick(); if ( m_bBackRightClick != b ) { - if (m_bBackRightClick && m_pPart->widget()->inherits("QScrollView") ) + if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") ) { - (static_cast(m_pPart->widget()))->viewport()->installEventFilter( this ); + (static_cast(m_pPart->widget()))->viewport()->installEventFilter( this ); } enableBackRightClick( b ); } @@ -1237,12 +1237,12 @@ void KonqView::disableScrolling() KonqViewIface * KonqView::dcopObject() { if ( !m_dcopObject ) { - QCString dcopName = name(); + TQCString dcopName = name(); if ( dcopName.isEmpty() || dcopName == "unnamed" ) dcopName = viewName().utf8(); if ( dcopName.isEmpty() || dcopName == "unnamed" ) { - QVariant dcopProperty = part()->property( "dcopObjectId" ); - if ( dcopProperty.type() == QVariant::CString ) + TQVariant dcopProperty = part()->property( "dcopObjectId" ); + if ( dcopProperty.type() == TQVariant::CString ) dcopName = dcopProperty.toCString(); } dcopName += "-view"; // to avoid having the same name as the part @@ -1251,21 +1251,21 @@ KonqViewIface * KonqView::dcopObject() return m_dcopObject; } -bool KonqView::eventFilter( QObject *obj, QEvent *e ) +bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) { if ( !m_pPart ) return false; // kdDebug() << "--" << obj->className() << "--" << e->type() << "--" << endl; - if ( e->type() == QEvent::DragEnter && m_bURLDropHandling && obj == m_pPart->widget() ) + if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && obj == m_pPart->widget() ) { - QDragEnterEvent *ev = static_cast( e ); + TQDragEnterEvent *ev = static_cast( e ); if ( KURLDrag::canDecode( ev ) ) { KURL::List lstDragURLs; bool ok = KURLDrag::decode( ev, lstDragURLs ); - QObjectList *children = m_pPart->widget()->queryList( "QWidget" ); + TQObjectList *children = m_pPart->widget()->queryList( "TQWidget" ); if ( ok && !lstDragURLs.first().url().contains( "javascript:", false ) && // ### this looks like a hack to me @@ -1277,9 +1277,9 @@ bool KonqView::eventFilter( QObject *obj, QEvent *e ) delete children; } } - else if ( e->type() == QEvent::Drop && m_bURLDropHandling && obj == m_pPart->widget() ) + else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && obj == m_pPart->widget() ) { - QDropEvent *ev = static_cast( e ); + TQDropEvent *ev = static_cast( e ); KURL::List lstDragURLs; bool ok = KURLDrag::decode( ev, lstDragURLs ); @@ -1291,48 +1291,48 @@ bool KonqView::eventFilter( QObject *obj, QEvent *e ) if ( m_bBackRightClick ) { - if ( e->type() == QEvent::ContextMenu ) + if ( e->type() == TQEvent::ContextMenu ) { - QContextMenuEvent *ev = static_cast( e ); - if ( ev->reason() == QContextMenuEvent::Mouse ) + TQContextMenuEvent *ev = static_cast( e ); + if ( ev->reason() == TQContextMenuEvent::Mouse ) { return true; } } - else if ( e->type() == QEvent::MouseButtonPress ) + else if ( e->type() == TQEvent::MouseButtonPress ) { - QMouseEvent *ev = static_cast( e ); + TQMouseEvent *ev = static_cast( e ); if ( ev->button() == RightButton ) { return true; } } - else if ( e->type() == QEvent::MouseButtonRelease ) + else if ( e->type() == TQEvent::MouseButtonRelease ) { - QMouseEvent *ev = static_cast( e ); + TQMouseEvent *ev = static_cast( e ); if ( ev->button() == RightButton ) { emit backRightClick(); return true; } } - else if ( e->type() == QEvent::MouseMove ) + else if ( e->type() == TQEvent::MouseMove ) { - QMouseEvent *ev = static_cast( e ); + TQMouseEvent *ev = static_cast( e ); if ( ev->state() == RightButton ) { obj->removeEventFilter( this ); - QMouseEvent me( QEvent::MouseButtonPress, ev->pos(), 2, 2 ); - QApplication::sendEvent( obj, &me ); - QContextMenuEvent ce( QContextMenuEvent::Mouse, ev->pos(), 2 ); - QApplication::sendEvent( obj, &ce ); + TQMouseEvent me( TQEvent::MouseButtonPress, ev->pos(), 2, 2 ); + TQApplication::sendEvent( obj, &me ); + TQContextMenuEvent ce( TQContextMenuEvent::Mouse, ev->pos(), 2 ); + TQApplication::sendEvent( obj, &ce ); obj->installEventFilter( this ); return true; } } } - if ( e->type() == QEvent::FocusIn ) + if ( e->type() == TQEvent::FocusIn ) { setActiveInstance(); } @@ -1381,10 +1381,10 @@ KParts::StatusBarExtension * KonqView::statusBarExtension() const return KParts::StatusBarExtension::childObject( m_pPart ); } -bool KonqView::supportsServiceType( const QString &serviceType ) const +bool KonqView::supportsServiceType( const TQString &serviceType ) const { - const QStringList lst = serviceTypes(); - for( QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { + const TQStringList lst = serviceTypes(); + for( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { if ( *it == serviceType ) return true; // Maybe we should keep around a list of KServiceType::Ptr? diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h index 24bec3110..28f2568d9 100644 --- a/konqueror/konq_view.h +++ b/konqueror/konq_view.h @@ -23,12 +23,12 @@ #include "konq_mainwindow.h" #include "konq_factory.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include @@ -45,15 +45,15 @@ namespace KParts struct HistoryEntry { KURL url; - QString locationBarURL; // can be different from url when showing a index.html - QString title; - QByteArray buffer; - QString strServiceType; - QString strServiceName; - QByteArray postData; - QString postContentType; + TQString locationBarURL; // can be different from url when showing a index.html + TQString title; + TQByteArray buffer; + TQString strServiceType; + TQString strServiceName; + TQByteArray postData; + TQString postContentType; bool doPost; - QString pageReferrer; + TQString pageReferrer; KonqMainWindow::PageSecurity pageSecurity; }; @@ -84,7 +84,7 @@ public: const KService::Ptr &service, const KTrader::OfferList &partServiceOffers, const KTrader::OfferList &appServiceOffers, - const QString &serviceType, + const TQString &serviceType, bool passiveMode); ~KonqView(); @@ -98,8 +98,8 @@ public: * @param tempFile whether to delete the file after use */ void openURL( const KURL &url, - const QString & locationBarURL, - const QString &nameFilter = QString::null, + const TQString & locationBarURL, + const TQString &nameFilter = TQString::null, bool tempFile = false ); /** @@ -110,8 +110,8 @@ public: * @param serviceName allows to enforce a particular service to be chosen, * @see KonqFactory. */ - bool changeViewMode( const QString &serviceType, - const QString &serviceName = QString::null, + bool changeViewMode( const TQString &serviceType, + const TQString &serviceName = TQString::null, bool forceAutoEmbed = false ); /** @@ -154,7 +154,7 @@ public: /** * @return the history of this view */ - const QPtrList & history() { return m_lstHistory; } + const TQPtrList & history() { return m_lstHistory; } /** * @return the HistoryEntry at postion @p pos @@ -190,16 +190,16 @@ public: * Get view's location bar URL, i.e. the one that the view signals * It can be different from url(), for instance if we display a index.html */ - QString locationBarURL() const { return m_sLocationBarURL; } + TQString locationBarURL() const { return m_sLocationBarURL; } /** * Get the URL that was typed to get the current URL. */ - QString typedURL() const { return m_sTypedURL; } + TQString typedURL() const { return m_sTypedURL; } /** * Set the URL that was typed to get the current URL. */ - void setTypedURL( const QString & u ) { m_sTypedURL = u; } + void setTypedURL( const TQString & u ) { m_sTypedURL = u; } /** * Return the security state of page in view @@ -228,14 +228,14 @@ public: /** * @return the servicetype this view is currently displaying */ - QString serviceType() const { return m_serviceType; } + TQString serviceType() const { return m_serviceType; } /** * @return the servicetypes this view is capable to display */ - QStringList serviceTypes() const { return m_service->serviceTypes(); } + TQStringList serviceTypes() const { return m_service->serviceTypes(); } - bool supportsServiceType( const QString &serviceType ) const; + bool supportsServiceType( const TQString &serviceType ) const; // True if "Use index.html" is set (->the view doesn't necessarily show HTML!) bool allowHTML() const { return m_bAllowHTML; } @@ -279,7 +279,7 @@ public: void setService( const KService::Ptr &s ) { m_service = s; } KService::Ptr service() { return m_service; } - QString caption() const { return m_caption; } + TQString caption() const { return m_caption; } KTrader::OfferList partServiceOffers() { return m_partServiceOffers; } KTrader::OfferList appServiceOffers() { return m_appServiceOffers; } @@ -289,11 +289,11 @@ public: // return true if the method was found, false if the execution failed bool callExtensionMethod( const char *methodName ); bool callExtensionBoolMethod( const char *methodName, bool value ); - bool callExtensionStringMethod( const char *methodName, QString value ); + bool callExtensionStringMethod( const char *methodName, TQString value ); bool callExtensionURLMethod( const char *methodName, const KURL& value ); - void setViewName( const QString &name ); - QString viewName() const; + void setViewName( const TQString &name ); + TQString viewName() const; // True to enable the context popup menu void enablePopupMenu( bool b ); @@ -303,7 +303,7 @@ public: void disableScrolling(); - QStringList frameNames() const; + TQStringList frameNames() const; KonqViewIface * dcopObject(); @@ -316,12 +316,12 @@ public: // Returns false in case the reload must be cancelled. bool prepareReload( KParts::URLArgs& args ); - // overload for the QString version + // overload for the TQString version void setLocationBarURL( const KURL& locationBarURL ); - static QStringList childFrameNames( KParts::ReadOnlyPart *part ); + static TQStringList childFrameNames( KParts::ReadOnlyPart *part ); - static KParts::BrowserHostExtension *hostExtension( KParts::ReadOnlyPart *part, const QString &name ); + static KParts::BrowserHostExtension *hostExtension( KParts::ReadOnlyPart *part, const TQString &name ); signals: @@ -346,7 +346,7 @@ public slots: * and updates the main view if this view is the current one * May be different from url e.g. if using "allowHTML". */ - void setLocationBarURL( const QString & locationBarURL ); + void setLocationBarURL( const TQString & locationBarURL ); /** * get an icon for the URL from the BrowserExtension */ @@ -354,20 +354,20 @@ public slots: void setTabIcon( const KURL &url ); - void setCaption( const QString & caption ); + void setCaption( const TQString & caption ); void setPageSecurity( int ); // connected to the KROP's KIO::Job // but also to KonqRun's job - void slotInfoMessage( KIO::Job *, const QString &msg ); + void slotInfoMessage( KIO::Job *, const TQString &msg ); protected slots: // connected to the KROP's KIO::Job void slotStarted( KIO::Job * job ); void slotCompleted(); void slotCompleted( bool ); - void slotCanceled( const QString & errMsg ); + void slotCanceled( const TQString & errMsg ); void slotPercent( KIO::Job *, unsigned long percent ); void slotSpeed( KIO::Job *, unsigned long bytesPerSecond ); @@ -378,7 +378,7 @@ protected slots: void slotMouseOverInfo( const KFileItem* item ); void slotOpenURLNotify(); void slotEnableAction( const char * name, bool enabled ); - void slotSetActionText( const char* name, const QString& text ); + void slotSetActionText( const char* name, const TQString& text ); void slotMoveTopLevelWidget( int x, int y ); void slotResizeTopLevelWidget( int w, int h ); void slotRequestFocus(KParts::ReadOnlyPart*); @@ -414,35 +414,35 @@ private: void finishedWithCurrentURL(); - virtual bool eventFilter( QObject *obj, QEvent *e ); + virtual bool eventFilter( TQObject *obj, TQEvent *e ); ////////////////// private members /////////////// KParts::ReadOnlyPart *m_pPart; - QString m_sLocationBarURL; - QString m_sTypedURL; + TQString m_sLocationBarURL; + TQString m_sTypedURL; KonqMainWindow::PageSecurity m_pageSecurity; /** * The full history (back + current + forward) * The current position in the history is m_lstHistory.current() */ - QPtrList m_lstHistory; + TQPtrList m_lstHistory; /** * The post data that _resulted_ in this page. * e.g. when submitting a form, and the result is an image, this data will be * set (and saved/restored) when the image is being viewed. Necessary for reload. */ - QByteArray m_postData; - QString m_postContentType; + TQByteArray m_postData; + TQString m_postContentType; bool m_doPost; /** * The referrer that was used to obtain this page. */ - QString m_pageReferrer; + TQString m_pageReferrer; KonqMainWindow *m_pMainWindow; KonqRun *m_pRun; @@ -468,9 +468,9 @@ private: KTrader::OfferList m_partServiceOffers; KTrader::OfferList m_appServiceOffers; KService::Ptr m_service; - QString m_serviceType; - QString m_caption; - QString m_tempFile; + TQString m_serviceType; + TQString m_caption; + TQString m_tempFile; KonqViewIface * m_dcopObject; KonqBrowserInterface *m_browserIface; int m_randID; diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index 0460296c9..c4f03da75 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cc @@ -26,8 +26,8 @@ #include "konq_events.h" #include "konq_settingsxt.h" -#include -#include +#include +#include #include #include @@ -44,7 +44,7 @@ // #define DEBUG_VIEWMGR -template class QPtrList; +template class TQPtrList; KonqViewManager::KonqViewManager( KonqMainWindow *mainWindow ) : KParts::PartManager( mainWindow ) @@ -56,12 +56,12 @@ KonqViewManager::KonqViewManager( KonqMainWindow *mainWindow ) m_bProfileListDirty = true; m_bLoadingProfile = false; - m_activePartChangedTimer = new QTimer(this); - connect(m_activePartChangedTimer, SIGNAL(timeout()), this, SLOT(emitActivePartChanged())); - connect( this, SIGNAL( activePartChanged ( KParts::Part * ) ), this, SLOT( slotActivePartChanged ( KParts::Part * ) ) ); + m_activePartChangedTimer = new TQTimer(this); + connect(m_activePartChangedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(emitActivePartChanged())); + connect( this, TQT_SIGNAL( activePartChanged ( KParts::Part * ) ), this, TQT_SLOT( slotActivePartChanged ( KParts::Part * ) ) ); } -KonqView* KonqViewManager::Initialize( const QString &serviceType, const QString &serviceName ) +KonqView* KonqViewManager::Initialize( const TQString &serviceType, const TQString &serviceName ) { //kdDebug(1202) << "KonqViewManager::Initialize()" << endl; KService::Ptr service; @@ -93,8 +93,8 @@ KonqViewManager::~KonqViewManager() } KonqView* KonqViewManager::splitView ( Qt::Orientation orientation, - const QString &serviceType, - const QString &serviceName, + const TQString &serviceType, + const TQString &serviceName, bool newOneFirst, bool forceAutoEmbed ) { #ifdef DEBUG_VIEWMGR @@ -118,7 +118,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation, KonqFrameContainerBase* parentContainer = splitFrame->parentContainer(); bool moveNewContainer = false; - QValueList splitterSizes; + TQValueList splitterSizes; int index= -1; if (parentContainer->frameType()=="Container") { @@ -135,13 +135,13 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation, parentContainer->widget()->setUpdatesEnabled( false ); //kdDebug(1202) << "Move out child" << endl; - QPoint pos = splitFrame->widget()->pos(); + TQPoint pos = splitFrame->widget()->pos(); parentContainer->removeChildFrame( splitFrame ); splitFrame->widget()->reparent( m_pMainWindow, pos ); //kdDebug(1202) << "Create new Container" << endl; KonqFrameContainer *newContainer = new KonqFrameContainer( orientation, parentContainer->widget(), parentContainer ); - connect(newContainer,SIGNAL(ctrlTabPressed()),m_pMainWindow,SLOT(slotCtrlTabPressed())); + connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed())); parentContainer->insertChildFrame( newContainer, index ); if ( moveNewContainer ) { @@ -170,7 +170,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation, newContainer->swapChildren(); } - QValueList newSplitterSizes; + TQValueList newSplitterSizes; newSplitterSizes << 50 << 50; newContainer->setSizes( newSplitterSizes ); @@ -203,8 +203,8 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation, } KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation, - const QString &serviceType, - const QString &serviceName, + const TQString &serviceType, + const TQString &serviceName, bool newOneFirst ) { kdDebug(1202) << "KonqViewManager::splitWindow(default)" << endl; @@ -214,7 +214,7 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation, return 0L; KURL url = m_pMainWindow->currentView()->url(); - QString locationBarURL = m_pMainWindow->currentView()->locationBarURL(); + TQString locationBarURL = m_pMainWindow->currentView()->locationBarURL(); KService::Ptr service; KTrader::OfferList partServiceOffers, appServiceOffers; @@ -229,11 +229,11 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation, mainFrame->widget()->setUpdatesEnabled( false ); //kdDebug(1202) << "Move out child" << endl; - QPoint pos = mainFrame->widget()->pos(); + TQPoint pos = mainFrame->widget()->pos(); m_pMainWindow->removeChildFrame( mainFrame ); KonqFrameContainer *newContainer = new KonqFrameContainer( orientation, m_pMainWindow, 0L); - connect(newContainer,SIGNAL(ctrlTabPressed()),m_pMainWindow,SLOT(slotCtrlTabPressed())); + connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed())); m_pMainWindow->insertChildFrame( newContainer ); @@ -273,7 +273,7 @@ void KonqViewManager::convertDocContainer() KonqFrameContainerBase* parentContainer = m_pDocContainer->parentContainer(); bool moveNewContainer = false; - QValueList splitterSizes; + TQValueList splitterSizes; if (parentContainer->frameType()=="Container") { moveNewContainer = (static_cast(parentContainer)->idAfter( m_pDocContainer->widget() ) != 0); splitterSizes = static_cast(parentContainer)->sizes(); @@ -282,13 +282,13 @@ void KonqViewManager::convertDocContainer() parentContainer->widget()->setUpdatesEnabled( false ); //kdDebug(1202) << "Move out child" << endl; - QPoint pos = m_pDocContainer->widget()->pos(); + TQPoint pos = m_pDocContainer->widget()->pos(); parentContainer->removeChildFrame( m_pDocContainer ); m_pDocContainer->widget()->reparent( m_pMainWindow, pos ); KonqFrameTabs* newContainer = new KonqFrameTabs( parentContainer->widget() , parentContainer, this); parentContainer->insertChildFrame( newContainer ); - connect( newContainer, SIGNAL(ctrlTabPressed()), m_pMainWindow, SLOT(slotCtrlTabPressed()) ); + connect( newContainer, TQT_SIGNAL(ctrlTabPressed()), m_pMainWindow, TQT_SLOT(slotCtrlTabPressed()) ); m_pDocContainer->widget()->reparent( newContainer, pos ); newContainer->insertChildFrame( m_pDocContainer ); @@ -307,7 +307,7 @@ void KonqViewManager::convertDocContainer() m_pDocContainer = newContainer; } -KonqView* KonqViewManager::addTab(const QString &serviceType, const QString &serviceName, bool passiveMode, bool openAfterCurrentPage ) +KonqView* KonqViewManager::addTab(const TQString &serviceType, const TQString &serviceName, bool passiveMode, bool openAfterCurrentPage ) { #ifdef DEBUG_VIEWMGR kdDebug(1202) << "------------- KonqViewManager::addTab starting -------------" << endl; @@ -423,12 +423,12 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag KConfig config( tempFile.name() ); config.setGroup( "View Profile" ); - QString prefix = QString::fromLatin1( currentFrame->frameType() ) + QString::number(0); + TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0); config.writeEntry( "RootItem", prefix ); prefix.append( '_' ); currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1); - QString rootItem = config.readEntry( "RootItem", "empty" ); + TQString rootItem = config.readEntry( "RootItem", "empty" ); if (rootItem.isNull() || rootItem == "empty") return; @@ -493,10 +493,10 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab ) KConfig config( tempFile.name() ); config.setGroup( "View Profile" ); - QString prefix = QString::fromLatin1( currentFrame->frameType() ) + QString::number(0); + TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0); config.writeEntry( "RootItem", prefix ); prefix.append( '_' ); - config.writeEntry( QString::fromLatin1( "docContainer" ).prepend( prefix ), true ); + config.writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true ); currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1); KonqMainWindow *mainWindow = new KonqMainWindow( KURL(), false ); @@ -567,8 +567,8 @@ void KonqViewManager::removeTab( KonqFrameBase* tab ) tabContainer->removeChildFrame(currentFrame); - QPtrList viewList; - QPtrListIterator it( viewList ); + TQPtrList viewList; + TQPtrListIterator it( viewList ); currentFrame->listViews( &viewList ); @@ -598,8 +598,8 @@ void KonqViewManager::reloadAllTabs( ) KonqFrameTabs* tabContainer = static_cast(m_pDocContainer); - QPtrList frameList = *tabContainer->childFrameList(); - QPtrListIterator it( frameList ); + TQPtrList frameList = *tabContainer->childFrameList(); + TQPtrListIterator it( frameList ); for ( it.toFirst(); it != 0L; ++it ) { @@ -630,8 +630,8 @@ void KonqViewManager::removeOtherTabs( KonqFrameBase* tab ) return; } - QPtrList frameList = *tabContainer->childFrameList(); - QPtrListIterator it( frameList ); + TQPtrList frameList = *tabContainer->childFrameList(); + TQPtrListIterator it( frameList ); for ( it.toFirst(); it != 0L; ++it ) { @@ -728,8 +728,8 @@ void KonqViewManager::updatePixmaps() KonqFrameTabs* tabContainer = static_cast(m_pDocContainer); - QPtrList viewList; - QPtrListIterator it( viewList ); + TQPtrList viewList; + TQPtrListIterator it( viewList ); tabContainer->listViews( &viewList ); for ( it.toFirst(); it != 0L; ++it ) @@ -762,7 +762,7 @@ void KonqViewManager::removeView( KonqView *view ) setActivePart( 0L, true ); int index = -1; - QValueList splitterSizes; + TQValueList splitterSizes; bool moveOtherChild = false; if (grandParentContainer->frameType()=="Tabs") @@ -788,7 +788,7 @@ void KonqViewManager::removeView( KonqView *view ) static_cast(parentContainer)->setAboutToBeDeleted(); //kdDebug(1202) << "--- Reparenting otherFrame to m_pMainWindow " << m_pMainWindow << endl; - QPoint pos = otherFrame->widget()->pos(); + TQPoint pos = otherFrame->widget()->pos(); otherFrame->reparentFrame( m_pMainWindow, pos ); //kdDebug(1202) << "--- Removing otherFrame from parentContainer" << endl; @@ -884,7 +884,7 @@ void KonqViewManager::slotPassiveModePartDeleted() // Passive mode parts aren't registered to the part manager, // so we have to handle suicidal ones ourselves KParts::ReadOnlyPart * part = const_cast( static_cast( sender() ) ); - disconnect( part, SIGNAL( destroyed() ), this, SLOT( slotPassiveModePartDeleted() ) ); + disconnect( part, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotPassiveModePartDeleted() ) ); kdDebug(1202) << "KonqViewManager::slotPassiveModePartDeleted part=" << part << endl; KonqView * view = m_pMainWindow->childView( part ); kdDebug(1202) << "view=" << view << endl; @@ -918,13 +918,13 @@ void KonqViewManager::clear() if (m_pMainWindow->childFrame() == 0L) return; - QPtrList viewList; + TQPtrList viewList; m_pMainWindow->listViews( &viewList ); kdDebug(1202) << viewList.count() << " items" << endl; - QPtrListIterator it( viewList ); + TQPtrListIterator it( viewList ); for ( it.toFirst(); it.current(); ++it ) { m_pMainWindow->removeChildView( it.current() ); kdDebug(1202) << "Deleting " << it.current() << endl; @@ -981,8 +981,8 @@ KonqView *KonqViewManager::chooseNextView( KonqView *view ) return 0L; // no next view found } -KonqViewFactory KonqViewManager::createView( const QString &serviceType, - const QString &serviceName, +KonqViewFactory KonqViewManager::createView( const TQString &serviceType, + const TQString &serviceName, KService::Ptr &service, KTrader::OfferList &partServiceOffers, KTrader::OfferList &appServiceOffers, @@ -994,7 +994,7 @@ KonqViewFactory KonqViewManager::createView( const QString &serviceType, if( serviceType.isEmpty() && m_pMainWindow->currentView() ) { //clone current view KonqView *cv = m_pMainWindow->currentView(); - QString _serviceType, _serviceName; + TQString _serviceType, _serviceName; if ( cv->service()->desktopEntryName() == "konq_sidebartng" ) { _serviceType = "text/html"; } @@ -1020,13 +1020,13 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer, const KService::Ptr &service, const KTrader::OfferList &partServiceOffers, const KTrader::OfferList &appServiceOffers, - const QString &serviceType, + const TQString &serviceType, bool passiveMode, bool openAfterCurrentPage ) { kdDebug(1202) << "KonqViewManager::setupView passiveMode=" << passiveMode << endl; - QString sType = serviceType; + TQString sType = serviceType; if ( sType.isEmpty() ) sType = m_pMainWindow->currentView()->serviceType(); @@ -1040,8 +1040,8 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer, m_pMainWindow, service, partServiceOffers, appServiceOffers, sType, passiveMode ); //kdDebug(1202) << "KonqView created - v=" << v << " v->part()=" << v->part() << endl; - QObject::connect( v, SIGNAL( sigPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ), - m_pMainWindow, SLOT( slotPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ) ); + TQObject::connect( v, TQT_SIGNAL( sigPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ), + m_pMainWindow, TQT_SLOT( slotPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ) ); m_pMainWindow->insertChildView( v ); @@ -1065,7 +1065,7 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer, else { // Passive views aren't registered, but we still want to detect the suicidal ones - connect( v->part(), SIGNAL( destroyed() ), this, SLOT( slotPassiveModePartDeleted() ) ); + connect( v->part(), TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotPassiveModePartDeleted() ) ); } //kdDebug(1202) << "KonqViewManager::setupView done" << endl; @@ -1074,14 +1074,14 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer, ///////////////// Profile stuff //////////////// -void KonqViewManager::saveViewProfile( const QString & fileName, const QString & profileName, bool saveURLs, bool saveWindowSize ) +void KonqViewManager::saveViewProfile( const TQString & fileName, const TQString & profileName, bool saveURLs, bool saveWindowSize ) { - QString path = locateLocal( "data", QString::fromLatin1( "konqueror/profiles/" ) + + TQString path = locateLocal( "data", TQString::fromLatin1( "konqueror/profiles/" ) + fileName, KGlobal::instance() ); - if ( QFile::exists( path ) ) - QFile::remove( path ); + if ( TQFile::exists( path ) ) + TQFile::remove( path ); KSimpleConfig cfg( path ); cfg.setGroup( "Profile" ); @@ -1096,8 +1096,8 @@ void KonqViewManager::saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWi { //kdDebug(1202) << "KonqViewManager::saveViewProfile" << endl; if( m_pMainWindow->childFrame() != 0L ) { - QString prefix = QString::fromLatin1( m_pMainWindow->childFrame()->frameType() ) - + QString::number(0); + TQString prefix = TQString::fromLatin1( m_pMainWindow->childFrame()->frameType() ) + + TQString::number(0); cfg.writeEntry( "RootItem", prefix ); prefix.append( '_' ); m_pMainWindow->saveConfig( &cfg, prefix, saveURLs, m_pDocContainer, 0, 1); @@ -1115,14 +1115,14 @@ void KonqViewManager::saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWi // setAutoSaveSetting( "KongMainWindow", false ). The false is important, // we do not want this call save size settings in the profile, because we // do it ourselves. Save in a separate group than the rest of the profile. - QString savedGroup = cfg.group(); + TQString savedGroup = cfg.group(); m_pMainWindow->saveMainWindowSettings( &cfg, "Main Window Settings" ); cfg.setGroup( savedGroup ); cfg.sync(); } -void KonqViewManager::loadViewProfile( const QString & path, const QString & filename, +void KonqViewManager::loadViewProfile( const TQString & path, const TQString & filename, const KURL & forcedURL, const KonqOpenURLRequest &req, bool resetWindow, bool openURL ) { @@ -1132,7 +1132,7 @@ void KonqViewManager::loadViewProfile( const QString & path, const QString & fil loadViewProfile( cfg, filename, forcedURL, req, resetWindow, openURL ); } -void KonqViewManager::loadViewProfile( KConfig &cfg, const QString & filename, +void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename, const KURL & forcedURL, const KonqOpenURLRequest &req, bool resetWindow, bool openURL ) { @@ -1151,13 +1151,13 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const QString & filename, } KonqView *originalView = m_pMainWindow->currentView(); - QPtrList frameList = *tabContainer->childFrameList(); - QPtrListIterator it( frameList ); + TQPtrList frameList = *tabContainer->childFrameList(); + TQPtrListIterator it( frameList ); for ( it.toFirst(); it != 0L; ++it ) { KonqView *view = it.current()->activeChildView(); if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1)) { - QVariant prop = view->part()->property("modified"); + TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { showTab( view ); if ( KMessageBox::warningContinueCancel( 0, @@ -1176,7 +1176,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const QString & filename, { KonqView *view = m_pMainWindow->currentView(); if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1)) { - QVariant prop = view->part()->property("modified"); + TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( 0, i18n("This page contains changes that have not been submitted.\nLoading a profile will discard these changes."), @@ -1189,7 +1189,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const QString & filename, m_currentProfile = filename; m_currentProfileText = cfg.readPathEntry("Name",filename); - m_profileHomeURL = cfg.readEntry("HomeURL", QString::null); + m_profileHomeURL = cfg.readEntry("HomeURL", TQString::null); m_pMainWindow->currentProfileChanged(); KURL defaultURL; @@ -1198,7 +1198,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const QString & filename, clear(); - QString rootItem = cfg.readEntry( "RootItem", "empty" ); + TQString rootItem = cfg.readEntry( "RootItem", "empty" ); //kdDebug(1202) << "KonqViewManager::loadViewProfile : loading RootItem " << rootItem << //" forcedURL " << forcedURL.url() << endl; @@ -1289,7 +1289,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const QString & filename, if( m_pMainWindow->isFullScreen()) m_pMainWindow->showNormal(); - QSize size = readConfigSize( cfg, m_pMainWindow ); + TQSize size = readConfigSize( cfg, m_pMainWindow ); if ( size.isValid() ) m_pMainWindow->resize( size ); else // no size in the profile; use last known size @@ -1306,7 +1306,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const QString & filename, // so that the window doesn't try to change the size stored in the Profile group. // (If applyMainWindowSettings finds a "Width" or "Height" entry, it // sets them to 0,0) - QString savedGroup = cfg.group(); + TQString savedGroup = cfg.group(); m_pMainWindow->applyMainWindowSettings( &cfg, "Main Window Settings" ); cfg.setGroup( savedGroup ); @@ -1317,7 +1317,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const QString & filename, //kdDebug(1202) << "KonqViewManager::loadViewProfile done" << endl; } -void KonqViewManager::setActivePart( KParts::Part *part, QWidget * ) +void KonqViewManager::setActivePart( KParts::Part *part, TQWidget * ) { setActivePart( part, false ); } @@ -1401,17 +1401,17 @@ void KonqViewManager::emitActivePartChanged() } -QSize KonqViewManager::readConfigSize( KConfig &cfg, QWidget *widget ) +TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget ) { bool ok; - QString widthStr = cfg.readEntry( "Width" ); - QString heightStr = cfg.readEntry( "Height" ); + TQString widthStr = cfg.readEntry( "Width" ); + TQString heightStr = cfg.readEntry( "Height" ); int width = -1; int height = -1; - QRect geom = KGlobalSettings::desktopGeometry(widget); + TQRect geom = KGlobalSettings::desktopGeometry(widget); if ( widthStr.contains( '%' ) == 1 ) { @@ -1443,13 +1443,13 @@ QSize KonqViewManager::readConfigSize( KConfig &cfg, QWidget *widget ) height = -1; } - return QSize( width, height ); + return TQSize( width, height ); } void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, - const QString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage ) + const TQString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage ) { - QString prefix; + TQString prefix; if( name != "InitialView" ) prefix = name + '_'; @@ -1457,16 +1457,16 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, if( name.startsWith("View") || name == "empty" ) { //load view config - QString serviceType; - QString serviceName; + TQString serviceType; + TQString serviceName; if ( name == "empty" ) { // An empty profile is an empty KHTML part. Makes all KHTML actions available, avoids crashes, // makes it easy to DND a URL onto it, and makes it fast to load a website from there. serviceType = "text/html"; serviceName = "html"; } else { - serviceType = cfg.readEntry( QString::fromLatin1( "ServiceType" ).prepend( prefix ), "inode/directory"); - serviceName = cfg.readEntry( QString::fromLatin1( "ServiceName" ).prepend( prefix ) ); + serviceType = cfg.readEntry( TQString::fromLatin1( "ServiceType" ).prepend( prefix ), "inode/directory"); + serviceName = cfg.readEntry( TQString::fromLatin1( "ServiceName" ).prepend( prefix ) ); } //kdDebug(1202) << "KonqViewManager::loadItem: ServiceType " << serviceType << " " << serviceName << endl; @@ -1480,17 +1480,17 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, return; //ugh.. } - bool passiveMode = cfg.readBoolEntry( QString::fromLatin1( "PassiveMode" ).prepend( prefix ), false ); + bool passiveMode = cfg.readBoolEntry( TQString::fromLatin1( "PassiveMode" ).prepend( prefix ), false ); //kdDebug(1202) << "KonqViewManager::loadItem: Creating View Stuff" << endl; KonqView *childView = setupView( parent, viewFactory, service, partServiceOffers, appServiceOffers, serviceType, passiveMode, openAfterCurrentPage ); - if (!childView->isFollowActive()) childView->setLinkedView( cfg.readBoolEntry( QString::fromLatin1( "LinkedView" ).prepend( prefix ), false ) ); - childView->setToggleView( cfg.readBoolEntry( QString::fromLatin1( "ToggleView" ).prepend( prefix ), false ) ); - if( !cfg.readBoolEntry( QString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), true ) ) + if (!childView->isFollowActive()) childView->setLinkedView( cfg.readBoolEntry( TQString::fromLatin1( "LinkedView" ).prepend( prefix ), false ) ); + childView->setToggleView( cfg.readBoolEntry( TQString::fromLatin1( "ToggleView" ).prepend( prefix ), false ) ); + if( !cfg.readBoolEntry( TQString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), true ) ) childView->frame()->statusbar()->hide(); - if (cfg.readBoolEntry( QString::fromLatin1( "docContainer" ).prepend( prefix ), false )) + if (cfg.readBoolEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), false )) m_pDocContainer = childView->frame(); if (!m_pDocContainer) @@ -1532,11 +1532,11 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, } } KonqConfigEvent ev( &cfg, prefix+"_", false/*load*/); - QApplication::sendEvent( childView->part(), &ev ); + TQApplication::sendEvent( childView->part(), &ev ); childView->frame()->show(); - QString key = QString::fromLatin1( "URL" ).prepend( prefix ); + TQString key = TQString::fromLatin1( "URL" ).prepend( prefix ); if ( openURL ) { KURL url; @@ -1544,13 +1544,13 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, //kdDebug(1202) << "KonqViewManager::loadItem: key " << key << endl; if ( cfg.hasKey( key ) ) { - QString u = cfg.readPathEntry( key ); + TQString u = cfg.readPathEntry( key ); if ( u.isEmpty() ) - u = QString::fromLatin1("about:blank"); + u = TQString::fromLatin1("about:blank"); url = u; } else if(key == "empty_URL") - url = QString::fromLatin1("about:blank"); + url = TQString::fromLatin1("about:blank"); else url = defaultURL; @@ -1567,13 +1567,13 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, //else kdDebug(1202) << "KonqViewManager::loadItem: url is empty" << endl; } // Do this after opening the URL, so that it's actually possible to open it :) - childView->setLockedLocation( cfg.readBoolEntry( QString::fromLatin1( "LockedLocation" ).prepend( prefix ), false ) ); + childView->setLockedLocation( cfg.readBoolEntry( TQString::fromLatin1( "LockedLocation" ).prepend( prefix ), false ) ); } else if( name.startsWith("Container") ) { //kdDebug(1202) << "KonqViewManager::loadItem Item is Container" << endl; //load container config - QString ostr = cfg.readEntry( QString::fromLatin1( "Orientation" ).prepend( prefix ) ); + TQString ostr = cfg.readEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ) ); //kdDebug(1202) << "Orientation: " << ostr << endl; Qt::Orientation o; if( ostr == "Vertical" ) @@ -1585,13 +1585,13 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, o = Qt::Horizontal; } - QValueList sizes = - cfg.readIntListEntry( QString::fromLatin1( "SplitterSizes" ).prepend( prefix )); + TQValueList sizes = + cfg.readIntListEntry( TQString::fromLatin1( "SplitterSizes" ).prepend( prefix )); - int index = cfg.readNumEntry( QString::fromLatin1( "activeChildIndex" ).prepend(prefix), -1 ); + int index = cfg.readNumEntry( TQString::fromLatin1( "activeChildIndex" ).prepend(prefix), -1 ); - QStrList childList; - if( cfg.readListEntry( QString::fromLatin1( "Children" ).prepend( prefix ), childList ) < 2 ) + TQStrList childList; + if( cfg.readListEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), childList ) < 2 ) { kdWarning() << "Profile Loading Error: Less than two children in " << name << endl; // fallback to defaults @@ -1600,7 +1600,7 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, else { KonqFrameContainer *newContainer = new KonqFrameContainer( o, parent->widget(), parent ); - connect(newContainer,SIGNAL(ctrlTabPressed()),m_pMainWindow,SLOT(slotCtrlTabPressed())); + connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed())); int tabindex = -1; if(openAfterCurrentPage && parent->frameType() == "Tabs") // Need to honor it, if possible @@ -1608,7 +1608,7 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, parent->insertChildFrame( newContainer, tabindex ); - if (cfg.readBoolEntry( QString::fromLatin1( "docContainer" ).prepend( prefix ), false )) + if (cfg.readBoolEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), false )) m_pDocContainer = newContainer; loadItem( cfg, newContainer, childList.at(0), defaultURL, openURL ); @@ -1629,18 +1629,18 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, //kdDebug(1202) << "KonqViewManager::loadItem: Item is a Tabs" << endl; KonqFrameTabs *newContainer = new KonqFrameTabs( parent->widget(), parent, this ); - connect(newContainer,SIGNAL(ctrlTabPressed()),m_pMainWindow,SLOT(slotCtrlTabPressed())); + connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed())); parent->insertChildFrame( newContainer ); m_pDocContainer = newContainer; - int index = cfg.readNumEntry( QString::fromLatin1( "activeChildIndex" ).prepend(prefix), 0 ); + int index = cfg.readNumEntry( TQString::fromLatin1( "activeChildIndex" ).prepend(prefix), 0 ); - QStringList childList = cfg.readListEntry( QString::fromLatin1( "Children" ).prepend( prefix ) ); - for ( QStringList::Iterator it = childList.begin(); it != childList.end(); ++it ) + TQStringList childList = cfg.readListEntry( TQString::fromLatin1( "Children" ).prepend( prefix ) ); + for ( TQStringList::Iterator it = childList.begin(); it != childList.end(); ++it ) { loadItem( cfg, newContainer, *it, defaultURL, openURL ); - QWidget* currentPage = newContainer->currentPage(); + TQWidget* currentPage = newContainer->currentPage(); if (currentPage != 0L) { KonqView* activeChildView = dynamic_cast(currentPage)->activeChildView(); if (activeChildView != 0L) { @@ -1667,16 +1667,16 @@ void KonqViewManager::setProfiles( KActionMenu *profiles ) if ( m_pamProfiles ) { - connect( m_pamProfiles->popupMenu(), SIGNAL( activated( int ) ), - this, SLOT( slotProfileActivated( int ) ) ); - connect( m_pamProfiles->popupMenu(), SIGNAL( aboutToShow() ), - this, SLOT( slotProfileListAboutToShow() ) ); + connect( m_pamProfiles->popupMenu(), TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( slotProfileActivated( int ) ) ); + connect( m_pamProfiles->popupMenu(), TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotProfileListAboutToShow() ) ); } //KonqMainWindow::enableAllActions will call it anyway //profileListDirty(); } -void KonqViewManager::showProfileDlg( const QString & preselectProfile ) +void KonqViewManager::showProfileDlg( const TQString & preselectProfile ) { KonqProfileDlg dlg( this, preselectProfile, m_pMainWindow ); dlg.exec(); @@ -1685,7 +1685,7 @@ void KonqViewManager::showProfileDlg( const QString & preselectProfile ) void KonqViewManager::slotProfileDlg() { - showProfileDlg( QString::null ); + showProfileDlg( TQString::null ); } void KonqViewManager::profileListDirty( bool broadcast ) @@ -1696,21 +1696,21 @@ void KonqViewManager::profileListDirty( bool broadcast ) m_bProfileListDirty = true; #if 0 // There's always one profile at least, now... - QStringList profiles = KonqFactory::instance()->dirs()->findAllResources( "data", "konqueror/profiles/*", false, true ); + TQStringList profiles = KonqFactory::instance()->dirs()->findAllResources( "data", "konqueror/profiles/*", false, true ); if ( m_pamProfiles ) m_pamProfiles->setEnabled( profiles.count() > 0 ); #endif return; } - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "updateProfileList()", QByteArray() ); + kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "updateProfileList()", TQByteArray() ); } void KonqViewManager::slotProfileActivated( int id ) { - QMap::ConstIterator iter = m_mapProfileNames.begin(); - QMap::ConstIterator end = m_mapProfileNames.end(); + TQMap::ConstIterator iter = m_mapProfileNames.begin(); + TQMap::ConstIterator end = m_mapProfileNames.end(); for(int i=0; iter != end; ++iter, ++i) { if( i == id ) { @@ -1727,18 +1727,18 @@ void KonqViewManager::slotProfileListAboutToShow() if ( !m_pamProfiles || !m_bProfileListDirty ) return; - QPopupMenu *popup = m_pamProfiles->popupMenu(); + TQPopupMenu *popup = m_pamProfiles->popupMenu(); popup->clear(); // Fetch profiles m_mapProfileNames = KonqProfileDlg::readAllProfiles(); // Generate accelerators - QStringList accel_strings; + TQStringList accel_strings; KAccelGen::generateFromKeys(m_mapProfileNames, accel_strings); // Store menu items - QValueListIterator iter = accel_strings.begin(); + TQValueListIterator iter = accel_strings.begin(); for( int id = 0; iter != accel_strings.end(); ++iter, ++id ) { @@ -1752,10 +1752,10 @@ void KonqViewManager::setLoading( KonqView *view, bool loading ) { KonqFrameContainerBase* parentContainer = view->frame()->parentContainer(); if ( parentContainer->frameType() == "Tabs" ) { - QColor color; + TQColor color; KonqFrameTabs* konqframetabs = static_cast( parentContainer ); if ( loading ) - color = QColor( (KGlobalSettings::linkColor().red() + KGlobalSettings::inactiveTextColor().red())/2, + color = TQColor( (KGlobalSettings::linkColor().red() + KGlobalSettings::inactiveTextColor().red())/2, (KGlobalSettings::linkColor().green()+ KGlobalSettings::inactiveTextColor().green())/2, (KGlobalSettings::linkColor().blue() + KGlobalSettings::inactiveTextColor().blue())/2 ); else @@ -1776,8 +1776,8 @@ void KonqViewManager::showHTML(bool b) KonqFrameTabs* tabContainer = static_cast(m_pDocContainer); - QPtrList frameList = *tabContainer->childFrameList(); - QPtrListIterator it( frameList ); + TQPtrList frameList = *tabContainer->childFrameList(); + TQPtrListIterator it( frameList ); for ( it.toFirst(); it != 0L; ++it ) { @@ -1802,16 +1802,16 @@ void KonqViewManager::printSizeInfo( KonqFrameBase* frame, KonqFrameContainerBase* parent, const char* msg ) { - QRect r; + TQRect r; r = frame->widget()->geometry(); qDebug("Child size %s : x: %d, y: %d, w: %d, h: %d", msg, r.x(),r.y(),r.width(),r.height() ); if ( parent->frameType() == "Container" ) { - QValueList sizes; + TQValueList sizes; sizes = static_cast(parent)->sizes(); printf( "Parent sizes %s :", msg ); - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for( it = sizes.begin(); it != sizes.end(); ++it ) printf( " %d", (*it) ); printf("\n"); @@ -1823,8 +1823,8 @@ void KonqViewManager::printFullHierarchy( KonqFrameContainerBase * container ) kdDebug(1202) << "currentView=" << m_pMainWindow->currentView() << endl; kdDebug(1202) << "docContainer=" << m_pDocContainer << endl; - if (container) container->printFrameInfo(QString::null); - else m_pMainWindow->printFrameInfo(QString::null); + if (container) container->printFrameInfo(TQString::null); + else m_pMainWindow->printFrameInfo(TQString::null); } #endif diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h index dff2a033c..341710857 100644 --- a/konqueror/konq_viewmgr.h +++ b/konqueror/konq_viewmgr.h @@ -22,10 +22,10 @@ #include "konq_factory.h" -#include -#include -#include -#include +#include +#include +#include +#include #include @@ -57,7 +57,7 @@ public: KonqViewManager( KonqMainWindow *mainWindow ); ~KonqViewManager(); - KonqView* Initialize( const QString &serviceType, const QString &serviceName ); + KonqView* Initialize( const TQString &serviceType, const TQString &serviceName ); /** * Splits the view, depending on orientation, either horizontally or @@ -70,8 +70,8 @@ public: * @param newOneFirst if true, move the new view as the first one (left or top) */ KonqView* splitView( Qt::Orientation orientation, - const QString & serviceType = QString::null, - const QString & serviceName = QString::null, + const TQString & serviceType = TQString::null, + const TQString & serviceName = TQString::null, bool newOneFirst = false, bool forceAutoEmbed = false ); /** @@ -82,8 +82,8 @@ public: * @param newOneFirst if true, move the new view as the first one (left or top) */ KonqView* splitWindow( Qt::Orientation orientation, - const QString & serviceType = QString::null, - const QString & serviceName = QString::null, + const TQString & serviceType = TQString::null, + const TQString & serviceName = TQString::null, bool newOneFirst = false); /** @@ -95,8 +95,8 @@ public: /** * Adds a tab to m_pMainContainer */ - KonqView* addTab(const QString &serviceType = QString::null, - const QString &serviceName = QString::null, + KonqView* addTab(const TQString &serviceType = TQString::null, + const TQString &serviceName = TQString::null, bool passiveMode = false, bool openAfterCurrentPage = false ); @@ -188,20 +188,20 @@ public: * @param saveURLs whether to save the URLs in the profile * @param saveWindowSize whether to save the size of the window in the profile */ - void saveViewProfile( const QString & fileName, const QString & profileName, + void saveViewProfile( const TQString & fileName, const TQString & profileName, bool saveURLs, bool saveWindowSize ); /** * Loads a view layout from a config file. Removes all views before loading. * @param cfg the config file * @param filename if set, remember the file name of the profile (for save settings) - * It has to be under the profiles dir. Otherwise, set to QString::null + * It has to be under the profiles dir. Otherwise, set to TQString::null * @param forcedURL if set, the URL to open, whatever the profile says * @param req attributes related to @p forcedURL * @param resetWindow if the profile doesn't have attributes like size or toolbar * settings, they will be reset to the defaults */ - void loadViewProfile( KConfig &cfg, const QString & filename, + void loadViewProfile( KConfig &cfg, const TQString & filename, const KURL & forcedURL = KURL(), const KonqOpenURLRequest &req = KonqOpenURLRequest(), bool resetWindow = false, bool openURL = true ); @@ -210,13 +210,13 @@ public: * Loads a view layout from a config file. Removes all views before loading. * @param path the full path to the config file * @param filename if set, remember the file name of the profile (for save settings) - * It has to be under the profiles dir. Otherwise, set to QString::null + * It has to be under the profiles dir. Otherwise, set to TQString::null * @param forcedURL if set, the URL to open, whatever the profile says * @param req attributes related to @p forcedURL * @param resetWindow if the profile doesn't have attributes like size or toolbar * settings, they will be reset to the defaults */ - void loadViewProfile( const QString & path, const QString & filename, + void loadViewProfile( const TQString & path, const TQString & filename, const KURL & forcedURL = KURL(), const KonqOpenURLRequest &req = KonqOpenURLRequest(), bool resetWindow = false, bool openURL = true ); @@ -224,12 +224,12 @@ public: * Return the filename of the last profile that was loaded * by the view manager. For "save settings". */ - QString currentProfile() const { return m_currentProfile; } + TQString currentProfile() const { return m_currentProfile; } /** * Return the name (i18n'ed) of the last profile that was loaded * by the view manager. For "save settings". */ - QString currentProfileText() const { return m_currentProfileText; } + TQString currentProfileText() const { return m_currentProfileText; } /** * Whether we are currently loading a profile @@ -265,16 +265,16 @@ public: /** * Reimplemented from PartManager */ - virtual void setActivePart( KParts::Part *part, QWidget *widget = 0L ); + virtual void setActivePart( KParts::Part *part, TQWidget *widget = 0L ); void setActivePart( KParts::Part *part, bool immediate ); - void showProfileDlg( const QString & preselectProfile ); + void showProfileDlg( const TQString & preselectProfile ); /** * The widget is the one which you are referring to. */ - static QSize readConfigSize( KConfig &cfg, QWidget *widget = NULL); + static TQSize readConfigSize( KConfig &cfg, TQWidget *widget = NULL); #ifndef NDEBUG void printFullHierarchy( KonqFrameContainerBase * container ); @@ -284,7 +284,7 @@ public: void showHTML(bool b); - QString profileHomeURL() const { return m_profileHomeURL; } + TQString profileHomeURL() const { return m_profileHomeURL; } protected slots: void emitActivePartChanged(); @@ -310,7 +310,7 @@ protected: * (this is set to false when we have a forcedURL to open) */ void loadItem( KConfig &cfg, KonqFrameContainerBase *parent, - const QString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage = false ); + const TQString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage = false ); // Disabled - we do it ourselves virtual void setActiveInstance( KInstance * ) {} @@ -322,8 +322,8 @@ private: * it clones the current view. * Returns the newly created view. */ - KonqViewFactory createView( const QString &serviceType, - const QString &serviceName, + KonqViewFactory createView( const TQString &serviceType, + const TQString &serviceName, KService::Ptr &service, KTrader::OfferList &partServiceOffers, KTrader::OfferList &appServiceOffers, @@ -338,7 +338,7 @@ private: const KService::Ptr &service, const KTrader::OfferList &partServiceOffers, const KTrader::OfferList &appServiceOffers, - const QString &serviceType, + const TQString &serviceType, bool passiveMode, bool openAfterCurrentPage = false); #ifndef NDEBUG @@ -352,16 +352,16 @@ private: KonqFrameBase *m_pDocContainer; - QGuardedPtr m_pamProfiles; + TQGuardedPtr m_pamProfiles; bool m_bProfileListDirty; bool m_bLoadingProfile; - QString m_currentProfile; - QString m_currentProfileText; - QString m_profileHomeURL; + TQString m_currentProfile; + TQString m_currentProfileText; + TQString m_profileHomeURL; - QMap m_mapProfileNames; + TQMap m_mapProfileNames; - QTimer *m_activePartChangedTimer; + TQTimer *m_activePartChangedTimer; }; #endif diff --git a/konqueror/kttsplugin/khtmlkttsd.cpp b/konqueror/kttsplugin/khtmlkttsd.cpp index cda947223..e832bd27a 100644 --- a/konqueror/kttsplugin/khtmlkttsd.cpp +++ b/konqueror/kttsplugin/khtmlkttsd.cpp @@ -22,18 +22,18 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include -#include +#include #include #include #include -KHTMLPluginKTTSD::KHTMLPluginKTTSD( QObject* parent, const char* name, const QStringList& ) +KHTMLPluginKTTSD::KHTMLPluginKTTSD( TQObject* parent, const char* name, const TQStringList& ) : Plugin( parent, name ) { // If KTTSD is not installed, hide action. @@ -42,7 +42,7 @@ KHTMLPluginKTTSD::KHTMLPluginKTTSD( QObject* parent, const char* name, const QSt { (void) new KAction( i18n("&Speak Text"), "kttsd", 0, - this, SLOT(slotReadOut()), + this, TQT_SLOT(slotReadOut()), actionCollection(), "tools_kttsd" ); } else @@ -57,7 +57,7 @@ void KHTMLPluginKTTSD::slotReadOut() { // The parent is assumed to be a KHTMLPart if ( !parent()->inherits("KHTMLPart") ) - QMessageBox::warning( 0, i18n( "Cannot Read source" ), + TQMessageBox::warning( 0, i18n( "Cannot Read source" ), i18n( "You cannot read anything except web pages with\n" "this plugin, sorry." )); else @@ -66,34 +66,34 @@ void KHTMLPluginKTTSD::slotReadOut() DCOPClient *client = kapp->dcopClient(); if (!client->isApplicationRegistered("kttsd")) { - QString error; - if (kapp->startServiceByDesktopName("kttsd", QStringList(), &error)) - QMessageBox::warning(0, i18n( "Starting KTTSD Failed"), error ); + TQString error; + if (kapp->startServiceByDesktopName("kttsd", TQStringList(), &error)) + TQMessageBox::warning(0, i18n( "Starting KTTSD Failed"), error ); } // Find out if KTTSD supports xhtml (rich speak). - QByteArray data; - QBuffer dataBuf(data); - QDataStream arg; + TQByteArray data; + TQBuffer dataBuf(data); + TQDataStream arg; dataBuf.open(IO_WriteOnly); arg.setDevice(&dataBuf); arg << "" << KSpeech::mtHtml; - QCString replyType; - QByteArray replyData; + TQCString replyType; + TQByteArray replyData; bool supportsXhtml = false; - if ( !client->call("kttsd", "KSpeech", "supportsMarkup(QString,uint)", + if ( !client->call("kttsd", "KSpeech", "supportsMarkup(TQString,uint)", data, replyType, replyData, true) ) - QMessageBox::warning( 0, i18n( "DCOP Call Failed" ), + TQMessageBox::warning( 0, i18n( "DCOP Call Failed" ), i18n( "The DCOP call supportsMarkup failed." )); else { - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); reply >> supportsXhtml; } KHTMLPart *part = (KHTMLPart *) parent(); - QString query; + TQString query; if (supportsXhtml) { kdDebug() << "KTTS claims to support rich speak (XHTML to SSML)." << endl; @@ -120,15 +120,15 @@ void KHTMLPluginKTTSD::slotReadOut() dataBuf.at(0); // reset data arg << query << ""; - if ( !client->call("kttsd", "KSpeech", "setText(QString,QString)", + if ( !client->call("kttsd", "KSpeech", "setText(TQString,TQString)", data, replyType, replyData, true) ) - QMessageBox::warning( 0, i18n( "DCOP Call Failed" ), + TQMessageBox::warning( 0, i18n( "DCOP Call Failed" ), i18n( "The DCOP call setText failed." )); dataBuf.at(0); arg << 0; if ( !client->call("kttsd", "KSpeech", "startText(uint)", data, replyType, replyData, true) ) - QMessageBox::warning( 0, i18n( "DCOP Call Failed" ), + TQMessageBox::warning( 0, i18n( "DCOP Call Failed" ), i18n( "The DCOP call startText failed." )); } } diff --git a/konqueror/kttsplugin/khtmlkttsd.h b/konqueror/kttsplugin/khtmlkttsd.h index aa1608498..b4e5702ca 100644 --- a/konqueror/kttsplugin/khtmlkttsd.h +++ b/konqueror/kttsplugin/khtmlkttsd.h @@ -33,7 +33,7 @@ public: /** * Construct a new KParts plugin. */ - KHTMLPluginKTTSD( QObject* parent, const char* name, const QStringList& ); + KHTMLPluginKTTSD( TQObject* parent, const char* name, const TQStringList& ); /** * Destructor. diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc index 02aac1d07..7b06a4996 100644 --- a/konqueror/listview/konq_infolistviewitem.cc +++ b/konqueror/listview/konq_infolistviewitem.cc @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include #include #include "konq_infolistviewitem.h" #include "konq_infolistviewwidget.h" @@ -98,7 +98,7 @@ void KonqInfoListViewItem::updateContents() case KIO::UDS_ACCESS_TIME: case KIO::UDS_CREATION_TIME: { - QDateTime dt; + TQDateTime dt; time_t _time = m_fileitem->time( tmpColumn->udsId ); if ( _time != 0 ) { @@ -121,7 +121,7 @@ void KonqInfoListViewItem::gotMetaInfo() if (!info.isValid()) return; - QStringList::ConstIterator it = m_ILVWidget->columnKeys().begin(); + TQStringList::ConstIterator it = m_ILVWidget->columnKeys().begin(); for (int i = 1; it != m_ILVWidget->columnKeys().end(); ++it, ++i) { KFileMetaInfoItem kfmii = info.item(*it); @@ -132,12 +132,12 @@ void KonqInfoListViewItem::gotMetaInfo() if (!kfmii.isValid()) continue; - QString s = kfmii.string().simplifyWhiteSpace(); - setText(i, s.isNull() ? QString("") : s); + TQString s = kfmii.string().simplifyWhiteSpace(); + setText(i, s.isNull() ? TQString("") : s); } } -int KonqInfoListViewItem::compare( QListViewItem *item, int col, bool ascending ) const +int KonqInfoListViewItem::compare( TQListViewItem *item, int col, bool ascending ) const { if ( col == 0 ) return KonqBaseListViewItem::compare( item, 0, ascending ); @@ -150,16 +150,16 @@ int KonqInfoListViewItem::compare( QListViewItem *item, int col, bool ascending if ( size1 < col || size2 < col ) return ascending ? ( size2 - size1 ) : ( size1 - size2 ); - QVariant value1 = m_columnValues[ col-1 ]; - QVariant value2 = i->m_columnValues[ col-1 ]; - QVariant::Type type1 = m_columnTypes[ col-1 ]; - QVariant::Type type2 = i->m_columnTypes[ col-1 ]; + TQVariant value1 = m_columnValues[ col-1 ]; + TQVariant value2 = i->m_columnValues[ col-1 ]; + TQVariant::Type type1 = m_columnTypes[ col-1 ]; + TQVariant::Type type2 = i->m_columnTypes[ col-1 ]; if ( type1 != type2 ) return ascending ? ( type1 - type2 ) : ( type2 - type1 ); #define KONQ_CASE( x ) \ - case QVariant::x:\ + case TQVariant::x:\ return ( value1.to##x() > value2.to##x() ) ? 1 : ( value1.to##x() == value2.to##x() ) ? 0 : -1; switch( type1 ) { @@ -172,7 +172,7 @@ int KonqInfoListViewItem::compare( QListViewItem *item, int col, bool ascending KONQ_CASE( Date ) KONQ_CASE( Time ) KONQ_CASE( DateTime ) - case QVariant::Size: + case TQVariant::Size: { int w1 = value1.toSize().width(); int w2 = value2.toSize().width(); @@ -187,8 +187,8 @@ int KonqInfoListViewItem::compare( QListViewItem *item, int col, bool ascending } #undef KONQ_CASE - QString text1 = text(col); - QString text2 = i->text(col); + TQString text1 = text(col); + TQString text2 = i->text(col); if ( text1.isEmpty() ) return ascending ? 1 : -1; @@ -206,19 +206,19 @@ void KonqInfoListViewItem::setDisabled( bool disabled ) setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) ); } -void KonqInfoListViewItem::paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment ) +void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { - QColorGroup cg( _cg ); + TQColorGroup cg( _cg ); if ( _column == 0 ) { _painter->setFont( m_pListViewWidget->itemFont() ); } - cg.setColor( QColorGroup::Text, m_pListViewWidget->itemColor() ); + cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); KListView *lv = static_cast< KListView* >( listView() ); - const QPixmap *pm = lv->viewport()->paletteBackgroundPixmap(); + const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap(); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { int newWidth = width( lv->fontMetrics(), lv, _column ); @@ -226,11 +226,11 @@ void KonqInfoListViewItem::paintCell( QPainter *_painter, const QColorGroup & _c newWidth = _width; if ( pm && !pm->isNull() ) { - cg.setBrush( QColorGroup::Base, QBrush( backgroundColor(_column), *pm ) ); - QPoint o = _painter->brushOrigin(); + cg.setBrush( TQColorGroup::Base, TQBrush( backgroundColor(_column), *pm ) ); + TQPoint o = _painter->brushOrigin(); _painter->setBrushOrigin( o.x() - lv->contentsX(), o.y() - lv->contentsY() ); - const QColorGroup::ColorRole crole = - QPalette::backgroundRoleFromMode( lv->viewport()->backgroundMode() ); + const TQColorGroup::ColorRole crole = + TQPalette::backgroundRoleFromMode( lv->viewport()->backgroundMode() ); _painter->fillRect( newWidth, 0, _width - newWidth, height(), cg.brush( crole ) ); _painter->setBrushOrigin( o ); } @@ -245,14 +245,14 @@ void KonqInfoListViewItem::paintCell( QPainter *_painter, const QColorGroup & _c KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } -void KonqInfoListViewItem::paintFocus( QPainter * _painter, const QColorGroup & cg, const QRect & _r ) +void KonqInfoListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) { - QRect r( _r ); - QListView *lv = static_cast< QListView * >( listView() ); + TQRect r( _r ); + TQListView *lv = static_cast< TQListView * >( listView() ); r.setWidth( width( lv->fontMetrics(), lv, 0 ) ); if ( r.right() > lv->header()->sectionRect( 0 ).right() ) r.setRight( lv->header()->sectionRect( 0 ).right() ); - QListViewItem::paintFocus( _painter, cg, r ); + TQListViewItem::paintFocus( _painter, cg, r ); } #if 0 diff --git a/konqueror/listview/konq_infolistviewitem.h b/konqueror/listview/konq_infolistviewitem.h index 886ba66af..8dec97ee5 100644 --- a/konqueror/listview/konq_infolistviewitem.h +++ b/konqueror/listview/konq_infolistviewitem.h @@ -21,7 +21,7 @@ #define __konq_infolistviewitems_h__ #include "konq_listview.h" -#include +#include #include // for mode_t @@ -55,15 +55,15 @@ class KonqInfoListViewItem : public KonqBaseListViewItem virtual ~KonqInfoListViewItem() { } - virtual void paintCell( QPainter *_painter, const QColorGroup & cg, + virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg, int column, int width, int alignment ); - virtual void paintFocus( QPainter * _painter, const QColorGroup & cg, const QRect & r ); + virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r ); virtual void updateContents(); virtual void setDisabled( bool disabled ); virtual void gotMetaInfo(); - virtual int compare(QListViewItem *item, int col, bool ascending) const; + virtual int compare(TQListViewItem *item, int col, bool ascending) const; protected: /** @@ -72,8 +72,8 @@ class KonqInfoListViewItem : public KonqBaseListViewItem KonqInfoListViewWidget* m_ILVWidget; private: - QValueVector m_columnTypes; - QValueVector m_columnValues; + TQValueVector m_columnTypes; + TQValueVector m_columnValues; }; #endif diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc index c9ef4b0e4..783c6eef3 100644 --- a/konqueror/listview/konq_infolistviewwidget.cc +++ b/konqueror/listview/konq_infolistviewwidget.cc @@ -29,16 +29,16 @@ #include #include -#include +#include KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent, - QWidget* parentWidget) + TQWidget* parentWidget) : KonqBaseListViewWidget(parent, parentWidget) { m_metaInfoJob = 0; m_mtSelector = new KSelectAction(i18n("View &As"), 0, this, - SLOT(slotSelectMimeType()), + TQT_SLOT(slotSelectMimeType()), parent->actionCollection(), "view_as" ); kdDebug(1203) << "created info list view\n"; @@ -52,10 +52,10 @@ KonqInfoListViewWidget::~KonqInfoListViewWidget() void KonqInfoListViewWidget::slotSelectMimeType() { - QString comment = m_mtSelector->currentText(); + TQString comment = m_mtSelector->currentText(); // find the mime type by comment - QMapIterator it; + TQMapIterator it; for (it = m_counts.begin(); it!=m_counts.end(); ++it) { if ((*it).mimetype->comment() == comment) @@ -94,26 +94,26 @@ void KonqInfoListViewWidget::createFavoriteColumns() (mimeTypeInfo = KFileMetaInfoProvider::self() ->mimeTypeInfo(m_favorite.mimetype->name()))) { - QStringList preferredCols = mimeTypeInfo->preferredKeys(); + TQStringList preferredCols = mimeTypeInfo->preferredKeys(); m_columnKeys.clear(); //We create the columnKeys as we're creating //the actual columns, to make sure they're synced // get the translations - QStringList groups = mimeTypeInfo->preferredGroups(); + TQStringList groups = mimeTypeInfo->preferredGroups(); if (groups.isEmpty()) groups = mimeTypeInfo->supportedGroups(); - QStringList::Iterator prefKey = preferredCols.begin(); + TQStringList::Iterator prefKey = preferredCols.begin(); for (; prefKey != preferredCols.end(); ++prefKey) { - QStringList::Iterator group = groups.begin(); + TQStringList::Iterator group = groups.begin(); for (; group != groups.end(); ++group) { const KFileMimeTypeInfo::GroupInfo* groupInfo = mimeTypeInfo->groupInfo(*group); if(groupInfo) { - QStringList keys = groupInfo->supportedKeys(); - QStringList::Iterator key = keys.begin(); + TQStringList keys = groupInfo->supportedKeys(); + TQStringList::Iterator key = keys.begin(); for (; key != keys.end(); ++key) { if ( *key == *prefKey ) @@ -147,7 +147,7 @@ void KonqInfoListViewWidget::rebuildView() // make a KFileItemList from all our Items KFileItemList list; - QListViewItemIterator it(this); + TQListViewItemIterator it(this); for (; it.current(); ++it) { list.append(static_cast(it.current())->item()); @@ -157,7 +157,7 @@ void KonqInfoListViewWidget::rebuildView() clear(); // and rebuild them - for (QPtrListIterator kit(list); kit.current(); ++kit) + for (TQPtrListIterator kit(list); kit.current(); ++kit) { KonqInfoListViewItem* tmp = new KonqInfoListViewItem( this, *kit ); // if (m_goToFirstItem==false) @@ -190,7 +190,7 @@ void KonqInfoListViewWidget::rebuildView() void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list) { slotStarted(); // ############# WHY? - for (QPtrListIterator kit ( list ); kit.current(); ++kit ) + for (TQPtrListIterator kit ( list ); kit.current(); ++kit ) { KonqInfoListViewItem * tmp = new KonqInfoListViewItem( this, *kit ); @@ -201,7 +201,7 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list) } if ( !m_itemsToSelect.isEmpty() ) { - QStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); setSelected( tmp, true ); @@ -230,16 +230,16 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list) // start getting metainfo from the files if (m_metaInfoJob) { - for (QPtrListIterator kit ( list ); kit.current(); ++kit ) + for (TQPtrListIterator kit ( list ); kit.current(); ++kit ) m_metaInfoTodo.append(kit.current()); } else { m_metaInfoJob = KIO::fileMetaInfo(list); - connect( m_metaInfoJob, SIGNAL( gotMetaInfo( const KFileItem*)), - this, SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, SIGNAL( result( KIO::Job*)), - this, SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQT_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)), + this, TQT_SLOT( slotMetaInfoResult())); } } @@ -250,16 +250,16 @@ void KonqInfoListViewWidget::slotRefreshItems( const KFileItemList& list) // start getting metainfo from the files if (m_metaInfoJob) { - for (QPtrListIterator kit ( list ); kit.current(); ++kit ) + for (TQPtrListIterator kit ( list ); kit.current(); ++kit ) m_metaInfoTodo.append(kit.current()); } else { m_metaInfoJob = KIO::fileMetaInfo(list); - connect( m_metaInfoJob, SIGNAL( gotMetaInfo( const KFileItem*)), - this, SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, SIGNAL( result( KIO::Job*)), - this, SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQT_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)), + this, TQT_SLOT( slotMetaInfoResult())); } KonqBaseListViewWidget::slotRefreshItems(list); } @@ -286,7 +286,7 @@ void KonqInfoListViewWidget::slotClear() void KonqInfoListViewWidget::slotMetaInfo(const KFileItem* item) { // need to search for the item (any better way?) - QListViewItemIterator it(this); + TQListViewItemIterator it(this); for (; it.current(); ++it) { if (static_cast(it.current())->item()==item) @@ -312,10 +312,10 @@ void KonqInfoListViewWidget::slotMetaInfoResult() else { m_metaInfoJob = KIO::fileMetaInfo(m_metaInfoTodo); - connect( m_metaInfoJob, SIGNAL( gotMetaInfo( const KFileItem*)), - this, SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, SIGNAL( result( KIO::Job*)), - this, SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQT_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)), + this, TQT_SLOT( slotMetaInfoResult())); m_metaInfoTodo.clear(); } } @@ -327,7 +327,7 @@ void KonqInfoListViewWidget::determineCounts(const KFileItemList& list) // get the counts for (KFileItemListIterator it(list); it.current(); ++it) { - QString mt = it.current()->mimetype(); + TQString mt = it.current()->mimetype(); m_counts[mt].count++; if (!m_counts[mt].mimetype) m_counts[mt].mimetype = it.current()->determineMimeType(); @@ -338,9 +338,9 @@ void KonqInfoListViewWidget::determineCounts(const KFileItemList& list) KFileMetaInfoProvider* prov = KFileMetaInfoProvider::self(); - QStringList mtlist; + TQStringList mtlist; - QMapIterator it; + TQMapIterator it; for (it = m_counts.begin(); it!=m_counts.end(); ++it) { // look if there is a plugin for this mimetype @@ -365,12 +365,12 @@ void KonqInfoListViewWidget::determineCounts(const KFileItemList& list) } m_mtSelector->setItems(mtlist); -// QPopupMenu* menu = m_mtSelector->popupMenu(); +// TQPopupMenu* menu = m_mtSelector->popupMenu(); // insert the icons // for (int i=0; icount(); ++i) // { -// menu->changeItem(i, QIconSet(blah)); +// menu->changeItem(i, TQIconSet(blah)); // } if (m_favorite.mimetype) diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h index 9d866dc1f..5ae497ac2 100644 --- a/konqueror/listview/konq_infolistviewwidget.h +++ b/konqueror/listview/konq_infolistviewwidget.h @@ -22,8 +22,8 @@ #include "konq_listviewwidget.h" #include -#include -#include +#include +#include namespace KIO {class MetaInfoJob;} class KonqListView; @@ -37,10 +37,10 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget // friend class KonqTextViewItem; Q_OBJECT public: - KonqInfoListViewWidget( KonqListView *parent, QWidget *parentWidget ); + KonqInfoListViewWidget( KonqListView *parent, TQWidget *parentWidget ); ~KonqInfoListViewWidget(); - const QStringList columnKeys() {return m_columnKeys;} + const TQStringList columnKeys() {return m_columnKeys;} virtual bool openURL( const KURL &url ); @@ -76,8 +76,8 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget }; // all the mimetypes - QMap m_counts; - QStringList m_columnKeys; + TQMap m_counts; + TQStringList m_columnKeys; KonqILVMimeType m_favorite; diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index 1e67fce36..f256e8e3b 100644 --- a/konqueror/listview/konq_listview.cc +++ b/konqueror/listview/konq_listview.cc @@ -36,10 +36,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -63,7 +63,7 @@ KonqListViewFactory::~KonqListViewFactory() s_defaultViewProps = 0; } -KParts::Part* KonqListViewFactory::createPartObject( QWidget *parentWidget, const char *, QObject *parent, const char *name, const char*, const QStringList &args ) +KParts::Part* KonqListViewFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args ) { if( args.count() < 1 ) kdWarning() << "KonqListView: Missing Parameter" << endl; @@ -144,7 +144,7 @@ void ListViewBrowserExtension::updateActions() void ListViewBrowserExtension::copySelection( bool move ) { KonqDrag *urlData = new KonqDrag( m_listView->listViewWidget()->selectedUrls(false), m_listView->listViewWidget()->selectedUrls(true), move ); - QApplication::clipboard()->setData( urlData ); + TQApplication::clipboard()->setData( urlData ); } void ListViewBrowserExtension::paste() @@ -159,15 +159,15 @@ void ListViewBrowserExtension::pasteTo( const KURL& url ) void ListViewBrowserExtension::rename() { - QListViewItem* item = m_listView->listViewWidget()->currentItem(); + TQListViewItem* item = m_listView->listViewWidget()->currentItem(); Q_ASSERT ( item ); m_listView->listViewWidget()->rename( item, 0 ); // Enhanced rename: Don't highlight the file extension. KLineEdit* le = m_listView->listViewWidget()->renameLineEdit(); if ( le ) { - const QString txt = le->text(); - QString pattern; + const TQString txt = le->text(); + TQString pattern; KMimeType::diagnoseFileName( txt, pattern ); if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.find('*',1)==-1) le->setSelection(0, txt.length()-pattern.stripWhiteSpace().length()+1); @@ -199,7 +199,7 @@ void ListViewBrowserExtension::setSaveViewPropertiesLocally(bool value) m_listView->props()->setSaveViewPropertiesLocally( value ); } -void ListViewBrowserExtension::setNameFilter( const QString &nameFilter ) +void ListViewBrowserExtension::setNameFilter( const TQString &nameFilter ) { m_listView->setNameFilter( nameFilter ); } @@ -216,7 +216,7 @@ void ListViewBrowserExtension::editMimeType() KonqOperations::editMimeType( items.first()->mimetype() ); } -KonqListView::KonqListView( QWidget *parentWidget, QObject *parent, const char *name, const QString& mode ) +KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode ) : KonqDirPart( parent, name ) ,m_headerTimer(0) { @@ -228,7 +228,7 @@ KonqListView::KonqListView( QWidget *parentWidget, QObject *parent, const char * setBrowserExtension( new ListViewBrowserExtension( this ) ); - QString xmlFile; + TQString xmlFile; if (mode=="TextView") { @@ -278,20 +278,20 @@ KonqListView::KonqListView( QWidget *parentWidget, QObject *parent, const char * m_pListView->confColumns[10].setData(I18N_NOOP("File Type"),"Type",KIO::UDS_FILE_TYPE,m_paShowType); - connect( m_pListView, SIGNAL( selectionChanged() ), - m_extension, SLOT( updateActions() ) ); - connect( m_pListView, SIGNAL( selectionChanged() ), - this, SLOT( slotSelectionChanged() ) ); + connect( m_pListView, TQT_SIGNAL( selectionChanged() ), + m_extension, TQT_SLOT( updateActions() ) ); + connect( m_pListView, TQT_SIGNAL( selectionChanged() ), + this, TQT_SLOT( slotSelectionChanged() ) ); - connect( m_pListView, SIGNAL( currentChanged(QListViewItem*) ), - m_extension, SLOT( updateActions() ) ); - connect(m_pListView->header(),SIGNAL(indexChange(int,int,int)),this,SLOT(headerDragged(int,int,int))); - connect(m_pListView->header(),SIGNAL(clicked(int)),this,SLOT(slotHeaderClicked(int))); - connect(m_pListView->header(),SIGNAL(sizeChange(int,int,int)),SLOT(slotHeaderSizeChanged())); + connect( m_pListView, TQT_SIGNAL( currentChanged(TQListViewItem*) ), + m_extension, TQT_SLOT( updateActions() ) ); + connect(m_pListView->header(),TQT_SIGNAL(indexChange(int,int,int)),this,TQT_SLOT(headerDragged(int,int,int))); + connect(m_pListView->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(slotHeaderClicked(int))); + connect(m_pListView->header(),TQT_SIGNAL(sizeChange(int,int,int)),TQT_SLOT(slotHeaderSizeChanged())); // signals from konqdirpart (for BC reasons) - connect( this, SIGNAL( findOpened( KonqDirPart * ) ), SLOT( slotKFindOpened() ) ); - connect( this, SIGNAL( findClosed( KonqDirPart * ) ), SLOT( slotKFindClosed() ) ); + connect( this, TQT_SIGNAL( findOpened( KonqDirPart * ) ), TQT_SLOT( slotKFindOpened() ) ); + connect( this, TQT_SIGNAL( findClosed( KonqDirPart * ) ), TQT_SLOT( slotKFindClosed() ) ); loadPlugins( this, this, instance() ); } @@ -312,7 +312,7 @@ void KonqListView::guiActivateEvent( KParts::GUIActivateEvent *event ) bool KonqListView::doOpenURL( const KURL &url ) { KURL u( url ); - const QString prettyURL = url.pathOrURL(); + const TQString prettyURL = url.pathOrURL(); emit setWindowCaption( prettyURL ); return m_pListView->openURL( url ); } @@ -335,7 +335,7 @@ void KonqListView::determineIcon( KonqBaseListViewItem * item ) (void) item->item()->determineMimeType(); - //QPixmap newIcon = item->item()->pixmap( m_parent->iconSize(), + //TQPixmap newIcon = item->item()->pixmap( m_parent->iconSize(), // item->state() ); //if ( oldSerial != newIcon.serialNumber() ) // item->setPixmap( 0, newIcon ); @@ -344,14 +344,14 @@ void KonqListView::determineIcon( KonqBaseListViewItem * item ) item->updateContents(); } -void KonqListView::saveState( QDataStream &stream ) +void KonqListView::saveState( TQDataStream &stream ) { //kdDebug(1202) << k_funcinfo << endl; KonqDirPart::saveState( stream ); m_pListView->saveState( stream ); } -void KonqListView::restoreState( QDataStream &stream ) +void KonqListView::restoreState( TQDataStream &stream ) { //kdDebug(1202) << k_funcinfo << endl; KonqDirPart::restoreState( stream ); @@ -366,12 +366,12 @@ void KonqListView::disableIcons( const KURL::List &lst ) void KonqListView::slotSelect() { bool ok; - QString pattern = KInputDialog::getText( QString::null, + TQString pattern = KInputDialog::getText( TQString::null, i18n( "Select files:" ), "*", &ok, m_pListView ); if ( !ok ) return; - QRegExp re( pattern, true, true ); + TQRegExp re( pattern, true, true ); m_pListView->blockSignals( true ); @@ -397,12 +397,12 @@ void KonqListView::slotSelect() void KonqListView::slotUnselect() { bool ok; - QString pattern = KInputDialog::getText( QString::null, + TQString pattern = KInputDialog::getText( TQString::null, i18n( "Unselect files:" ), "*", &ok, m_pListView ); if ( !ok ) return; - QRegExp re( pattern, TRUE, TRUE ); + TQRegExp re( pattern, TRUE, TRUE ); m_pListView->blockSignals(TRUE); @@ -494,7 +494,7 @@ void KonqListView::slotColumnToggled() m_pListView->updateListContents(); //save the config - QStringList lstColumns; + TQStringList lstColumns; int currentColumn(m_pListView->m_filenameColumn+1); for (int i=0; i<(int)m_pListView->NumberOfAtoms; i++) { @@ -523,7 +523,7 @@ void KonqListView::slotHeaderClicked(int sec) for (uint i=0; iNumberOfAtoms; i++) if (m_pListView->confColumns[i].displayInColumn==sec) clickedColumn=i; kdDebug(1202)<<"atom index "<columns(); i++ ) { @@ -589,7 +589,7 @@ void KonqListView::slotSaveAfterHeaderDrag() void KonqListView::slotSaveColumnWidths() { - QValueList lstColumnWidths; + TQValueList lstColumnWidths; for ( int i=0; i < m_pListView->columns(); i++ ) { @@ -620,8 +620,8 @@ void KonqListView::slotHeaderSizeChanged() { if ( !m_headerTimer ) { - m_headerTimer = new QTimer( this ); - connect( m_headerTimer, SIGNAL( timeout() ), this, SLOT( slotSaveColumnWidths() ) ); + m_headerTimer = new TQTimer( this ); + connect( m_headerTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSaveColumnWidths() ) ); } else m_headerTimer->stop(); @@ -643,37 +643,37 @@ void KonqListView::slotKFindClosed() void KonqListView::setupActions() { - m_paShowTime=new KToggleAction(i18n("Show &Modification Time"), 0,this, SLOT(slotColumnToggled()), actionCollection(), "show_time" ); + m_paShowTime=new KToggleAction(i18n("Show &Modification Time"), 0,this, TQT_SLOT(slotColumnToggled()), actionCollection(), "show_time" ); m_paShowTime->setCheckedState(i18n("Hide &Modification Time")); - m_paShowType=new KToggleAction(i18n("Show &File Type"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_type" ); + m_paShowType=new KToggleAction(i18n("Show &File Type"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_type" ); m_paShowType->setCheckedState(i18n("Hide &File Type")); - m_paShowMimeType=new KToggleAction(i18n("Show MimeType"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" ); + m_paShowMimeType=new KToggleAction(i18n("Show MimeType"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" ); m_paShowMimeType->setCheckedState(i18n("Hide MimeType")); - m_paShowAccessTime=new KToggleAction(i18n("Show &Access Time"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_access_time" ); + m_paShowAccessTime=new KToggleAction(i18n("Show &Access Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" ); m_paShowAccessTime->setCheckedState(i18n("Hide &Access Time")); - m_paShowCreateTime=new KToggleAction(i18n("Show &Creation Time"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" ); + m_paShowCreateTime=new KToggleAction(i18n("Show &Creation Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" ); m_paShowCreateTime->setCheckedState(i18n("Hide &Creation Time")); - m_paShowLinkDest=new KToggleAction(i18n("Show &Link Destination"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" ); + m_paShowLinkDest=new KToggleAction(i18n("Show &Link Destination"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" ); m_paShowLinkDest->setCheckedState(i18n("Hide &Link Destination")); - m_paShowSize=new KToggleAction(i18n("Show Filesize"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_size" ); + m_paShowSize=new KToggleAction(i18n("Show Filesize"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_size" ); m_paShowSize->setCheckedState(i18n("Hide Filesize")); - m_paShowOwner=new KToggleAction(i18n("Show Owner"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_owner" ); + m_paShowOwner=new KToggleAction(i18n("Show Owner"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_owner" ); m_paShowOwner->setCheckedState(i18n("Hide Owner")); - m_paShowGroup=new KToggleAction(i18n("Show Group"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_group" ); + m_paShowGroup=new KToggleAction(i18n("Show Group"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_group" ); m_paShowGroup->setCheckedState(i18n("Hide Group")); - m_paShowPermissions=new KToggleAction(i18n("Show Permissions"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_permissions" ); + m_paShowPermissions=new KToggleAction(i18n("Show Permissions"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" ); m_paShowPermissions->setCheckedState(i18n("Hide Permissions")); - m_paShowURL=new KToggleAction(i18n("Show URL"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_url" ); + m_paShowURL=new KToggleAction(i18n("Show URL"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_url" ); - m_paSelect = new KAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, SLOT( slotSelect() ), actionCollection(), "select" ); - m_paUnselect = new KAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, SLOT( slotUnselect() ), actionCollection(), "unselect" ); - m_paSelectAll = KStdAction::selectAll( this, SLOT( slotSelectAll() ), actionCollection(), "selectall" ); - m_paUnselectAll = new KAction( i18n( "Unselect All" ), CTRL+Key_U, this, SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); - m_paInvertSelection = new KAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); + m_paSelect = new KAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), actionCollection(), "select" ); + m_paUnselect = new KAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), actionCollection(), "unselect" ); + m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); + m_paUnselectAll = new KAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); + m_paInvertSelection = new KAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); - m_paShowDot = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, SLOT( slotShowDot() ), actionCollection(), "show_dot" ); + m_paShowDot = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); // m_paShowDot->setCheckedState(i18n("Hide &Hidden Files")); - m_paCaseInsensitive = new KToggleAction(i18n("Case Insensitive Sort"), 0, this, SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); + m_paCaseInsensitive = new KToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); newIconSize( KIcon::SizeSmall /* default size */ ); } diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h index b149b703c..8665160d3 100644 --- a/konqueror/listview/konq_listview.h +++ b/konqueror/listview/konq_listview.h @@ -27,9 +27,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include "konq_listviewwidget.h" @@ -44,7 +44,7 @@ public: KonqListViewFactory(); virtual ~KonqListViewFactory(); - virtual KParts::Part* createPartObject( QWidget *parentWidget, const char *, QObject *parent, const char *name, const char*, const QStringList &args ); + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args ); static KInstance *instance(); static KonqPropsView *defaultViewProps(); @@ -65,7 +65,7 @@ class KonqListView : public KonqDirPart Q_OBJECT Q_PROPERTY( bool supportsUndo READ supportsUndo ) public: - KonqListView( QWidget *parentWidget, QObject *parent, const char *name, const QString& mode ); + KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode ); virtual ~KonqListView(); virtual const KFileItem * currentItem(); @@ -75,8 +75,8 @@ public: bool supportsUndo() const { return true; } - virtual void saveState( QDataStream &stream ); - virtual void restoreState( QDataStream &stream ); + virtual void saveState( TQDataStream &stream ); + virtual void restoreState( TQDataStream &stream ); // "Cut" icons : disable those whose URL is in lst, enable the others virtual void disableIcons( const KURL::List & lst ); @@ -86,7 +86,7 @@ public: //int iconSize() { return m_pListView->iconSize(); } void determineIcon( KonqBaseListViewItem * item ); - QPtrList & lstPendingMimeIconItems() { return m_mimeTypeResolver->m_lstPendingMimeIconItems; } + TQPtrList & lstPendingMimeIconItems() { return m_mimeTypeResolver->m_lstPendingMimeIconItems; } void listingComplete(); virtual void newIconSize( int ); @@ -145,7 +145,7 @@ private: KonqBaseListViewWidget *m_pListView; KMimeTypeResolver *m_mimeTypeResolver; - QTimer *m_headerTimer; + TQTimer *m_headerTimer; KAction *m_paSelect; KAction *m_paUnselect; @@ -195,7 +195,7 @@ class ListViewBrowserExtension : public KonqDirPartBrowserExtension void reparseConfiguration(); void setSaveViewPropertiesLocally( bool value ); - void setNameFilter( const QString &nameFilter ); + void setNameFilter( const TQString &nameFilter ); // void refreshMimeTypes is missing void properties(); diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc index f946856c4..3c70f1fb0 100644 --- a/konqueror/listview/konq_listviewitems.cc +++ b/konqueror/listview/konq_listviewitems.cc @@ -23,11 +23,11 @@ #include #include #include -#include -#include +#include +#include #include -static QString retrieveExtraEntry( KFileItem* fileitem, int numExtra ) +static TQString retrieveExtraEntry( KFileItem* fileitem, int numExtra ) { /// ######## SLOOOOW KIO::UDSEntry::ConstIterator it = fileitem->entry().begin(); @@ -44,7 +44,7 @@ static QString retrieveExtraEntry( KFileItem* fileitem, int numExtra ) } } } - return QString::null; + return TQString::null; } @@ -70,7 +70,7 @@ KonqListViewItem::KonqListViewItem( KonqBaseListViewWidget *_listViewWidget, KFi KonqListViewItem::~KonqListViewItem() { - for ( QValueVector::iterator + for ( TQValueVector::iterator it = m_pixmaps.begin(), itEnd = m_pixmaps.end(); it != itEnd; ++it ) delete *it; @@ -130,7 +130,7 @@ void KonqListViewItem::updateContents() case KIO::UDS_ACCESS_TIME: case KIO::UDS_CREATION_TIME: { - QDateTime dt; + TQDateTime dt; time_t _time = m_fileitem->time( tmpColumn->udsId ); if ( _time != 0 ) { @@ -141,14 +141,14 @@ void KonqListViewItem::updateContents() break; case KIO::UDS_EXTRA: { - const QString entryStr = retrieveExtraEntry( m_fileitem, numExtra ); - if ( tmpColumn->type == QVariant::DateTime ) + const TQString entryStr = retrieveExtraEntry( m_fileitem, numExtra ); + if ( tmpColumn->type == TQVariant::DateTime ) { - QDateTime dt = QDateTime::fromString( entryStr, Qt::ISODate ); + TQDateTime dt = TQDateTime::fromString( entryStr, Qt::ISODate ); setText(tmpColumn->displayInColumn, KGlobal::locale()->formatDateTime(dt)); } - else // if ( tmpColumn->type == QVariant::String ) + else // if ( tmpColumn->type == TQVariant::String ) setText(tmpColumn->displayInColumn, entryStr); ++numExtra; break; @@ -180,12 +180,12 @@ void KonqListViewItem::setActive( bool active ) setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) ); } -void KonqListViewItem::setPixmap( int column, const QPixmap& pm ) +void KonqListViewItem::setPixmap( int column, const TQPixmap& pm ) { if ( column < 0 ) return; - const QPixmap *current = pixmap( column ); + const TQPixmap *current = pixmap( column ); if ( ( pm.isNull() && !current ) || ( current && pm.serialNumber() == current->serialNumber() ) ) @@ -198,7 +198,7 @@ void KonqListViewItem::setPixmap( int column, const QPixmap& pm ) m_pixmaps.resize( column+1 ); delete current; - m_pixmaps[column] = pm.isNull() ? 0 : new QPixmap( pm ); + m_pixmaps[column] = pm.isNull() ? 0 : new TQPixmap( pm ); int newWidth = pm.isNull() ? 0 : pm.width(); int newHeight = pm.isNull() ? 0 : pm.height(); @@ -218,7 +218,7 @@ void KonqListViewItem::setPixmap( int column, const QPixmap& pm ) // If we're just replacing the icon with another one its size -- i.e. a // "highlighted" icon, don't bother repainting the whole widget. - QListView *lv = m_pListViewWidget; + TQListView *lv = m_pListViewWidget; int decorationWidth = lv->treeStepSize() * ( depth() + ( lv->rootIsDecorated() ? 1 : 0 ) ); int x = lv->header()->sectionPos( column ) + decorationWidth + lv->itemMargin(); @@ -228,19 +228,19 @@ void KonqListViewItem::setPixmap( int column, const QPixmap& pm ) lv->repaintContents( x, y, w, h ); } -const QPixmap* KonqListViewItem::pixmap( int column ) const +const TQPixmap* KonqListViewItem::pixmap( int column ) const { bool ok; if ((int)m_pixmaps.count() <= column) return 0; - QPixmap *pm = m_pixmaps.at( column, &ok ); + TQPixmap *pm = m_pixmaps.at( column, &ok ); if( !ok ) return 0; return pm; } -int KonqBaseListViewItem::compare( QListViewItem* item, int col, bool ascending ) const +int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending ) const { KonqListViewItem* k = static_cast( item ); if ( sortChar != k->sortChar ) @@ -273,11 +273,11 @@ int KonqBaseListViewItem::compare( QListViewItem* item, int col, bool ascending } case KIO::UDS_EXTRA: { - if ( cInfo->type & QVariant::DateTime ) { - const QString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra ); - QDateTime dt1 = QDateTime::fromString( entryStr1, Qt::ISODate ); - const QString entryStr2 = retrieveExtraEntry( k->m_fileitem, numExtra ); - QDateTime dt2 = QDateTime::fromString( entryStr2, Qt::ISODate ); + if ( cInfo->type & TQVariant::DateTime ) { + const TQString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra ); + TQDateTime dt1 = TQDateTime::fromString( entryStr1, Qt::ISODate ); + const TQString entryStr2 = retrieveExtraEntry( k->m_fileitem, numExtra ); + TQDateTime dt2 = TQDateTime::fromString( entryStr2, Qt::ISODate ); return ( dt1 > dt2 ) ? 1 : ( dt1 < dt2 ) ? -1 : 0; } } @@ -294,19 +294,19 @@ int KonqBaseListViewItem::compare( QListViewItem* item, int col, bool ascending } } -void KonqListViewItem::paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment ) +void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { - QColorGroup cg( _cg ); + TQColorGroup cg( _cg ); if ( _column == 0 ) { _painter->setFont( m_pListViewWidget->itemFont() ); } - cg.setColor( QColorGroup::Text, m_pListViewWidget->itemColor() ); + cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); KListView *lv = static_cast< KListView* >( listView() ); - const QPixmap *pm = lv->viewport()->paletteBackgroundPixmap(); + const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap(); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { int newWidth = width( lv->fontMetrics(), lv, _column ); @@ -314,11 +314,11 @@ void KonqListViewItem::paintCell( QPainter *_painter, const QColorGroup & _cg, i newWidth = _width; if ( pm && !pm->isNull() ) { - cg.setBrush( QColorGroup::Base, QBrush( backgroundColor(_column), *pm ) ); - QPoint o = _painter->brushOrigin(); + cg.setBrush( TQColorGroup::Base, TQBrush( backgroundColor(_column), *pm ) ); + TQPoint o = _painter->brushOrigin(); _painter->setBrushOrigin( o.x() - lv->contentsX(), o.y() - lv->contentsY() ); - const QColorGroup::ColorRole crole = - QPalette::backgroundRoleFromMode( lv->viewport()->backgroundMode() ); + const TQColorGroup::ColorRole crole = + TQPalette::backgroundRoleFromMode( lv->viewport()->backgroundMode() ); _painter->fillRect( newWidth, 0, _width - newWidth, height(), cg.brush( crole ) ); _painter->setBrushOrigin( o ); } @@ -333,14 +333,14 @@ void KonqListViewItem::paintCell( QPainter *_painter, const QColorGroup & _cg, i KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } -void KonqListViewItem::paintFocus( QPainter * _painter, const QColorGroup & cg, const QRect & _r ) +void KonqListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) { - QRect r( _r ); - QListView *lv = static_cast< QListView * >( listView() ); + TQRect r( _r ); + TQListView *lv = static_cast< TQListView * >( listView() ); r.setWidth( width( lv->fontMetrics(), lv, 0 ) ); if ( r.right() > lv->header()->sectionRect( 0 ).right() ) r.setRight( lv->header()->sectionRect( 0 ).right() ); - QListViewItem::paintFocus( _painter, cg, r ); + TQListViewItem::paintFocus( _painter, cg, r ); } const char* KonqBaseListViewItem::makeAccessString( const mode_t mode) @@ -419,10 +419,10 @@ KonqBaseListViewItem::~KonqBaseListViewItem() m_pListViewWidget->m_selected->removeRef(this); } -QRect KonqBaseListViewItem::rect() const +TQRect KonqBaseListViewItem::rect() const { - QRect r = m_pListViewWidget->itemRect(this); - return QRect( m_pListViewWidget->viewportToContents( r.topLeft() ), QSize( r.width(), r.height() ) ); + TQRect r = m_pListViewWidget->itemRect(this); + return TQRect( m_pListViewWidget->viewportToContents( r.topLeft() ), TQSize( r.width(), r.height() ) ); } void KonqBaseListViewItem::mimetypeFound() diff --git a/konqueror/listview/konq_listviewitems.h b/konqueror/listview/konq_listviewitems.h index 6e0cbc513..d3dd2b1ad 100644 --- a/konqueror/listview/konq_listviewitems.h +++ b/konqueror/listview/konq_listviewitems.h @@ -21,10 +21,10 @@ #define __konq_listviewitems_h__ #include -#include +#include #include -#include +#include // for mode_t #include @@ -52,7 +52,7 @@ class KonqBaseListViewItem : public KListViewItem virtual void updateContents() = 0; virtual void setDisabled( bool disabled ) { m_bDisabled = disabled; } virtual void setActive ( bool active ) { m_bActive = active; } - virtual int compare( QListViewItem* i, int col, bool ascending ) const; + virtual int compare( TQListViewItem* i, int col, bool ascending ) const; int state() const { @@ -64,7 +64,7 @@ class KonqBaseListViewItem : public KListViewItem } /** For KonqMimeTypeResolver */ - QRect rect() const; + TQRect rect() const; protected: short int sortChar; @@ -106,18 +106,18 @@ class KonqListViewItem : public KonqBaseListViewItem virtual ~KonqListViewItem(); - virtual void paintCell( QPainter *_painter, const QColorGroup & cg, + virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg, int column, int width, int alignment ); - virtual void paintFocus( QPainter * _painter, const QColorGroup & cg, const QRect & r ); + virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r ); virtual void updateContents(); virtual void setDisabled( bool disabled ); virtual void setActive ( bool active ); - virtual void setPixmap( int column, const QPixmap & pm ); - virtual const QPixmap * pixmap( int column ) const; + virtual void setPixmap( int column, const TQPixmap & pm ); + virtual const TQPixmap * pixmap( int column ) const; private: - QValueVector m_pixmaps; + TQValueVector m_pixmaps; }; #endif diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index 7d9231758..8f166af0a 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -35,13 +35,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -51,27 +51,27 @@ ColumnInfo::ColumnInfo() ,name() ,desktopFileName() ,udsId(0) - ,type(QVariant::Invalid) + ,type(TQVariant::Invalid) ,displayThisOne(false) ,toggleThisOne(0) {} -void ColumnInfo::setData(const QString& n, const QString& desktopName, int kioUds, +void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kioUds, KToggleAction* someAction, int theWidth) { displayInColumn=-1; name=n; desktopFileName=desktopName; udsId=kioUds; - type=QVariant::Invalid; + type=TQVariant::Invalid; displayThisOne=false; toggleThisOne=someAction; width=theWidth; } -void ColumnInfo::setData(const QString& n, const QString& desktopName, int kioUds, - QVariant::Type t, KToggleAction* someAction, int theWidth) +void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kioUds, + TQVariant::Type t, KToggleAction* someAction, int theWidth) { displayInColumn=-1; name=n; @@ -84,7 +84,7 @@ void ColumnInfo::setData(const QString& n, const QString& desktopName, int kioUd } -KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, QWidget *parentWidget) +KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget) : KListView(parentWidget) ,sortedByColumn(0) ,m_pBrowserView(parent) @@ -119,62 +119,62 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, QWidget *p initConfig(); #if 0 - connect( this, SIGNAL(rightButtonPressed(QListViewItem*,const QPoint&,int)), - this, SLOT(slotRightButtonPressed(QListViewItem*,const QPoint&,int))); + connect( this, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), + this, TQT_SLOT(slotRightButtonPressed(TQListViewItem*,const TQPoint&,int))); #endif - connect( this, SIGNAL(returnPressed( QListViewItem * )), - this, SLOT(slotReturnPressed( QListViewItem * )) ); - connect( this, SIGNAL( mouseButtonClicked( int, QListViewItem *, const QPoint&, int )), - this, SLOT( slotMouseButtonClicked2( int, QListViewItem *, const QPoint&, int )) ); - connect( this, SIGNAL(executed( QListViewItem * )), - this, SLOT(slotExecuted( QListViewItem * )) ); - - connect( this, SIGNAL(currentChanged( QListViewItem * )), - this, SLOT(slotCurrentChanged( QListViewItem * )) ); - connect( this, SIGNAL(itemRenamed( QListViewItem *, const QString &, int )), - this, SLOT(slotItemRenamed( QListViewItem *, const QString &, int )) ); - connect( this, SIGNAL(contextMenuRequested( QListViewItem *, const QPoint&, int )), - this, SLOT(slotPopupMenu( QListViewItem *, const QPoint&, int )) ); - connect( this, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged()) ); - - connect( horizontalScrollBar(), SIGNAL(valueChanged( int )), - this, SIGNAL(viewportAdjusted()) ); - connect( verticalScrollBar(), SIGNAL(valueChanged( int )), - this, SIGNAL(viewportAdjusted()) ); + connect( this, TQT_SIGNAL(returnPressed( TQListViewItem * )), + this, TQT_SLOT(slotReturnPressed( TQListViewItem * )) ); + connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )), + this, TQT_SLOT( slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) ); + connect( this, TQT_SIGNAL(executed( TQListViewItem * )), + this, TQT_SLOT(slotExecuted( TQListViewItem * )) ); + + connect( this, TQT_SIGNAL(currentChanged( TQListViewItem * )), + this, TQT_SLOT(slotCurrentChanged( TQListViewItem * )) ); + connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )), + this, TQT_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) ); + connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )), + this, TQT_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) ); + connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); + + connect( horizontalScrollBar(), TQT_SIGNAL(valueChanged( int )), + this, TQT_SIGNAL(viewportAdjusted()) ); + connect( verticalScrollBar(), TQT_SIGNAL(valueChanged( int )), + this, TQT_SIGNAL(viewportAdjusted()) ); // Connect the directory lister - connect( m_dirLister, SIGNAL(started( const KURL & )), - this, SLOT(slotStarted()) ); - connect( m_dirLister, SIGNAL(completed()), this, SLOT(slotCompleted()) ); - connect( m_dirLister, SIGNAL(canceled()), this, SLOT(slotCanceled()) ); - connect( m_dirLister, SIGNAL(clear()), this, SLOT(slotClear()) ); - connect( m_dirLister, SIGNAL(newItems( const KFileItemList & ) ), - this, SLOT(slotNewItems( const KFileItemList & )) ); - connect( m_dirLister, SIGNAL(deleteItem( KFileItem * )), - this, SLOT(slotDeleteItem( KFileItem * )) ); - connect( m_dirLister, SIGNAL(refreshItems( const KFileItemList & )), - this, SLOT( slotRefreshItems( const KFileItemList & )) ); - connect( m_dirLister, SIGNAL(redirection( const KURL & )), - this, SLOT(slotRedirection( const KURL & )) ); - connect( m_dirLister, SIGNAL(itemsFilteredByMime( const KFileItemList & )), - m_pBrowserView, SIGNAL(itemsFilteredByMime( const KFileItemList & )) ); - - connect( m_dirLister, SIGNAL(infoMessage( const QString& )), - m_pBrowserView->extension(), SIGNAL(infoMessage( const QString& )) ); - connect( m_dirLister, SIGNAL(percent( int )), - m_pBrowserView->extension(), SIGNAL(loadingProgress( int )) ); - connect( m_dirLister, SIGNAL(speed( int )), - m_pBrowserView->extension(), SIGNAL(speedProgress( int )) ); - - connect( header(), SIGNAL(sizeChange( int, int, int )), SLOT(slotUpdateBackground()) ); + connect( m_dirLister, TQT_SIGNAL(started( const KURL & )), + this, TQT_SLOT(slotStarted()) ); + connect( m_dirLister, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()) ); + connect( m_dirLister, TQT_SIGNAL(canceled()), this, TQT_SLOT(slotCanceled()) ); + connect( m_dirLister, TQT_SIGNAL(clear()), this, TQT_SLOT(slotClear()) ); + connect( m_dirLister, TQT_SIGNAL(newItems( const KFileItemList & ) ), + this, TQT_SLOT(slotNewItems( const KFileItemList & )) ); + connect( m_dirLister, TQT_SIGNAL(deleteItem( KFileItem * )), + this, TQT_SLOT(slotDeleteItem( KFileItem * )) ); + connect( m_dirLister, TQT_SIGNAL(refreshItems( const KFileItemList & )), + this, TQT_SLOT( slotRefreshItems( const KFileItemList & )) ); + connect( m_dirLister, TQT_SIGNAL(redirection( const KURL & )), + this, TQT_SLOT(slotRedirection( const KURL & )) ); + connect( m_dirLister, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )), + m_pBrowserView, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )) ); + + connect( m_dirLister, TQT_SIGNAL(infoMessage( const TQString& )), + m_pBrowserView->extension(), TQT_SIGNAL(infoMessage( const TQString& )) ); + connect( m_dirLister, TQT_SIGNAL(percent( int )), + m_pBrowserView->extension(), TQT_SIGNAL(loadingProgress( int )) ); + connect( m_dirLister, TQT_SIGNAL(speed( int )), + m_pBrowserView->extension(), TQT_SIGNAL(speedProgress( int )) ); + + connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), TQT_SLOT(slotUpdateBackground()) ); viewport()->setMouseTracking( true ); - viewport()->setFocusPolicy( QWidget::WheelFocus ); - setFocusPolicy( QWidget::WheelFocus ); + viewport()->setFocusPolicy( TQWidget::WheelFocus ); + setFocusPolicy( TQWidget::WheelFocus ); setAcceptDrops( true ); //looks better with the statusbar - setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); + setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); setShowSortIndicator( true ); } @@ -193,7 +193,7 @@ KonqBaseListViewWidget::~KonqBaseListViewWidget() void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) { - const QString protocol = url.protocol(); + const TQString protocol = url.protocol(); KonqListViewSettings config( protocol ); config.readConfig(); sortedByColumn = config.sortBy(); @@ -201,8 +201,8 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) m_filenameColumnWidth = config.fileNameColumnWidth(); - QStringList lstColumns = config.columns(); - QValueList lstColumnWidths = config.columnWidths(); + TQStringList lstColumns = config.columns(); + TQValueList lstColumnWidths = config.columnWidths(); if (lstColumns.isEmpty()) { // Default column selection @@ -227,18 +227,18 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) KProtocolInfo::ExtraFieldList::Iterator extraFieldsIt = extraFields.begin(); for ( int num = 1; extraFieldsIt != extraFields.end(); ++extraFieldsIt, ++num ) { - const QString column = (*extraFieldsIt).name; + const TQString column = (*extraFieldsIt).name; if ( lstColumns.find(column) == lstColumns.end() ) lstColumns << column; - const QString type = (*extraFieldsIt).type; // ## TODO use when sorting - QVariant::Type t = QVariant::Invalid; + const TQString type = (*extraFieldsIt).type; // ## TODO use when sorting + TQVariant::Type t = TQVariant::Invalid; if ( type.lower() == "qstring" ) - t = QVariant::String; + t = TQVariant::String; else if ( type.lower() == "qdatetime" ) - t = QVariant::DateTime; + t = TQVariant::DateTime; else kdWarning() << "Unsupported ExtraType '" << type << "'" << endl; - confColumns[extraIndex++].setData( column, QString("Extra%1").arg(num), KIO::UDS_EXTRA, t, 0); + confColumns[extraIndex++].setData( column, TQString("Extra%1").arg(num), KIO::UDS_EXTRA, t, 0); } //disable everything @@ -273,7 +273,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) { // Default Column widths ColumnInfo *tmpColumn = &confColumns[j]; - QString str; + TQString str; if ( tmpColumn->udsId == KIO::UDS_SIZE ) str = KGlobal::locale()->formatNumber( 888888888, 0 ) + " "; @@ -293,9 +293,9 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) str = "a_long_lonq_long_very_long_url"; else if ( (tmpColumn->udsId & KIO::UDS_TIME) || (tmpColumn->udsId == KIO::UDS_EXTRA && - (tmpColumn->type & QVariant::DateTime)) ) + (tmpColumn->type & TQVariant::DateTime)) ) { - QDateTime dt( QDate( 2000, 10, 10 ), QTime( 20, 20, 20 ) ); + TQDateTime dt( TQDate( 2000, 10, 10 ), TQTime( 20, 20, 20 ) ); str = KGlobal::locale()->formatDateTime( dt ) + "--"; } else @@ -308,7 +308,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) } } //check what the protocol provides - QStringList listingList = KProtocolInfo::listing( url ); + TQStringList listingList = KProtocolInfo::listing( url ); kdDebug(1202) << k_funcinfo << "protocol: " << protocol << endl; // Even if this is not given by the protocol, we can determine it. @@ -325,7 +325,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) continue; } - QStringList::Iterator listIt = listingList.find( confColumns[i].desktopFileName ); + TQStringList::Iterator listIt = listingList.find( confColumns[i].desktopFileName ); if ( listIt == listingList.end() ) // not found -> hide { //move all columns behind one to the front @@ -388,35 +388,35 @@ void KonqBaseListViewWidget::initConfig() { m_pSettings = KonqFMSettings::settings(); - QFont stdFont( m_pSettings->standardFont() ); + TQFont stdFont( m_pSettings->standardFont() ); setFont( stdFont ); //TODO: create config GUI - QFont itemFont( m_pSettings->standardFont() ); + TQFont itemFont( m_pSettings->standardFont() ); itemFont.setUnderline( m_pSettings->underlineLink() ); setItemFont( itemFont ); setItemColor( m_pSettings->normalTextColor() ); - bool on = m_pSettings->showFileTips() && QToolTip::isGloballyEnabled(); + bool on = m_pSettings->showFileTips() && TQToolTip::isGloballyEnabled(); m_fileTip->setOptions( on, m_pSettings->showPreviewsInFileTips(), m_pSettings->numFileTips() ); updateListContents(); } -void KonqBaseListViewWidget::contentsMousePressEvent( QMouseEvent *e ) +void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) { if ( m_rubber ) { - QRect r( m_rubber->normalize() ); + TQRect r( m_rubber->normalize() ); delete m_rubber; m_rubber = 0; repaintContents( r, FALSE ); } delete m_selected; - m_selected = new QPtrList; + m_selected = new TQPtrList; - QPoint vp = contentsToViewport( e->pos() ); + TQPoint vp = contentsToViewport( e->pos() ); KonqBaseListViewItem* item = isExecuteArea( vp ) ? static_cast( itemAt( vp ) ) : 0L; @@ -426,13 +426,13 @@ void KonqBaseListViewWidget::contentsMousePressEvent( QMouseEvent *e ) else { if ( e->button() == LeftButton ) { - m_rubber = new QRect( e->x(), e->y(), 0, 0 ); + m_rubber = new TQRect( e->x(), e->y(), 0, 0 ); clearSelection(); emit selectionChanged(); m_fileTip->setItem( 0 ); } if ( e->button() != RightButton ) - QListView::contentsMousePressEvent( e ); + TQListView::contentsMousePressEvent( e ); } // Store list of selected items at mouse-press time. // This is used when autoscrolling (why?) @@ -440,12 +440,12 @@ void KonqBaseListViewWidget::contentsMousePressEvent( QMouseEvent *e ) selectedItems( m_selected ); } -void KonqBaseListViewWidget::contentsMouseReleaseEvent( QMouseEvent *e ) +void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) { if ( m_rubber ) { - QRect r( m_rubber->normalize() ); + TQRect r( m_rubber->normalize() ); delete m_rubber; m_rubber = 0; repaintContents( r, FALSE ); @@ -453,8 +453,8 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( QMouseEvent *e ) if ( m_scrollTimer ) { - disconnect( m_scrollTimer, SIGNAL( timeout() ), - this, SLOT( slotAutoScroll() ) ); + disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( slotAutoScroll() ) ); m_scrollTimer->stop(); delete m_scrollTimer; m_scrollTimer = 0; @@ -464,7 +464,7 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( QMouseEvent *e ) KListView::contentsMouseReleaseEvent( e ); } -void KonqBaseListViewWidget::contentsMouseMoveEvent( QMouseEvent *e ) +void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) { if ( m_rubber ) { @@ -472,7 +472,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( QMouseEvent *e ) return; } - QPoint vp = contentsToViewport( e->pos() ); + TQPoint vp = contentsToViewport( e->pos() ); KonqBaseListViewItem* item = isExecuteArea( vp ) ? static_cast( itemAt( vp ) ) : 0; @@ -490,7 +490,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( QMouseEvent *e ) m_pBrowserView->emitMouseOver( item->item() ); vp.setY( itemRect( item ).y() ); - QRect rect( viewportToContents( vp ), QSize(20, item->height()) ); + TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) ); m_fileTip->setItem( item->item(), rect, item->pixmap( 0 ) ); m_fileTip->setPreview( KGlobalSettings::showFilePreview( item->item()->url() ) ); setShowToolTips( !m_pSettings->showFileTips() ); @@ -508,7 +508,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( QMouseEvent *e ) KListView::contentsMouseMoveEvent( e ); } -void KonqBaseListViewWidget::contentsWheelEvent( QWheelEvent *e ) +void KonqBaseListViewWidget::contentsWheelEvent( TQWheelEvent *e ) { // when scrolling with mousewheel, stop possible pending filetip m_fileTip->setItem( 0 ); @@ -524,7 +524,7 @@ void KonqBaseListViewWidget::contentsWheelEvent( QWheelEvent *e ) KListView::contentsWheelEvent( e ); } -void KonqBaseListViewWidget::leaveEvent( QEvent *e ) +void KonqBaseListViewWidget::leaveEvent( TQEvent *e ) { if ( m_activeItem != 0 ) { @@ -540,20 +540,20 @@ void KonqBaseListViewWidget::leaveEvent( QEvent *e ) KListView::leaveEvent( e ); } -void KonqBaseListViewWidget::drawRubber( QPainter *p ) +void KonqBaseListViewWidget::drawRubber( TQPainter *p ) { if ( !m_rubber ) return; p->setRasterOp( NotROP ); - p->setPen( QPen( color0, 1 ) ); + p->setPen( TQPen( color0, 1 ) ); p->setBrush( NoBrush ); - QPoint pt( m_rubber->x(), m_rubber->y() ); + TQPoint pt( m_rubber->x(), m_rubber->y() ); pt = contentsToViewport( pt ); - style().drawPrimitive( QStyle::PE_RubberBand, p, - QRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ), - colorGroup(), QStyle::Style_Default, colorGroup().base() ); + style().drawPrimitive( TQStyle::PE_RubberBand, p, + TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ), + colorGroup(), TQStyle::Style_Default, colorGroup().base() ); } @@ -564,13 +564,13 @@ void KonqBaseListViewWidget::slotAutoScroll() // this code assumes that all items have the same height - const QPoint pos = viewport()->mapFromGlobal( QCursor::pos() ); - const QPoint vc = viewportToContents( pos ); + const TQPoint pos = viewport()->mapFromGlobal( TQCursor::pos() ); + const TQPoint vc = viewportToContents( pos ); if ( vc == m_rubber->bottomRight() ) return; - QRect oldRubber = *m_rubber; + TQRect oldRubber = *m_rubber; const int oldTop = m_rubber->normalize().top(); const int oldBottom = m_rubber->normalize().bottom(); @@ -578,18 +578,18 @@ void KonqBaseListViewWidget::slotAutoScroll() m_rubber->setBottomRight( vc ); - QListViewItem *cur = itemAt( QPoint(0,0) ); + TQListViewItem *cur = itemAt( TQPoint(0,0) ); bool block = signalsBlocked(); blockSignals( true ); - QRect rr; - QRect nr = m_rubber->normalize(); + TQRect rr; + TQRect nr = m_rubber->normalize(); bool changed = FALSE; if ( cur ) { - QRect rect; + TQRect rect; if ( allColumnsShowFocus() ) rect = itemRect( cur ); else { @@ -598,7 +598,7 @@ void KonqBaseListViewWidget::slotAutoScroll() } - rect = QRect( viewportToContents( rect.topLeft() ), + rect = TQRect( viewportToContents( rect.topLeft() ), viewportToContents( rect.bottomRight() ) ); if ( !allColumnsShowFocus() ) @@ -612,8 +612,8 @@ void KonqBaseListViewWidget::slotAutoScroll() rect.setWidth( header()->headerWidth() ); } - QRect r = rect; - QListViewItem *tmp = cur; + TQRect r = rect; + TQListViewItem *tmp = cur; while ( cur && rect.top() <= oldBottom ) { @@ -687,21 +687,21 @@ void KonqBaseListViewWidget::slotAutoScroll() blockSignals( block ); emit selectionChanged(); - QRect allRect = oldRubber.normalize(); + TQRect allRect = oldRubber.normalize(); if ( changed ) { allRect |= rr.normalize(); } allRect |= m_rubber->normalize(); - QPoint point = contentsToViewport( allRect.topLeft() ); - allRect = QRect( point.x(), point.y(), allRect.width(), allRect.height() ); + TQPoint point = contentsToViewport( allRect.topLeft() ); + allRect = TQRect( point.x(), point.y(), allRect.width(), allRect.height() ); allRect &= viewport()->rect(); allRect.addCoords( -2, -2, 2, 2 ); - QPixmap backrubber( viewport()->rect().size() ); + TQPixmap backrubber( viewport()->rect().size() ); backrubber.fill( viewport(), viewport()->rect().topLeft() ); - QPainter p( &backrubber ); + TQPainter p( &backrubber ); p.save(); drawContentsOffset( &p, contentsX(), @@ -716,46 +716,46 @@ void KonqBaseListViewWidget::slotAutoScroll() const int scroll_margin = 40; ensureVisible( vc.x(), vc.y(), scroll_margin, scroll_margin ); - if ( !QRect( scroll_margin, scroll_margin, + if ( !TQRect( scroll_margin, scroll_margin, viewport()->width() - 2*scroll_margin, viewport()->height() - 2*scroll_margin ).contains( pos ) ) { if ( !m_scrollTimer ) { - m_scrollTimer = new QTimer( this ); + m_scrollTimer = new TQTimer( this ); - connect( m_scrollTimer, SIGNAL( timeout() ), - this, SLOT( slotAutoScroll() ) ); + connect( m_scrollTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( slotAutoScroll() ) ); m_scrollTimer->start( 100, false ); } } else if ( m_scrollTimer ) { - disconnect( m_scrollTimer, SIGNAL( timeout() ), - this, SLOT( slotAutoScroll() ) ); + disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( slotAutoScroll() ) ); m_scrollTimer->stop(); delete m_scrollTimer; m_scrollTimer = 0; } } -void KonqBaseListViewWidget::viewportPaintEvent( QPaintEvent *e ) +void KonqBaseListViewWidget::viewportPaintEvent( TQPaintEvent *e ) { KListView::viewportPaintEvent( e ); - QPainter p( viewport() ); + TQPainter p( viewport() ); drawRubber( &p ); p.end(); } -void KonqBaseListViewWidget::viewportResizeEvent(QResizeEvent * e) +void KonqBaseListViewWidget::viewportResizeEvent(TQResizeEvent * e) { KListView::viewportResizeEvent(e); emit viewportAdjusted(); } -void KonqBaseListViewWidget::viewportDragMoveEvent( QDragMoveEvent *_ev ) +void KonqBaseListViewWidget::viewportDragMoveEvent( TQDragMoveEvent *_ev ) { KonqBaseListViewItem *item = isExecuteArea( _ev->pos() ) ? (KonqBaseListViewItem*)itemAt( _ev->pos() ) : 0L; @@ -788,7 +788,7 @@ void KonqBaseListViewWidget::viewportDragMoveEvent( QDragMoveEvent *_ev ) } } -void KonqBaseListViewWidget::viewportDragEnterEvent( QDragEnterEvent *_ev ) +void KonqBaseListViewWidget::viewportDragEnterEvent( TQDragEnterEvent *_ev ) { m_dragOverItem = 0L; @@ -796,14 +796,14 @@ void KonqBaseListViewWidget::viewportDragEnterEvent( QDragEnterEvent *_ev ) _ev->acceptAction(); } -void KonqBaseListViewWidget::viewportDragLeaveEvent( QDragLeaveEvent * ) +void KonqBaseListViewWidget::viewportDragLeaveEvent( TQDragLeaveEvent * ) { if ( m_dragOverItem != 0L ) setSelected( m_dragOverItem, false ); m_dragOverItem = 0L; } -void KonqBaseListViewWidget::viewportDropEvent( QDropEvent *ev ) +void KonqBaseListViewWidget::viewportDropEvent( TQDropEvent *ev ) { if ( m_dirLister->url().isEmpty() ) return; @@ -830,9 +830,9 @@ void KonqBaseListViewWidget::startDrag() m_fileTip->setItem( 0 ); KURL::List urls = selectedUrls( false ); - QListViewItem * m_pressedItem = currentItem(); + TQListViewItem * m_pressedItem = currentItem(); - QPixmap pixmap2; + TQPixmap pixmap2; bool pixmap0Invalid = !m_pressedItem->pixmap(0) || m_pressedItem->pixmap(0)->isNull(); // Multiple URLs ? @@ -855,7 +855,7 @@ void KonqBaseListViewWidget::startDrag() drag->drag(); } -void KonqBaseListViewWidget::slotItemRenamed( QListViewItem *item, const QString &name, int col ) +void KonqBaseListViewWidget::slotItemRenamed( TQListViewItem *item, const TQString &name, int col ) { Q_ASSERT( col == 0 ); Q_ASSERT( item != 0 ); @@ -898,7 +898,7 @@ void KonqBaseListViewWidget::slotSelectionChanged() } void KonqBaseListViewWidget::slotMouseButtonClicked2( int _button, - QListViewItem *_item, const QPoint& pos, int ) + TQListViewItem *_item, const TQPoint& pos, int ) { if ( _button == MidButton ) { @@ -909,7 +909,7 @@ void KonqBaseListViewWidget::slotMouseButtonClicked2( int _button, } } -void KonqBaseListViewWidget::slotExecuted( QListViewItem *item ) +void KonqBaseListViewWidget::slotExecuted( TQListViewItem *item ) { if ( !item ) return; @@ -917,11 +917,11 @@ void KonqBaseListViewWidget::slotExecuted( QListViewItem *item ) // isExecuteArea() checks whether the mouse pointer is // over an area where an action should be triggered // (i.e. the Name column, including pixmap and "+") - if ( isExecuteArea( viewport()->mapFromGlobal( QCursor::pos() ) ) ) + if ( isExecuteArea( viewport()->mapFromGlobal( TQCursor::pos() ) ) ) slotReturnPressed( item ); } -void KonqBaseListViewWidget::selectedItems( QPtrList *_list ) +void KonqBaseListViewWidget::selectedItems( TQPtrList *_list ) { iterator it = begin(); for ( ; it != end(); it++ ) @@ -967,7 +967,7 @@ KonqPropsView * KonqBaseListViewWidget::props() const return m_pBrowserView->m_pProps; } -void KonqBaseListViewWidget::slotReturnPressed( QListViewItem *_item ) +void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item ) { if ( !_item ) return; @@ -985,11 +985,11 @@ void KonqBaseListViewWidget::slotReturnPressed( QListViewItem *_item ) if (_item->pixmap(0) != 0) { // Rect of the QListViewItem's pixmap area. - QRect rect = _item->listView()->itemRect(_item); + TQRect rect = _item->listView()->itemRect(_item); // calculate nesting depth int nestingDepth = 0; - for (QListViewItem *currentItem = _item->parent(); + for (TQListViewItem *currentItem = _item->parent(); currentItem != 0; currentItem = currentItem->parent()) nestingDepth++; @@ -1007,7 +1007,7 @@ void KonqBaseListViewWidget::slotReturnPressed( QListViewItem *_item ) rect.setWidth(_item->pixmap(0)->width()); // gather pixmap - QPixmap *pix = new QPixmap(*(_item->pixmap(0))); + TQPixmap *pix = new TQPixmap(*(_item->pixmap(0))); // call the icon effect KIconEffect::visualActivate(viewport(), rect, pix); @@ -1019,13 +1019,13 @@ void KonqBaseListViewWidget::slotReturnPressed( QListViewItem *_item ) KMessageBox::information( 0, i18n("You must take the file out of the trash before being able to use it.") ); } -void KonqBaseListViewWidget::slotPopupMenu( QListViewItem *i, const QPoint &point, int c ) +void KonqBaseListViewWidget::slotPopupMenu( TQListViewItem *i, const TQPoint &point, int c ) { kdDebug(1202) << "KonqBaseListViewWidget::slotPopupMenu" << endl; popupMenu( point, ( i != 0 && c == -1 ) ); // i != 0 && c == -1 when activated by keyboard } -void KonqBaseListViewWidget::popupMenu( const QPoint& _global, bool alwaysForSelectedFiles ) +void KonqBaseListViewWidget::popupMenu( const TQPoint& _global, bool alwaysForSelectedFiles ) { m_fileTip->setItem( 0 ); @@ -1037,7 +1037,7 @@ void KonqBaseListViewWidget::popupMenu( const QPoint& _global, bool alwaysForSel // a popup for the current dir instead. if ( alwaysForSelectedFiles || isExecuteArea( viewport()->mapFromGlobal( _global ) ) ) { - QPtrList items; + TQPtrList items; selectedItems( &items ); for ( KonqBaseListViewItem *item = items.first(); item; item = items.next() ) lstItems.append( item->item() ); @@ -1224,7 +1224,7 @@ void KonqBaseListViewWidget::slotCanceled() //kdDebug(1202) << k_funcinfo << endl; setComplete(); - emit m_pBrowserView->canceled( QString::null ); + emit m_pBrowserView->canceled( TQString::null ); } void KonqBaseListViewWidget::slotClear() @@ -1246,7 +1246,7 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries ) { //kdDebug(1202) << k_funcinfo << entries.count() << endl; - for ( QPtrListIterator kit ( entries ); kit.current(); ++kit ) + for ( TQPtrListIterator kit ( entries ); kit.current(); ++kit ) { KonqListViewItem * tmp = new KonqListViewItem( this, *kit ); if ( !m_itemFound && tmp->text(0) == m_itemToGoTo ) @@ -1255,7 +1255,7 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries ) m_itemFound = true; } if ( !m_itemsToSelect.isEmpty() ) { - QStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); setSelected( tmp, true ); @@ -1325,7 +1325,7 @@ void KonqBaseListViewWidget::slotRefreshItems( const KFileItemList & entries ) { //kdDebug(1202) << k_funcinfo << endl; - QPtrListIterator kit ( entries ); + TQPtrListIterator kit ( entries ); for ( ; kit.current(); ++kit ) { iterator it = begin(); @@ -1349,7 +1349,7 @@ void KonqBaseListViewWidget::slotRedirection( const KURL & url ) readProtocolConfig( url ); createColumns(); } - const QString prettyURL = url.pathOrURL(); + const TQString prettyURL = url.pathOrURL(); emit m_pBrowserView->extension()->setLocationBarURL( prettyURL ); emit m_pBrowserView->setWindowCaption( prettyURL ); m_pBrowserView->m_url = url; @@ -1416,22 +1416,22 @@ KonqBaseListViewWidget::iterator KonqBaseListViewWidget::iterator::operator++(in return it; } -void KonqBaseListViewWidget::paintEmptyArea( QPainter *p, const QRect &r ) +void KonqBaseListViewWidget::paintEmptyArea( TQPainter *p, const TQRect &r ) { - const QPixmap *pm = viewport()->paletteBackgroundPixmap(); + const TQPixmap *pm = viewport()->paletteBackgroundPixmap(); if (!pm || pm->isNull()) p->fillRect(r, viewport()->backgroundColor()); else { - QRect devRect = p->xForm( r ); + TQRect devRect = p->xForm( r ); int ax = (devRect.x() + contentsX()); int ay = (devRect.y() + contentsY()); /* kdDebug() << "KonqBaseListViewWidget::paintEmptyArea " << r.x() << "," << r.y() << " " << r.width() << "x" << r.height() << " drawing pixmap with offset " << ax << "," << ay << endl;*/ - p->drawTiledPixmap(r, *pm, QPoint(ax, ay)); + p->drawTiledPixmap(r, *pm, TQPoint(ax, ay)); } } @@ -1455,19 +1455,19 @@ void KonqBaseListViewWidget::disableIcons( const KURL::List & lst ) } } -void KonqBaseListViewWidget::saveState( QDataStream & ds ) +void KonqBaseListViewWidget::saveState( TQDataStream & ds ) { - QString str; + TQString str; if ( currentItem() ) str = static_cast(currentItem())->item()->url().fileName(true); ds << str << m_url; } -void KonqBaseListViewWidget::restoreState( QDataStream & ds ) +void KonqBaseListViewWidget::restoreState( TQDataStream & ds ) { m_restored = true; - QString str; + TQString str; KURL url; ds >> str >> url; if ( !str.isEmpty() ) @@ -1490,8 +1490,8 @@ void KonqBaseListViewWidget::slotUpdateBackground() { if ( !m_backgroundTimer ) { - m_backgroundTimer = new QTimer( this ); - connect( m_backgroundTimer, SIGNAL( timeout() ), viewport(), SLOT( update() ) ); + m_backgroundTimer = new TQTimer( this ); + connect( m_backgroundTimer, TQT_SIGNAL( timeout() ), viewport(), TQT_SLOT( update() ) ); } else m_backgroundTimer->stop(); @@ -1506,7 +1506,7 @@ bool KonqBaseListViewWidget::caseInsensitiveSort() const } // based on isExecuteArea from klistview.cpp -int KonqBaseListViewWidget::executeArea( QListViewItem *_item ) +int KonqBaseListViewWidget::executeArea( TQListViewItem *_item ) { if ( !_item ) return 0; diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h index d6451e50d..19cb4b16d 100644 --- a/konqueror/listview/konq_listviewwidget.h +++ b/konqueror/listview/konq_listviewwidget.h @@ -20,8 +20,8 @@ #ifndef __konq_listviewwidget_h__ #define __konq_listviewwidget_h__ -#include -#include +#include +#include #include #include @@ -55,15 +55,15 @@ class ColumnInfo { public: ColumnInfo(); - void setData( const QString& n, const QString& desktopName, int kioUds, + void setData( const TQString& n, const TQString& desktopName, int kioUds, KToggleAction *someAction, int theWith = -1 ); - void setData( const QString& n, const QString& desktopName, int kioUds /* UDS_EXTRA */, - QVariant::Type type, KToggleAction *someAction, int theWith = -1 ); + void setData( const TQString& n, const TQString& desktopName, int kioUds /* UDS_EXTRA */, + TQVariant::Type type, KToggleAction *someAction, int theWith = -1 ); int displayInColumn; - QString name; - QString desktopFileName; + TQString name; + TQString desktopFileName; int udsId; - QVariant::Type type; // only used if udsId == UDS_EXTRA + TQVariant::Type type; // only used if udsId == UDS_EXTRA bool displayThisOne; KToggleAction *toggleThisOne; int width; @@ -81,7 +81,7 @@ class KonqBaseListViewWidget : public KListView Q_OBJECT public: - KonqBaseListViewWidget( KonqListView *parent, QWidget *parentWidget ); + KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget ); virtual ~KonqBaseListViewWidget(); unsigned int NumberOfAtoms; @@ -108,40 +108,40 @@ public: virtual bool openURL( const KURL &url ); - void selectedItems( QPtrList *_list ); + void selectedItems( TQPtrList *_list ); KFileItemList visibleFileItems(); KFileItemList selectedFileItems(); KURL::List selectedUrls( bool mostLocal = false ); /** @return the KonqListViewDir which handles the directory _url */ - //virtual KonqListViewDir *findDir ( const QString & _url ); + //virtual KonqListViewDir *findDir ( const TQString & _url ); /** * @return the Properties instance for this view. Used by the items. */ KonqPropsView *props() const; - //QPtrList *columnConfigInfo() { return &confColumns; }; - QValueVector& columnConfigInfo() { return confColumns; }; - QString sortedByColumn; + //TQPtrList *columnConfigInfo() { return &confColumns; }; + TQValueVector& columnConfigInfo() { return confColumns; }; + TQString sortedByColumn; virtual void setShowIcons( bool enable ) { m_showIcons = enable; } virtual bool showIcons() { return m_showIcons; } - void setItemFont( const QFont &f ) { m_itemFont = f; } - QFont itemFont() const { return m_itemFont; } - void setItemColor( const QColor &c ) { m_itemColor = c; } - QColor itemColor() const { return m_itemColor; } + void setItemFont( const TQFont &f ) { m_itemFont = f; } + TQFont itemFont() const { return m_itemFont; } + void setItemColor( const TQColor &c ) { m_itemColor = c; } + TQColor itemColor() const { return m_itemColor; } int iconSize() const { return props()->iconSize(); } void setAscending( bool b ) { m_bAscending = b; } bool ascending() const { return m_bAscending; } bool caseInsensitiveSort() const; - virtual void paintEmptyArea( QPainter *p, const QRect &r ); + virtual void paintEmptyArea( TQPainter *p, const TQRect &r ); - virtual void saveState( QDataStream & ); - virtual void restoreState( QDataStream & ); + virtual void saveState( TQDataStream & ); + virtual void restoreState( TQDataStream & ); virtual void disableIcons( const KURL::List& lst ); @@ -154,16 +154,16 @@ signals: public slots: //virtual void slotOnItem( KonqBaseListViewItem* _item ); // The '2' was added to differentiate it from KListView::slotMouseButtonClicked() - void slotMouseButtonClicked2( int _button, QListViewItem *_item, const QPoint& pos, int ); - virtual void slotExecuted( QListViewItem *_item ); - void slotItemRenamed( QListViewItem *, const QString &, int ); + void slotMouseButtonClicked2( int _button, TQListViewItem *_item, const TQPoint& pos, int ); + virtual void slotExecuted( TQListViewItem *_item ); + void slotItemRenamed( TQListViewItem *, const TQString &, int ); protected slots: void slotAutoScroll(); // from QListView - virtual void slotReturnPressed( QListViewItem *_item ); - virtual void slotCurrentChanged( QListViewItem *_item ) { slotOnItem( _item ); } + virtual void slotReturnPressed( TQListViewItem *_item ); + virtual void slotCurrentChanged( TQListViewItem *_item ) { slotOnItem( _item ); } // slots connected to the directory lister virtual void slotStarted(); @@ -174,7 +174,7 @@ protected slots: virtual void slotDeleteItem( KFileItem * ); virtual void slotRefreshItems( const KFileItemList & ); virtual void slotRedirection( const KURL & ); - void slotPopupMenu( QListViewItem *, const QPoint&, int ); + void slotPopupMenu( TQListViewItem *, const TQPoint&, int ); // forces a repaint on column size changes / branch expansion // when there is a background pixmap @@ -199,54 +199,54 @@ protected: void initConfig(); virtual void startDrag(); - virtual void viewportDragMoveEvent( QDragMoveEvent *_ev ); - virtual void viewportDragEnterEvent( QDragEnterEvent *_ev ); - virtual void viewportDragLeaveEvent( QDragLeaveEvent *_ev ); - virtual void viewportDropEvent( QDropEvent *_ev ); - virtual void viewportPaintEvent( QPaintEvent *e ); - virtual void viewportResizeEvent( QResizeEvent *e ); + virtual void viewportDragMoveEvent( TQDragMoveEvent *_ev ); + virtual void viewportDragEnterEvent( TQDragEnterEvent *_ev ); + virtual void viewportDragLeaveEvent( TQDragLeaveEvent *_ev ); + virtual void viewportDropEvent( TQDropEvent *_ev ); + virtual void viewportPaintEvent( TQPaintEvent *e ); + virtual void viewportResizeEvent( TQResizeEvent *e ); - virtual void drawRubber( QPainter * ); - virtual void contentsMousePressEvent( QMouseEvent *e ); - virtual void contentsMouseReleaseEvent( QMouseEvent *e ); - virtual void contentsMouseMoveEvent( QMouseEvent *e ); - virtual void contentsWheelEvent( QWheelEvent * e ); + virtual void drawRubber( TQPainter * ); + virtual void contentsMousePressEvent( TQMouseEvent *e ); + virtual void contentsMouseReleaseEvent( TQMouseEvent *e ); + virtual void contentsMouseMoveEvent( TQMouseEvent *e ); + virtual void contentsWheelEvent( TQWheelEvent * e ); - virtual void leaveEvent( QEvent *e ); + virtual void leaveEvent( TQEvent *e ); /** Common method for slotCompleted and slotCanceled */ virtual void setComplete(); //the second parameter is set to true when the menu shortcut is pressed, //so the position of the mouse pointer doesn't matter when using keyboard, aleXXX - virtual void popupMenu( const QPoint& _global, bool alwaysForSelectedFiles = false ); + virtual void popupMenu( const TQPoint& _global, bool alwaysForSelectedFiles = false ); //this one is called only by KListView, and this is friend anyways (Alex) //KDirLister *dirLister() const { return m_dirLister; } protected: - int executeArea( QListViewItem *_item ); + int executeArea( TQListViewItem *_item ); /** The directory lister for this URL */ KDirLister *m_dirLister; - //QPtrList confColumns; + //TQPtrList confColumns; // IMO there is really no need for an advanced data structure //we have a fixed number of members, //it consumes less memory and access should be faster (Alex) // This might not be the case for ever... we should introduce custom fields in kio (David) - QValueVector confColumns; + TQValueVector confColumns; KonqBaseListViewItem *m_dragOverItem; KonqBaseListViewItem *m_activeItem; - QPtrList *m_selected; - QTimer *m_scrollTimer; + TQPtrList *m_selected; + TQTimer *m_scrollTimer; - QFont m_itemFont; - QColor m_itemColor; + TQFont m_itemFont; + TQColor m_itemColor; - QRect *m_rubber; - QPixmap *m_backrubber; + TQRect *m_rubber; + TQPixmap *m_backrubber; bool m_bTopLevelComplete:1; bool m_showIcons:1; @@ -261,9 +261,9 @@ protected: KURL m_url; - QString m_itemToGoTo; - QStringList m_itemsToSelect; - QTimer *m_backgroundTimer; + TQString m_itemToGoTo; + TQStringList m_itemsToSelect; + TQTimer *m_backgroundTimer; KonqFileTip *m_fileTip; }; diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc index 71d1de833..8e03e171e 100644 --- a/konqueror/listview/konq_textviewitem.cc +++ b/konqueror/listview/konq_textviewitem.cc @@ -24,17 +24,17 @@ #include #include -int KonqTextViewItem::compare( QListViewItem *item, int col, bool ascending ) const +int KonqTextViewItem::compare( TQListViewItem *item, int col, bool ascending ) const { if (col==1) return KonqBaseListViewItem::compare(item, 0, ascending); return KonqBaseListViewItem::compare(item, col, ascending); } -/*QString KonqTextViewItem::key( int _column, bool asc) const +/*TQString KonqTextViewItem::key( int _column, bool asc) const { if (_column==1) return key(0,asc); - QString tmp = QString::number( sortChar ); + TQString tmp = TQString::number( sortChar ); //check if it is a time column if (_column>1) { @@ -48,7 +48,7 @@ int KonqTextViewItem::compare( QListViewItem *item, int col, bool ascending ) co || (cInfo->udsId==KIO::UDS_ACCESS_TIME) || (cInfo->udsId==KIO::UDS_CREATION_TIME)) { - tmp += QString::number( m_fileitem->time(cInfo->udsId) ).rightJustify( 14, '0' ); + tmp += TQString::number( m_fileitem->time(cInfo->udsId) ).rightJustify( 14, '0' ); return tmp; } else if (cInfo->udsId==KIO::UDS_SIZE) @@ -67,7 +67,7 @@ int KonqTextViewItem::compare( QListViewItem *item, int col, bool ascending ) co void KonqTextViewItem::updateContents() { - QString tmp; + TQString tmp; KIO::filesize_t size=m_fileitem->size(); mode_t m=m_fileitem->mode(); @@ -185,7 +185,7 @@ void KonqTextViewItem::updateContents() { if ((*it).m_uds==(unsigned int)tmpColumn->udsId) { - QDateTime dt; + TQDateTime dt; dt.setTime_t((time_t) (*it).m_long); setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt)); break; @@ -200,25 +200,25 @@ void KonqTextViewItem::updateContents() }; } -void KonqTextViewItem::paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment ) +void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { - QColorGroup cg( _cg ); - cg.setColor(QColorGroup::Text, static_cast(listView())->colors[type]); + TQColorGroup cg( _cg ); + cg.setColor(TQColorGroup::Text, static_cast(listView())->colors[type]); // Don't do that! Keep things readable whatever the selection background color is -// cg.setColor(QColorGroup::HighlightedText, static_cast(listView())->highlight[type]); -// cg.setColor(QColorGroup::Highlight, Qt::darkGray); +// cg.setColor(TQColorGroup::HighlightedText, static_cast(listView())->highlight[type]); +// cg.setColor(TQColorGroup::Highlight, Qt::darkGray); KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } -/*void KonqTextViewItem::paintFocus( QPainter *_p, const QColorGroup &_cg, const QRect &_r ) +/*void KonqTextViewItem::paintFocus( TQPainter *_p, const TQColorGroup &_cg, const TQRect &_r ) { listView()->style().drawFocusRect( _p, _r, _cg, isSelected() ? &_cg.highlight() : &_cg.base(), isSelected() ); - QPixmap pix( _r.width(), _r.height() ); + TQPixmap pix( _r.width(), _r.height() ); bitBlt( &pix, 0, 0, _p->device(), _r.left(), _r.top(), _r.width(), _r.height() ); - QImage im = pix.convertToImage(); + TQImage im = pix.convertToImage(); im = KImageEffect::fade( im, 0.25, Qt::black ); _p->drawImage( _r.topLeft(), im ); }*/ diff --git a/konqueror/listview/konq_textviewitem.h b/konqueror/listview/konq_textviewitem.h index 413016bea..9aeb6d6be 100644 --- a/konqueror/listview/konq_textviewitem.h +++ b/konqueror/listview/konq_textviewitem.h @@ -20,8 +20,8 @@ #ifndef __konq_textviewitem_h__ #define __konq_textviewitem_h__ -#include -#include +#include +#include #include #include #include "konq_listviewitems.h" @@ -53,12 +53,12 @@ class KonqTextViewItem : public KonqBaseListViewItem */ KonqTextViewItem( KonqTextViewWidget *_parent, KFileItem* _fileitem ); virtual ~KonqTextViewItem() {/*cerr<<"~KonqTextViewItem: "< +#include #include #include @@ -29,7 +29,7 @@ #include -KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, QWidget *parentWidget ) +KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget ) :KonqBaseListViewWidget(parent,parentWidget) { kdDebug(1202) << "+KonqTextViewWidget" << endl; @@ -44,7 +44,7 @@ KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, QWidget *parentWid setRootIsDecorated(false); colors[KTVI_REGULAR]=Qt::black; - colors[KTVI_EXEC]=QColor(0,170,0); + colors[KTVI_EXEC]=TQColor(0,170,0); colors[KTVI_REGULARLINK]=Qt::black; colors[KTVI_DIR]=Qt::black; colors[KTVI_DIRLINK]=Qt::black; @@ -79,7 +79,7 @@ void KonqTextViewWidget::slotNewItems( const KFileItemList & entries ) { //kdDebug(1202) << k_funcinfo << entries.count() << endl; - for ( QPtrListIterator kit ( entries ); kit.current(); ++kit ) + for ( TQPtrListIterator kit ( entries ); kit.current(); ++kit ) { KonqTextViewItem *tmp = new KonqTextViewItem( this, *kit ); if ( !m_itemFound && tmp->text(0) == m_itemToGoTo ) @@ -88,7 +88,7 @@ void KonqTextViewWidget::slotNewItems( const KFileItemList & entries ) m_itemFound = true; } if ( !m_itemsToSelect.isEmpty() ) { - QStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); setSelected( tmp, true ); @@ -152,7 +152,7 @@ void KonqTextViewWidget::setComplete() } } -bool KonqTextViewWidget::isExecuteArea( const QPoint& point ) +bool KonqTextViewWidget::isExecuteArea( const TQPoint& point ) { if (!itemAt( point ) ) return false; @@ -168,7 +168,7 @@ bool KonqTextViewWidget::isExecuteArea( const QPoint& point ) return ( x > offset && x < ( offset + width ) ); } -/*void KonqTextViewWidget::viewportDragMoveEvent( QDragMoveEvent *_ev ) +/*void KonqTextViewWidget::viewportDragMoveEvent( TQDragMoveEvent *_ev ) { KonqBaseListViewItem *item = isNameColumn( _ev->pos() ) ? (KonqBaseListViewItem*)itemAt( _ev->pos() ) : 0L; @@ -200,7 +200,7 @@ bool KonqTextViewWidget::isExecuteArea( const QPoint& point ) } } -void KonqTextViewWidget::viewportDropEvent( QDropEvent *ev ) +void KonqTextViewWidget::viewportDropEvent( TQDropEvent *ev ) { if ( m_dirLister->url().isEmpty() ) return; diff --git a/konqueror/listview/konq_textviewwidget.h b/konqueror/listview/konq_textviewwidget.h index f799286ff..06a5cbbb5 100644 --- a/konqueror/listview/konq_textviewwidget.h +++ b/konqueror/listview/konq_textviewwidget.h @@ -34,21 +34,21 @@ class KonqTextViewWidget : public KonqBaseListViewWidget friend class KonqTextViewItem; Q_OBJECT public: - KonqTextViewWidget( KonqListView *parent, QWidget *parentWidget ); + KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget ); ~KonqTextViewWidget(); - virtual bool isExecuteArea( const QPoint& point ); + virtual bool isExecuteArea( const TQPoint& point ); protected slots: // slots connected to the directory lister virtual void setComplete(); virtual void slotNewItems( const KFileItemList & ); protected: -// bool isNameColumn(const QPoint& point ); -// virtual void viewportDragMoveEvent( QDragMoveEvent *_ev ); -// virtual void viewportDropEvent( QDropEvent *ev ); +// bool isNameColumn(const TQPoint& point ); +// virtual void viewportDragMoveEvent( TQDragMoveEvent *_ev ); +// virtual void viewportDropEvent( TQDropEvent *ev ); virtual void createColumns(); - QColor colors[11]; + TQColor colors[11]; }; #endif diff --git a/konqueror/listview/konq_treeviewitem.cc b/konqueror/listview/konq_treeviewitem.cc index 09b9d941b..32baf1c41 100644 --- a/konqueror/listview/konq_treeviewitem.cc +++ b/konqueror/listview/konq_treeviewitem.cc @@ -57,7 +57,7 @@ void KonqListViewDir::open( bool _open, bool _reload ) KFileItemList lst; lst.setAutoDelete( false ); - QListViewItem* it = firstChild(); + TQListViewItem* it = firstChild(); while ( it ) { lst.append( static_cast(it)->item() ); @@ -72,7 +72,7 @@ void KonqListViewDir::open( bool _open, bool _reload ) { treeView->stopListingSubFolder( this ); - QListViewItem* it = firstChild(); + TQListViewItem* it = firstChild(); while ( it ) { // unselect the items in the closed folder @@ -84,12 +84,12 @@ void KonqListViewDir::open( bool _open, bool _reload ) } } - QListViewItem::setOpen( _open ); + TQListViewItem::setOpen( _open ); treeView->slotOnViewport(); } } -QString KonqListViewDir::url( int _trailing ) +TQString KonqListViewDir::url( int _trailing ) { return item()->url().url( _trailing ); } diff --git a/konqueror/listview/konq_treeviewitem.h b/konqueror/listview/konq_treeviewitem.h index 5341a811a..b17adacaf 100644 --- a/konqueror/listview/konq_treeviewitem.h +++ b/konqueror/listview/konq_treeviewitem.h @@ -20,7 +20,7 @@ #ifndef __konq_treeviewitem_h__ #define __konq_treeviewitem_h__ -#include +#include #include "konq_listviewitems.h" class KFileItem; @@ -48,7 +48,7 @@ public: KonqListViewDir( KonqTreeViewWidget *_treeview, KonqListViewDir *_parent, KFileItem *_fileitem ); /** - * Called when user opens the directory (inherited from QListViewItem). + * Called when user opens the directory (inherited from TQListViewItem). * Just calls @ref #open(). */ virtual void setOpen( bool _open ); @@ -70,7 +70,7 @@ public: * URL of this directory * @param _trailing set to true for a trailing slash (see KURL) */ - QString url( int _trailing ); + TQString url( int _trailing ); protected: bool m_bComplete; diff --git a/konqueror/listview/konq_treeviewwidget.cc b/konqueror/listview/konq_treeviewwidget.cc index 67844fa3d..4d04f2fa4 100644 --- a/konqueror/listview/konq_treeviewwidget.cc +++ b/konqueror/listview/konq_treeviewwidget.cc @@ -24,10 +24,10 @@ #include #include -template class QDict; +template class TQDict; -KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, QWidget *parentWidget) +KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget) : KonqBaseListViewWidget( parent, parentWidget ) { kdDebug(1202) << "+KonqTreeViewWidget" << endl; @@ -35,12 +35,12 @@ KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, QWidget *parentWid setRootIsDecorated( true ); setTreeStepSize( 20 ); - connect( m_dirLister, SIGNAL( completed( const KURL & ) ), - this, SLOT( slotCompleted( const KURL & ) ) ); - connect( m_dirLister, SIGNAL( clear( const KURL & ) ), - this, SLOT( slotClear( const KURL & ) ) ); - connect( m_dirLister, SIGNAL( redirection( const KURL &, const KURL & ) ), - this, SLOT( slotRedirection( const KURL &, const KURL & ) ) ); + connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ), + this, TQT_SLOT( slotCompleted( const KURL & ) ) ); + connect( m_dirLister, TQT_SIGNAL( clear( const KURL & ) ), + this, TQT_SLOT( slotClear( const KURL & ) ) ); + connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ), + this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); } KonqTreeViewWidget::~KonqTreeViewWidget() @@ -59,7 +59,7 @@ bool KonqTreeViewWidget::openURL( const KURL &url ) if ( m_pBrowserView->extension()->urlArgs().reload ) { - QDictIterator it( m_dictSubDirs ); + TQDictIterator it( m_dictSubDirs ); for (; it.current(); ++it ) if ( it.current()->isOpen() ) m_urlsToReload.append( it.current()->url( -1 ) ); @@ -75,11 +75,11 @@ bool KonqTreeViewWidget::openURL( const KURL &url ) return KonqBaseListViewWidget::openURL( url ); } -void KonqTreeViewWidget::saveState( QDataStream &stream ) +void KonqTreeViewWidget::saveState( TQDataStream &stream ) { - QStringList openDirList; + TQStringList openDirList; - QDictIterator it( m_dictSubDirs ); + TQDictIterator it( m_dictSubDirs ); for (; it.current(); ++it ) { if ( it.current()->isOpen() ) @@ -90,7 +90,7 @@ void KonqTreeViewWidget::saveState( QDataStream &stream ) KonqBaseListViewWidget::saveState( stream ); } -void KonqTreeViewWidget::restoreState( QDataStream &stream ) +void KonqTreeViewWidget::restoreState( TQDataStream &stream ) { stream >> m_urlsToOpen; KonqBaseListViewWidget::restoreState( stream ); @@ -148,7 +148,7 @@ void KonqTreeViewWidget::slotClear( const KURL & _url ) if ( item ) { // search all subdirs of _url (item) - QDictIterator it( m_dictSubDirs ); + TQDictIterator it( m_dictSubDirs ); while ( it.current() ) { if ( !_url.equals( it.currentKey(), true ) @@ -168,7 +168,7 @@ void KonqTreeViewWidget::slotClear( const KURL & _url ) // the following code. // delete all child items, their fileitems are no longer valid - QListViewItem *child; + TQListViewItem *child; while ( (child = item->firstChild()) ) delete child; @@ -192,7 +192,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries ) if (!entries.count()) return; // Find parent item - it's the same for all the items - QPtrListIterator kit( entries ); + TQPtrListIterator kit( entries ); KURL dir( (*kit)->url().upURL() ); KonqListViewDir *parentDir = 0L; @@ -201,7 +201,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries ) if ( !parentDir ) // hack for zeroconf://domain/type/service listed in zeroconf:/type/ dir { - dir.setHost( QString::null ); + dir.setHost( TQString::null ); parentDir = m_dictSubDirs[ dir.url(-1) ]; } @@ -246,7 +246,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries ) } if ( !m_itemsToSelect.isEmpty() ) { - QStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); setSelected( fileItem ? fileItem : dirItem, true ); @@ -258,7 +258,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries ) if ( dirItem ) { - QString u = (*kit)->url().url( 0 ); + TQString u = (*kit)->url().url( 0 ); if ( m_urlsToOpen.remove( u ) ) dirItem->open( true, false ); else if ( m_urlsToReload.remove( u ) ) @@ -280,7 +280,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries ) void KonqTreeViewWidget::slotDeleteItem( KFileItem *_fileItem ) { - QString url = _fileItem->url().url(-1); + TQString url = _fileItem->url().url(-1); // Check if this item is in m_dictSubDirs, and if yes, then remove it slotClear( _fileItem->url() ); diff --git a/konqueror/listview/konq_treeviewwidget.h b/konqueror/listview/konq_treeviewwidget.h index 86119a8bf..3f08cc3d5 100644 --- a/konqueror/listview/konq_treeviewwidget.h +++ b/konqueror/listview/konq_treeviewwidget.h @@ -21,7 +21,7 @@ #include "konq_listviewwidget.h" #include "konq_treeviewitem.h" -#include +#include #include #include @@ -34,13 +34,13 @@ class KonqTreeViewWidget : public KonqBaseListViewWidget Q_OBJECT public: - KonqTreeViewWidget( KonqListView *parent, QWidget *parentWidget ); + KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget ); virtual ~KonqTreeViewWidget(); virtual bool openURL( const KURL &url ); - virtual void saveState( QDataStream &stream ); - virtual void restoreState( QDataStream &stream ); + virtual void saveState( TQDataStream &stream ); + virtual void restoreState( TQDataStream &stream ); protected slots: // slots connected to the directory lister @@ -53,15 +53,15 @@ protected slots: virtual void slotDeleteItem( KFileItem *_fileTtem ); protected: - KonqListViewDir *findDir( const QString &_url ); + KonqListViewDir *findDir( const TQString &_url ); void openSubFolder( KonqListViewDir *_dir, bool _reload ); void stopListingSubFolder( KonqListViewDir *_dir ); // URL -> item (for directories only) - QDict m_dictSubDirs; + TQDict m_dictSubDirs; - QStringList m_urlsToOpen, m_urlsToReload; + TQStringList m_urlsToOpen, m_urlsToReload; }; #endif diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cc index a60604e86..23c1704d9 100644 --- a/konqueror/preloader/preloader.cc +++ b/konqueror/preloader/preloader.cc @@ -26,14 +26,14 @@ #include #include -KonqyPreloader::KonqyPreloader( const QCString& obj ) +KonqyPreloader::KonqyPreloader( const TQCString& obj ) : KDEDModule( obj ) { reconfigure(); - connect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString& )), - SLOT( appRemoved( const QCString& ))); - connect( &check_always_preloaded_timer, SIGNAL( timeout()), - SLOT( checkAlwaysPreloaded())); + connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& )), + TQT_SLOT( appRemoved( const TQCString& ))); + connect( &check_always_preloaded_timer, TQT_SIGNAL( timeout()), + TQT_SLOT( checkAlwaysPreloaded())); } KonqyPreloader::~KonqyPreloader() @@ -41,7 +41,7 @@ KonqyPreloader::~KonqyPreloader() updateCount(); } -bool KonqyPreloader::registerPreloadedKonqy( QCString id, int screen ) +bool KonqyPreloader::registerPreloadedKonqy( TQCString id, int screen ) { if( instances.count() >= (uint)KonqSettings::maxPreloadCount() ) return false; @@ -49,7 +49,7 @@ bool KonqyPreloader::registerPreloadedKonqy( QCString id, int screen ) return true; } -QCString KonqyPreloader::getPreloadedKonqy( int screen ) +TQCString KonqyPreloader::getPreloadedKonqy( int screen ) { if( instances.count() == 0 ) return ""; @@ -59,7 +59,7 @@ QCString KonqyPreloader::getPreloadedKonqy( int screen ) { if( (*it).screen == screen ) { - QCString ret = (*it).id; + TQCString ret = (*it).id; instances.remove( it ); check_always_preloaded_timer.start( 5000, true ); return ret; @@ -68,7 +68,7 @@ QCString KonqyPreloader::getPreloadedKonqy( int screen ) return ""; } -void KonqyPreloader::unregisterPreloadedKonqy( QCString id_P ) +void KonqyPreloader::unregisterPreloadedKonqy( TQCString id_P ) { for( InstancesList::Iterator it = instances.begin(); it != instances.end(); @@ -80,7 +80,7 @@ void KonqyPreloader::unregisterPreloadedKonqy( QCString id_P ) } } -void KonqyPreloader::appRemoved( const QCString& id ) +void KonqyPreloader::appRemoved( const TQCString& id ) { unregisterPreloadedKonqy( id ); } @@ -109,8 +109,8 @@ void KonqyPreloader::updateCount() { if( !check_always_preloaded_timer.isActive()) { - if( kapp->kdeinitExec( QString::fromLatin1( "konqueror" ), - QStringList() << QString::fromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 ) + if( kapp->kdeinitExec( TQString::fromLatin1( "konqueror" ), + TQStringList() << TQString::fromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 ) { kdDebug( 1202 ) << "Preloading Konqueror instance" << endl; check_always_preloaded_timer.start( 5000, true ); @@ -143,7 +143,7 @@ void KonqyPreloader::unloadAllPreloaded() } extern "C" -KDE_EXPORT KDEDModule *create_konqy_preloader( const QCString& obj ) +KDE_EXPORT KDEDModule *create_konqy_preloader( const TQCString& obj ) { return new KonqyPreloader( obj ); } diff --git a/konqueror/preloader/preloader.h b/konqueror/preloader/preloader.h index 2a667e462..c2767522b 100644 --- a/konqueror/preloader/preloader.h +++ b/konqueror/preloader/preloader.h @@ -21,7 +21,7 @@ #define _KONQUEROR_PRELOADER_H #include -#include +#include class KonqyPreloader : public KDEDModule @@ -29,30 +29,30 @@ class KonqyPreloader Q_OBJECT K_DCOP public: - KonqyPreloader( const QCString& obj ); + KonqyPreloader( const TQCString& obj ); virtual ~KonqyPreloader(); k_dcop: - bool registerPreloadedKonqy( QCString id, int screen ); - QCString getPreloadedKonqy( int screen ); - ASYNC unregisterPreloadedKonqy( QCString id ); + bool registerPreloadedKonqy( TQCString id, int screen ); + TQCString getPreloadedKonqy( int screen ); + ASYNC unregisterPreloadedKonqy( TQCString id ); void reconfigure(); void unloadAllPreloaded(); private slots: - void appRemoved( const QCString& id ); + void appRemoved( const TQCString& id ); void checkAlwaysPreloaded(); private: void updateCount(); struct KonqyData { KonqyData() {}; // for QValueList - KonqyData( const QCString& id_P, int screen_P ) + KonqyData( const TQCString& id_P, int screen_P ) : id( id_P ), screen( screen_P ) {} - QCString id; + TQCString id; int screen; }; - typedef QValueList< KonqyData > InstancesList; + typedef TQValueList< KonqyData > InstancesList; InstancesList instances; - QTimer check_always_preloaded_timer; + TQTimer check_always_preloaded_timer; }; #endif diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index b771b0a09..7d84071fc 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -41,25 +41,25 @@ #include "kremoteencodingplugin.h" -#define DATA_KEY QString::fromLatin1("Charset") +#define DATA_KEY TQString::fromLatin1("Charset") -KRemoteEncodingPlugin::KRemoteEncodingPlugin(QObject * parent, +KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent, const char *name, - const QStringList &) + const TQStringList &) : KParts::Plugin(parent, name), m_loaded(false), m_idDefault(0) { m_menu = new KActionMenu(i18n("Select Remote Charset"), "charset", actionCollection(), "changeremoteencoding"); - connect(m_menu->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotAboutToShow())); + connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(slotAboutToShow())); m_menu->setEnabled(false); m_menu->setDelayed(false); m_part = dynamic_cast(parent); if (m_part) // if parent is not a KonqDirPart, our menu will never show - QObject::connect(m_part, SIGNAL(aboutToOpenURL()), - this, SLOT(slotAboutToOpenURL())); + TQObject::connect(m_part, TQT_SIGNAL(aboutToOpenURL()), + this, TQT_SLOT(slotAboutToOpenURL())); } KRemoteEncodingPlugin::~KRemoteEncodingPlugin() @@ -114,14 +114,14 @@ KRemoteEncodingPlugin::fillMenu() KPopupMenu *menu = m_menu->popupMenu(); menu->clear(); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; int count = 0; for (it = m_encodingDescriptions.begin(); it != m_encodingDescriptions.end(); ++it) - menu->insertItem(*it, this, SLOT(slotItemSelected(int)), 0, ++count); + menu->insertItem(*it, this, TQT_SLOT(slotItemSelected(int)), 0, ++count); menu->insertSeparator(); - menu->insertItem(i18n("Reload"), this, SLOT(slotReload()), 0, ++count); - menu->insertItem(i18n("Default"), this, SLOT(slotDefault()), 0, ++count); + menu->insertItem(i18n("Reload"), this, TQT_SLOT(slotReload()), 0, ++count); + menu->insertItem(i18n("Default"), this, TQT_SLOT(slotDefault()), 0, ++count); m_idDefault = count; } @@ -135,12 +135,12 @@ KRemoteEncodingPlugin::updateMenu() for (unsigned i = 0; i < m_menu->popupMenu()->count(); i++) m_menu->popupMenu()->setItemChecked(m_menu->popupMenu()->idAt(i), false); - QString charset = KIO::SlaveConfig::self()->configData(m_currentURL.protocol(), m_currentURL.host(), + TQString charset = KIO::SlaveConfig::self()->configData(m_currentURL.protocol(), m_currentURL.host(), DATA_KEY); if (!charset.isEmpty()) { int id = 1; - QStringList::Iterator it; + TQStringList::Iterator it; for (it = m_encodingDescriptions.begin(); it != m_encodingDescriptions.end(); ++it, ++id) if ((*it).find(charset) != -1) break; @@ -168,11 +168,11 @@ void KRemoteEncodingPlugin::slotItemSelected(int id) { KConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1()); - QString host = m_currentURL.host(); + TQString host = m_currentURL.host(); if (!m_menu->popupMenu()->isItemChecked(id)) { - QString charset = KGlobal::charsets()->encodingForName(m_encodingDescriptions[id - 1]); + TQString charset = KGlobal::charsets()->encodingForName(m_encodingDescriptions[id - 1]); config.setGroup(host); config.writeEntry(DATA_KEY, charset); @@ -190,12 +190,12 @@ KRemoteEncodingPlugin::slotDefault() // settings here since it affects what will be matched. KConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1()); - QStringList partList = QStringList::split('.', m_currentURL.host(), false); + TQStringList partList = TQStringList::split('.', m_currentURL.host(), false); if (!partList.isEmpty()) { partList.remove(partList.begin()); - QStringList domains; + TQStringList domains; // Remove the exact name match... domains << m_currentURL.host(); @@ -212,7 +212,7 @@ KRemoteEncodingPlugin::slotDefault() partList.remove(partList.begin()); } - for (QStringList::Iterator it = domains.begin(); it != domains.end(); + for (TQStringList::Iterator it = domains.begin(); it != domains.end(); it++) { kdDebug() << k_funcinfo << "Domain to remove: " << *it << endl; @@ -237,18 +237,18 @@ KRemoteEncodingPlugin::updateBrowser() if (!client->attach()) kdDebug() << "Can't connect with DCOP server." << endl; - QByteArray data; - QDataStream stream(data, IO_WriteOnly); - stream << QString::null; + TQByteArray data; + TQDataStream stream(data, IO_WriteOnly); + stream << TQString::null; // use call to make sure reparsing is done before reloading the url QCStringList apps = client->registeredApplications(); for( QCStringList::ConstIterator it = apps.begin(); it != apps.end(); ++it ) { - QCString rtype; - QByteArray rdata; - client->call( *it, "KIO::Scheduler", "reparseSlaveConfiguration(QString)", + TQCString rtype; + TQByteArray rdata; + client->call( *it, "KIO::Scheduler", "reparseSlaveConfiguration(TQString)", data, rtype, rdata); } delete client; diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.h b/konqueror/remoteencodingplugin/kremoteencodingplugin.h index 85c77efa3..b518da326 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.h +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.h @@ -21,7 +21,7 @@ #ifndef REMOTEENCODING_PLUGIN_H #define REMOTEENCODING_PLUGIN_H -#include +#include #include #include #include @@ -34,8 +34,8 @@ class KRemoteEncodingPlugin: public KParts::Plugin { Q_OBJECT public: - KRemoteEncodingPlugin(QObject * parent, const char *name, - const QStringList &); + KRemoteEncodingPlugin(TQObject * parent, const char *name, + const TQStringList &); ~KRemoteEncodingPlugin(); protected slots: @@ -53,7 +53,7 @@ private: KonqDirPart *m_part; KActionMenu *m_menu; - QStringList m_encodingDescriptions; + TQStringList m_encodingDescriptions; KURL m_currentURL; bool m_loaded; diff --git a/konqueror/shellcmdplugin/kshellcmddialog.cpp b/konqueror/shellcmdplugin/kshellcmddialog.cpp index b39e35cd3..eefa57337 100644 --- a/konqueror/shellcmdplugin/kshellcmddialog.cpp +++ b/konqueror/shellcmdplugin/kshellcmddialog.cpp @@ -17,9 +17,9 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include +#include +#include +#include #include #include @@ -28,15 +28,15 @@ #include "kshellcmddialog.h" #include "kshellcmdexecutor.h" -KShellCommandDialog::KShellCommandDialog(const QString& title, const QString& command, QWidget* parent, bool modal) +KShellCommandDialog::KShellCommandDialog(const TQString& title, const TQString& command, TQWidget* parent, bool modal) :KDialog(parent,"p",modal) { - QVBoxLayout * box=new QVBoxLayout (this,marginHint(),spacingHint()); + TQVBoxLayout * box=new TQVBoxLayout (this,marginHint(),spacingHint()); - QLabel *label=new QLabel(title,this); + TQLabel *label=new TQLabel(title,this); m_shell=new KShellCommandExecutor(command,this); - QHBox *buttonsBox=new QHBox(this); + TQHBox *buttonsBox=new TQHBox(this); buttonsBox->setSpacing(spacingHint()); cancelButton= new KPushButton(KStdGuiItem::cancel(), buttonsBox); @@ -54,9 +54,9 @@ KShellCommandDialog::KShellCommandDialog(const QString& title, const QString& co m_shell->setFocus(); - connect(cancelButton, SIGNAL(clicked()), m_shell, SLOT(slotFinished())); - connect(m_shell, SIGNAL(finished()), this, SLOT(disableStopButton())); - connect(closeButton,SIGNAL(clicked()), this, SLOT(slotClose())); + connect(cancelButton, TQT_SIGNAL(clicked()), m_shell, TQT_SLOT(slotFinished())); + connect(m_shell, TQT_SIGNAL(finished()), this, TQT_SLOT(disableStopButton())); + connect(closeButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose())); } KShellCommandDialog::~KShellCommandDialog() diff --git a/konqueror/shellcmdplugin/kshellcmddialog.h b/konqueror/shellcmdplugin/kshellcmddialog.h index 790c8e0d0..868028050 100644 --- a/konqueror/shellcmdplugin/kshellcmddialog.h +++ b/konqueror/shellcmdplugin/kshellcmddialog.h @@ -20,7 +20,7 @@ #ifndef SHELLCOMMANDDIALOG_H #define SHELLCOMMANDDIALOG_H -#include +#include #include #include @@ -31,7 +31,7 @@ class KShellCommandDialog:public KDialog { Q_OBJECT public: - KShellCommandDialog(const QString& title, const QString& command, QWidget* parent=0, bool modal=false); + KShellCommandDialog(const TQString& title, const TQString& command, TQWidget* parent=0, bool modal=false); virtual ~KShellCommandDialog(); //blocking int executeCommand(); diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp index c83488005..167f0f812 100644 --- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp +++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp @@ -24,15 +24,15 @@ #include #include -#include +#include #include #include #include #include -KShellCommandExecutor::KShellCommandExecutor(const QString& command, QWidget* parent) -:QTextView(parent) +KShellCommandExecutor::KShellCommandExecutor(const TQString& command, TQWidget* parent) +:TQTextView(parent) ,m_shellProcess(0) ,m_command(command) ,m_readNotifier(0) @@ -73,7 +73,7 @@ int KShellCommandExecutor::exec() args+=m_command.local8Bit(); //kdDebug()<<"------- executing: "<fd(),QSocketNotifier::Read, this); - m_writeNotifier=new QSocketNotifier(m_shellProcess->fd(),QSocketNotifier::Write, this); + m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, this); + m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, this); m_writeNotifier->setEnabled(false); - connect (m_readNotifier, SIGNAL(activated(int)), this,SLOT(readDataFromShell())); - connect (m_writeNotifier, SIGNAL(activated(int)), this,SLOT(writeDataToShell())); + connect (m_readNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(readDataFromShell())); + connect (m_writeNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(writeDataToShell())); return 1; } @@ -108,7 +108,7 @@ void KShellCommandExecutor::readDataFromShell() { //kdDebug()<<"***********************\n"<append(QString::fromLocal8Bit(buffer)); + this->append(TQString::fromLocal8Bit(buffer)); setTextFormat(PlainText); }; } @@ -117,11 +117,11 @@ void KShellCommandExecutor::writeDataToShell() { //kdDebug()<<"--------- writing ------------"<fd(),input,input.length()); ::write(m_shellProcess->fd(),"\n",1); } diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.h b/konqueror/shellcmdplugin/kshellcmdexecutor.h index 66b066a85..db19e4105 100644 --- a/konqueror/shellcmdplugin/kshellcmdexecutor.h +++ b/konqueror/shellcmdplugin/kshellcmdexecutor.h @@ -20,8 +20,8 @@ #ifndef SHELLCOMMANDEXECUTOR_H #define SHELLCOMMANDEXECUTOR_H -#include -#include +#include +#include class PtyProcess; class QSocketNotifier; @@ -30,7 +30,7 @@ class KShellCommandExecutor:public QTextView { Q_OBJECT public: - KShellCommandExecutor(const QString& command, QWidget* parent=0); + KShellCommandExecutor(const TQString& command, TQWidget* parent=0); virtual ~KShellCommandExecutor(); int exec(); signals: @@ -39,9 +39,9 @@ class KShellCommandExecutor:public QTextView void slotFinished(); protected: PtyProcess *m_shellProcess; - QString m_command; - QSocketNotifier *m_readNotifier; - QSocketNotifier *m_writeNotifier; + TQString m_command; + TQSocketNotifier *m_readNotifier; + TQSocketNotifier *m_writeNotifier; protected slots: void readDataFromShell(); void writeDataToShell(); diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp index b7f07ec81..7c39fb826 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp +++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp @@ -26,15 +26,15 @@ #include #include -KShellCmdPlugin::KShellCmdPlugin( QObject* parent, const char* name, - const QStringList & ) +KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name, + const TQStringList & ) : KParts::Plugin( parent, name ) { if (!kapp->authorize("shell_access")) return; new KAction( i18n( "&Execute Shell Command..." ), "run", CTRL+Key_E, this, - SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" ); + TQT_SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" ); } void KShellCmdPlugin::slotExecuteShellCommand() @@ -51,7 +51,7 @@ void KShellCmdPlugin::slotExecuteShellCommand() KMessageBox::sorry(part->widget(),i18n("Executing shell commands works only on local directories.")); return; } - QString path; + TQString path; if ( part->currentItem() ) { // Putting the complete path to the selected file isn't really necessary, @@ -65,12 +65,12 @@ void KShellCmdPlugin::slotExecuteShellCommand() path = url.path(); } bool ok; - QString cmd = KInputDialog::getText( i18n("Execute Shell Command"), + TQString cmd = KInputDialog::getText( i18n("Execute Shell Command"), i18n( "Execute shell command in current directory:" ), KProcess::quote( path ), &ok, part->widget() ); if ( ok ) { - QString chDir; + TQString chDir; chDir="cd "; chDir+=KProcess::quote(part->url().path()); chDir+="; "; diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.h b/konqueror/shellcmdplugin/kshellcmdplugin.h index 3e1415803..f942c82bf 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.h +++ b/konqueror/shellcmdplugin/kshellcmdplugin.h @@ -26,7 +26,7 @@ class KShellCmdPlugin : public KParts::Plugin { Q_OBJECT public: - KShellCmdPlugin( QObject* parent, const char* name, const QStringList & ); + KShellCmdPlugin( TQObject* parent, const char* name, const TQStringList & ); ~KShellCmdPlugin() {} public slots: diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index ae2880b13..bdc99a4ca 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -19,11 +19,11 @@ #include #include -#include +#include #include -KonqSidebar::KonqSidebar( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, bool universalMode ) +KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, bool universalMode ) : KParts::ReadOnlyPart(parent, name),KonqSidebarIface() { // we need an instance @@ -32,11 +32,11 @@ KonqSidebar::KonqSidebar( QWidget *parentWidget, const char *widgetName, // this should be your custom internal widget m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() ); m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" ); - connect(m_widget,SIGNAL(started(KIO::Job *)), - this, SIGNAL(started(KIO::Job*))); - connect(m_widget,SIGNAL(completed()),this,SIGNAL(completed())); - connect(m_extension, SIGNAL(addWebSideBar(const KURL&, const QString&)), - m_widget, SLOT(addWebSideBar(const KURL&, const QString&))); + connect(m_widget,TQT_SIGNAL(started(KIO::Job *)), + this, TQT_SIGNAL(started(KIO::Job*))); + connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); + connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)), + m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&))); KAcceleratorManager::setNoAccel(m_widget); setWidget(m_widget); } @@ -62,14 +62,14 @@ bool KonqSidebar::openURL(const KURL &url) { else return false; } -void KonqSidebar::customEvent(QCustomEvent* ev) +void KonqSidebar::customEvent(TQCustomEvent* ev) { if (KonqFileSelectionEvent::test(ev) || KonqFileMouseOverEvent::test(ev) || KonqConfigEvent::test(ev)) { // Forward the event to the widget - QApplication::sendEvent( m_widget, ev ); + TQApplication::sendEvent( m_widget, ev ); } } @@ -97,15 +97,15 @@ KonqSidebarFactory::~KonqSidebarFactory() s_about = 0L; } -KParts::Part* KonqSidebarFactory::createPartObject( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char * /*classname*/, const QStringList &args ) +KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, + const char * /*classname*/, const TQStringList &args ) { // Create an instance of our Part KonqSidebar* obj = new KonqSidebar( parentWidget, widgetName, parent, name, args.contains("universal") ); // See if we are to be read-write or not -// if (QCString(classname) == "KParts::ReadOnlyPart") +// if (TQCString(classname) == "KParts::ReadOnlyPart") // obj->setReadWrite(false); return obj; diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h index 32a5f5679..cb321bf6d 100644 --- a/konqueror/sidebar/konqsidebar.h +++ b/konqueror/sidebar/konqsidebar.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "sidebar_widget.h" #include "konqsidebariface_p.h" @@ -43,7 +43,7 @@ class KonqSidebarBrowserExtension : public KParts::BrowserExtension ~KonqSidebarBrowserExtension(){;} protected: - QGuardedPtr widget; + TQGuardedPtr widget; // The following slots are needed for konqueror's standard actions @@ -77,8 +77,8 @@ public: /** * Default constructor */ - KonqSidebar(QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name,bool universalMode); + KonqSidebar(TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name,bool universalMode); /** * Destructor @@ -97,7 +97,7 @@ protected: KonqSidebarBrowserExtension * m_extension; virtual bool openFile(); - virtual void customEvent(QCustomEvent* ev); + virtual void customEvent(TQCustomEvent* ev); private: class Sidebar_Widget *m_widget; @@ -113,9 +113,9 @@ class KonqSidebarFactory : public KParts::Factory public: KonqSidebarFactory(); virtual ~KonqSidebarFactory(); - virtual KParts::Part* createPartObject( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char *classname, const QStringList &args ); + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, + const char *classname, const TQStringList &args ); static KInstance* instance(); private: diff --git a/konqueror/sidebar/konqsidebarplugin.cpp b/konqueror/sidebar/konqsidebarplugin.cpp index b2b7d9f17..75e762d35 100644 --- a/konqueror/sidebar/konqsidebarplugin.cpp +++ b/konqueror/sidebar/konqsidebarplugin.cpp @@ -22,9 +22,9 @@ #include -KonqSidebarPlugin::KonqSidebarPlugin(KInstance *instance,QObject *parent, - QWidget * /*widgetParent*/, QString &desktopName_, const char* name) - : QObject(parent,name), desktopName(desktopName_) +KonqSidebarPlugin::KonqSidebarPlugin(KInstance *instance,TQObject *parent, + TQWidget * /*widgetParent*/, TQString &desktopName_, const char* name) + : TQObject(parent,name), desktopName(desktopName_) { m_parentInstance=instance; } diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h index ad931070f..d3ecf7ce4 100644 --- a/konqueror/sidebar/konqsidebarplugin.h +++ b/konqueror/sidebar/konqsidebarplugin.h @@ -18,14 +18,14 @@ */ #ifndef _konqsidebarplugin_h_ #define _konqsidebarplugin_h_ -#include -#include +#include +#include #include -#include +#include #include #include #include -#include +#include #include class KonqSidebarPluginPrivate; @@ -34,16 +34,16 @@ class KDE_EXPORT KonqSidebarPlugin : public QObject { Q_OBJECT public: - KonqSidebarPlugin(KInstance *instance,QObject *parent,QWidget *widgetParent,QString &desktopName_, const char* name=0); + KonqSidebarPlugin(KInstance *instance,TQObject *parent,TQWidget *widgetParent,TQString &desktopName_, const char* name=0); ~KonqSidebarPlugin(); - virtual QWidget *getWidget()=0; - virtual void *provides(const QString &)=0; + virtual TQWidget *getWidget()=0; + virtual void *provides(const TQString &)=0; KInstance *parentInstance(); protected: virtual void handleURL(const KURL &url)=0; virtual void handlePreview(const KFileItemList & items); virtual void handlePreviewOnMouseOver(const KFileItem &items); //not used yet, perhaps in KDE 3.1 - QString desktopName; + TQString desktopName; KInstance* m_parentInstance; private: @@ -53,8 +53,8 @@ class KDE_EXPORT KonqSidebarPlugin : public QObject void requestURL(KURL&); void started(KIO::Job *); void completed(); - void setIcon(const QString& icon); - void setCaption(const QString& caption); + void setIcon(const TQString& icon); + void setCaption(const TQString& caption); protected: @@ -67,7 +67,7 @@ class KDE_EXPORT KonqSidebarPlugin : public QObject void openPreviewOnMouseOver(const KFileItem& item); // not used yet, perhaps KDE 3.1 /* if your plugin supports a setup dialog, instead (replaces the url menu entry in the popup) (not supported yet) - void setup(QWidget *parent); + void setup(TQWidget *parent); */ @@ -79,16 +79,16 @@ class KDE_EXPORT KonqSidebarPlugin : public QObject void enableAction( const char * name, bool enabled ); - void popupMenu( const QPoint &global, const KFileItemList &items ); - void popupMenu( KXMLGUIClient *client, const QPoint &global, const KFileItemList &items ); - void popupMenu( const QPoint &global, const KURL &url, - const QString &mimeType, mode_t mode = (mode_t)-1 ); + void popupMenu( const TQPoint &global, const KFileItemList &items ); + void popupMenu( KXMLGUIClient *client, const TQPoint &global, const KFileItemList &items ); + void popupMenu( const TQPoint &global, const KURL &url, + const TQString &mimeType, mode_t mode = (mode_t)-1 ); void popupMenu( KXMLGUIClient *client, - const QPoint &global, const KURL &url, - const QString &mimeType, mode_t mode = (mode_t)-1 ); + const TQPoint &global, const KURL &url, + const TQString &mimeType, mode_t mode = (mode_t)-1 ); - void showError(QString &); //for later extension - void showMessage(QString &); //for later extension + void showError(TQString &); //for later extension + void showMessage(TQString &); //for later extension */ diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index 3b402b25e..b4940e8e5 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -18,13 +18,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -49,17 +49,17 @@ #include "sidebar_widget.moc" -addBackEnd::addBackEnd(QWidget *parent, class QPopupMenu *addmenu, - bool universal, const QString ¤tProfile, +addBackEnd::addBackEnd(TQWidget *parent, class TQPopupMenu *addmenu, + bool universal, const TQString ¤tProfile, const char *name) - : QObject(parent,name), + : TQObject(parent,name), m_parent(parent) { m_universal=universal; m_currentProfile = currentProfile; menu = addmenu; - connect(menu,SIGNAL(aboutToShow()),this,SLOT(aboutToShowAddMenu())); - connect(menu,SIGNAL(activated(int)),this,SLOT(activatedAddMenu(int))); + connect(menu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(aboutToShowAddMenu())); + connect(menu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activatedAddMenu(int))); } void addBackEnd::aboutToShowAddMenu() @@ -67,7 +67,7 @@ void addBackEnd::aboutToShowAddMenu() if (!menu) return; KStandardDirs *dirs = KGlobal::dirs(); - QStringList list = dirs->findAllResources("data","konqsidebartng/add/*.desktop",true,true); + TQStringList list = dirs->findAllResources("data","konqsidebartng/add/*.desktop",true,true); libNames.setAutoDelete(true); libNames.resize(0); libParam.setAutoDelete(true); @@ -75,7 +75,7 @@ void addBackEnd::aboutToShowAddMenu() menu->clear(); int i = 0; - for (QStringList::Iterator it = list.begin(); it != list.end(); ++it, i++ ) + for (TQStringList::Iterator it = list.begin(); it != list.end(); ++it, i++ ) { KDesktopFile *confFile; @@ -98,7 +98,7 @@ void addBackEnd::aboutToShowAddMenu() continue; } } - QString icon = confFile->readIcon(); + TQString icon = confFile->readIcon(); if (!icon.isEmpty()) { menu->insertItem(SmallIcon(icon), @@ -107,9 +107,9 @@ void addBackEnd::aboutToShowAddMenu() menu->insertItem(confFile->readEntry("Name"), i); } libNames.resize(libNames.size()+1); - libNames.insert(libNames.count(), new QString(confFile->readEntry("X-KDE-KonqSidebarAddModule"))); + libNames.insert(libNames.count(), new TQString(confFile->readEntry("X-KDE-KonqSidebarAddModule"))); libParam.resize(libParam.size()+1); - libParam.insert(libParam.count(), new QString(confFile->readEntry("X-KDE-KonqSidebarAddParam"))); + libParam.insert(libParam.count(), new TQString(confFile->readEntry("X-KDE-KonqSidebarAddParam"))); delete confFile; } menu->insertSeparator(); @@ -122,12 +122,12 @@ void addBackEnd::doRollBack() if (KMessageBox::warningContinueCancel(m_parent, i18n("This removes all your entries from the sidebar and adds the system default ones.
This procedure is irreversible
Do you want to proceed?"))==KMessageBox::Continue) { KStandardDirs *dirs = KGlobal::dirs(); - QString loc=dirs->saveLocation("data","konqsidebartng/" + m_currentProfile + "/",true); - QDir dir(loc); - QStringList dirEntries = dir.entryList( QDir::Dirs | QDir::NoSymLinks ); + TQString loc=dirs->saveLocation("data","konqsidebartng/" + m_currentProfile + "/",true); + TQDir dir(loc); + TQStringList dirEntries = dir.entryList( TQDir::Dirs | TQDir::NoSymLinks ); dirEntries.remove("."); dirEntries.remove(".."); - for ( QStringList::Iterator it = dirEntries.begin(); it != dirEntries.end(); ++it ) { + for ( TQStringList::Iterator it = dirEntries.begin(); it != dirEntries.end(); ++it ) { if ((*it)!="add") KIO::NetAccess::del(KURL( loc+(*it) ), m_parent); } @@ -136,10 +136,10 @@ void addBackEnd::doRollBack() } -static QString findFileName(const QString* tmpl,bool universal, const QString &profile) { - QString myFile, filename; +static TQString findFileName(const TQString* tmpl,bool universal, const TQString &profile) { + TQString myFile, filename; KStandardDirs *dirs = KGlobal::dirs(); - QString tmp = *tmpl; + TQString tmp = *tmpl; if (universal) { dirs->saveLocation("data", "konqsidebartng/kicker_entries/", true); @@ -151,14 +151,14 @@ static QString findFileName(const QString* tmpl,bool universal, const QString &p filename = tmp.arg(""); myFile = locateLocal("data", filename); - if (QFile::exists(myFile)) { + if (TQFile::exists(myFile)) { for (ulong l = 0; l < ULONG_MAX; l++) { filename = tmp.arg(l); myFile = locateLocal("data", filename); - if (!QFile::exists(myFile)) { + if (!TQFile::exists(myFile)) { break; } else { - myFile = QString::null; + myFile = TQString::null; } } } @@ -168,7 +168,7 @@ static QString findFileName(const QString* tmpl,bool universal, const QString &p void addBackEnd::activatedAddMenu(int id) { - kdDebug() << "activatedAddMenu: " << QString("%1").arg(id) << endl; + kdDebug() << "activatedAddMenu: " << TQString("%1").arg(id) << endl; if (((uint)id) == libNames.size()) doRollBack(); if(((uint)id) >= libNames.size()) @@ -177,32 +177,32 @@ void addBackEnd::activatedAddMenu(int id) KLibLoader *loader = KLibLoader::self(); // try to load the library - QString libname = *libNames.at(id); - KLibrary *lib = loader->library(QFile::encodeName(libname)); + TQString libname = *libNames.at(id); + KLibrary *lib = loader->library(TQFile::encodeName(libname)); if (lib) { // get the create_ function - QString factory("add_"); + TQString factory("add_"); factory = factory+(*libNames.at(id)); - void *add = lib->symbol(QFile::encodeName(factory)); + void *add = lib->symbol(TQFile::encodeName(factory)); if (add) { //call the add function - bool (*func)(QString*, QString*, QMap *); - QMap map; - func = (bool (*)(QString*, QString*, QMap *)) add; - QString *tmp = new QString(""); + bool (*func)(TQString*, TQString*, TQMap *); + TQMap map; + func = (bool (*)(TQString*, TQString*, TQMap *)) add; + TQString *tmp = new TQString(""); if (func(tmp,libParam.at(id),&map)) { - QString myFile = findFileName(tmp,m_universal,m_currentProfile); + TQString myFile = findFileName(tmp,m_universal,m_currentProfile); if (!myFile.isEmpty()) { kdDebug() <<"trying to save to file: "<::ConstIterator it = map.begin(); it != map.end(); ++it) { + for (TQMap::ConstIterator it = map.begin(); it != map.end(); ++it) { kdDebug() <<"writing:"<setResizeMode(parent, QSplitter::FollowSizeHint); + splitterWidget->setResizeMode(parent, TQSplitter::FollowSizeHint); splitterWidget->setOpaqueResize( false ); - connect(splitterWidget,SIGNAL(setRubberbandCalled()),SLOT(userMovedSplitter())); + connect(splitterWidget,TQT_SIGNAL(setRubberbandCalled()),TQT_SLOT(userMovedSplitter())); } m_area = new KDockArea(this); - m_area->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); + m_area->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); m_mainDockWidget = m_area->createDockWidget("free", 0); - m_mainDockWidget->setWidget(new QWidget(m_mainDockWidget)); + m_mainDockWidget->setWidget(new TQWidget(m_mainDockWidget)); m_area->setMainDockWidget(m_mainDockWidget); m_area->setMinimumWidth(0); m_mainDockWidget->setDockSite(KDockWidget::DockTop); @@ -272,8 +272,8 @@ Sidebar_Widget::Sidebar_Widget(QWidget *parent, KParts::ReadOnlyPart *par, const m_buttonBar = new KMultiTabBar(KMultiTabBar::Vertical,this); m_buttonBar->showActiveTabTexts(true); - m_menu = new QPopupMenu(this, "Sidebar_Widget::Menu"); - QPopupMenu *addMenu = new QPopupMenu(this, "Sidebar_Widget::addPopup"); + m_menu = new TQPopupMenu(this, "Sidebar_Widget::Menu"); + TQPopupMenu *addMenu = new TQPopupMenu(this, "Sidebar_Widget::addPopup"); m_menu->insertItem(i18n("Add New"), addMenu, 0); m_menu->insertItem(i18n("Multiple Views"), 1); m_menu->insertItem(i18n("Show Tabs Left"), 2); @@ -281,22 +281,22 @@ Sidebar_Widget::Sidebar_Widget(QWidget *parent, KParts::ReadOnlyPart *par, const if (!m_universalMode) { m_menu->insertItem(SmallIconSet("remove"), i18n("Close Navigation Panel"), - par, SLOT(deleteLater())); + par, TQT_SLOT(deleteLater())); } - connect(m_menu, SIGNAL(aboutToShow()), - this, SLOT(aboutToShowConfigMenu())); - connect(m_menu, SIGNAL(activated(int)), - this, SLOT(activatedMenu(int))); + connect(m_menu, TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(aboutToShowConfigMenu())); + connect(m_menu, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(activatedMenu(int))); m_buttonPopup = 0; addBackEnd *ab = new addBackEnd(this, addMenu, universalMode, currentProfile, "Sidebar_Widget-addBackEnd"); - connect(ab, SIGNAL(updateNeeded()), - this, SLOT(updateButtons())); - connect(ab, SIGNAL(initialCopyNeeded()), - this, SLOT(finishRollBack())); + connect(ab, TQT_SIGNAL(updateNeeded()), + this, TQT_SLOT(updateButtons())); + connect(ab, TQT_SIGNAL(initialCopyNeeded()), + this, TQT_SLOT(finishRollBack())); initialCopy(); @@ -316,31 +316,31 @@ Sidebar_Widget::Sidebar_Widget(QWidget *parent, KParts::ReadOnlyPart *par, const m_menu->setItemVisible(2, !m_immutableShowTabsLeft); m_menu->setItemVisible(3, !m_immutableShowExtraButtons); - connect(&m_configTimer, SIGNAL(timeout()), - this, SLOT(saveConfig())); + connect(&m_configTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(saveConfig())); m_somethingVisible = !m_openViews.isEmpty(); doLayout(); - QTimer::singleShot(0,this,SLOT(createButtons())); - connect(m_area, SIGNAL(dockWidgetHasUndocked(KDockWidget*)), - this, SLOT(dockWidgetHasUndocked(KDockWidget*))); + TQTimer::singleShot(0,this,TQT_SLOT(createButtons())); + connect(m_area, TQT_SIGNAL(dockWidgetHasUndocked(KDockWidget*)), + this, TQT_SLOT(dockWidgetHasUndocked(KDockWidget*))); } -void Sidebar_Widget::addWebSideBar(const KURL& url, const QString& /*name*/) { +void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) { //kdDebug() << "Web sidebar entry to be added: " << url.url() // << " [" << name << "]" << endl; // Look for existing ones with this URL KStandardDirs *dirs = KGlobal::dirs(); - QString list; + TQString list; dirs->saveLocation("data", m_relPath, true); list = locateLocal("data", m_relPath); // Go through list to see which ones exist. Check them for the URL - QStringList files = QDir(list).entryList("websidebarplugin*.desktop"); - for (QStringList::Iterator it = files.begin(); it != files.end(); ++it){ + TQStringList files = TQDir(list).entryList("websidebarplugin*.desktop"); + for (TQStringList::Iterator it = files.begin(); it != files.end(); ++it){ KSimpleConfig scf(list + *it, false); scf.setGroup("Desktop Entry"); - if (scf.readPathEntry("URL", QString::null) == url.url()) { + if (scf.readPathEntry("URL", TQString::null) == url.url()) { // We already have this one! KMessageBox::information(this, i18n("This entry already exists.")); @@ -348,8 +348,8 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const QString& /*name*/) { } } - QString tmpl = "websidebarplugin%1.desktop"; - QString myFile = findFileName(&tmpl,m_universalMode,m_currentProfile); + TQString tmpl = "websidebarplugin%1.desktop"; + TQString myFile = findFileName(&tmpl,m_universalMode,m_currentProfile); if (!myFile.isEmpty()) { KSimpleConfig scf(myFile, false); @@ -362,7 +362,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const QString& /*name*/) { scf.writeEntry("X-KDE-KonqSidebarModule", "konqsidebar_web"); scf.sync(); - QTimer::singleShot(0,this,SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); } } @@ -371,7 +371,7 @@ void Sidebar_Widget::finishRollBack() { m_path = KGlobal::dirs()->saveLocation("data",m_relPath,true); initialCopy(); - QTimer::singleShot(0,this,SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); } @@ -390,7 +390,7 @@ void Sidebar_Widget::doLayout() if (m_layout) delete m_layout; - m_layout = new QHBoxLayout(this); + m_layout = new TQHBoxLayout(this); if (m_showTabsLeft) { m_layout->add(m_buttonBar); @@ -418,7 +418,7 @@ void Sidebar_Widget::aboutToShowConfigMenu() void Sidebar_Widget::initialCopy() { kdDebug()<<"Initial copy"<findDirs("data","konqsidebartng/kicker_entries/"); else @@ -431,8 +431,8 @@ void Sidebar_Widget::initialCopy() int lVersion=lcfg.readNumEntry("Version",0); - for (QStringList::const_iterator ddit=dirtree_dirs.begin();ddit!=dirtree_dirs.end();++ddit) { - QString dirtree_dir=*ddit; + for (TQStringList::const_iterator ddit=dirtree_dirs.begin();ddit!=dirtree_dirs.end();++ddit) { + TQString dirtree_dir=*ddit; if (dirtree_dir == m_path) continue; @@ -446,18 +446,18 @@ void Sidebar_Widget::initialCopy() if (lVersion >= gversion) continue; - QDir dir(m_path); - QStringList entries = dir.entryList( QDir::Files ); - QStringList dirEntries = dir.entryList( QDir::Dirs | QDir::NoSymLinks ); + TQDir dir(m_path); + TQStringList entries = dir.entryList( TQDir::Files ); + TQStringList dirEntries = dir.entryList( TQDir::Dirs | TQDir::NoSymLinks ); dirEntries.remove( "." ); dirEntries.remove( ".." ); - QDir globalDir( dirtree_dir ); + TQDir globalDir( dirtree_dir ); Q_ASSERT( globalDir.isReadable() ); // Only copy the entries that don't exist yet in the local dir - QStringList globalDirEntries = globalDir.entryList(); - QStringList::ConstIterator eIt = globalDirEntries.begin(); - QStringList::ConstIterator eEnd = globalDirEntries.end(); + TQStringList globalDirEntries = globalDir.entryList(); + TQStringList::ConstIterator eIt = globalDirEntries.begin(); + TQStringList::ConstIterator eEnd = globalDirEntries.end(); for (; eIt != eEnd; ++eIt ) { //kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl; @@ -465,12 +465,12 @@ void Sidebar_Widget::initialCopy() !entries.contains( *eIt ) && !dirEntries.contains( *eIt ) ) { // we don't have that one yet -> copy it. - QString cp("cp -R -- "); + TQString cp("cp -R -- "); cp += KProcess::quote(dirtree_dir + *eIt); cp += " "; cp += KProcess::quote(m_path); kdDebug() << "SidebarWidget::intialCopy executing " << cp << endl; - ::system( QFile::encodeName(cp) ); + ::system( TQFile::encodeName(cp) ); } } } @@ -489,7 +489,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) { KIconDialog kicd(this); // kicd.setStrictIconSize(true); - QString iconname=kicd.selectIcon(KIcon::Small); + TQString iconname=kicd.selectIcon(KIcon::Small); kdDebug()<<"New Icon Name:"<selectedURL().prettyURL(); + TQString newurl= dlg->selectedURL().prettyURL(); //If we are going to set the name by 'set name', we don't set it here. //ksc.writeEntry("Name",newurl); ksc.writePathEntry("URL",newurl); ksc.sync(); - QTimer::singleShot(0,this,SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); } } delete dlg; @@ -529,12 +529,12 @@ void Sidebar_Widget::buttonPopupActivate(int id) case 3: { if (KMessageBox::warningContinueCancel(this,i18n("Do you really want to remove the %1 tab?").arg(m_currentButton->displayName), - QString::null,KStdGuiItem::del())==KMessageBox::Continue) + TQString::null,KStdGuiItem::del())==KMessageBox::Continue) { - QFile f(m_path+m_currentButton->file); + TQFile f(m_path+m_currentButton->file); if (!f.remove()) qDebug("Error, file not deleted"); - QTimer::singleShot(0,this,SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); } break; } @@ -543,7 +543,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) bool ok; // Pop up the dialog asking the user for name. - const QString name = KInputDialog::getText(i18n("Set Name"), i18n("Enter the name:"), + const TQString name = KInputDialog::getText(i18n("Set Name"), i18n("Enter the name:"), m_currentButton->displayName, &ok, this); if(ok) @@ -554,8 +554,8 @@ void Sidebar_Widget::buttonPopupActivate(int id) ksc.writeEntry("Name", name, true, false, true /*localized*/ ); ksc.sync(); - // Update the buttons with a QTimer (why?) - QTimer::singleShot(0,this,SLOT(updateButtons())); + // Update the buttons with a TQTimer (why?) + TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); } break; } @@ -720,9 +720,9 @@ void Sidebar_Widget::createButtons() if (!m_path.isEmpty()) { kdDebug()<<"m_path: "<setGroup("Desktop Entry"); - QString icon = confFile->readEntry("Icon"); - QString name = confFile->readEntry("Name"); - QString comment = confFile->readEntry("Comment"); - QString url = confFile->readPathEntry("URL",QString::null); - QString lib = confFile->readEntry("X-KDE-KonqSidebarModule"); + TQString icon = confFile->readEntry("Icon"); + TQString name = confFile->readEntry("Name"); + TQString comment = confFile->readEntry("Comment"); + TQString url = confFile->readPathEntry("URL",TQString::null); + TQString lib = confFile->readEntry("X-KDE-KonqSidebarModule"); delete confFile; @@ -818,11 +818,11 @@ bool Sidebar_Widget::addButton(const QString &desktoppath,int pos) /*int id=*/m_buttons.insert(lastbtn, bi); KMultiTabBarTab *tab = m_buttonBar->tab(lastbtn); tab->installEventFilter(this); - connect(tab,SIGNAL(clicked(int)),this,SLOT(showHidePage(int))); + connect(tab,TQT_SIGNAL(clicked(int)),this,TQT_SLOT(showHidePage(int))); // Set Whats This help // This uses the comments in the .desktop files - QWhatsThis::add(tab, comment); + TQWhatsThis::add(tab, comment); } return true; @@ -830,10 +830,10 @@ bool Sidebar_Widget::addButton(const QString &desktoppath,int pos) -bool Sidebar_Widget::eventFilter(QObject *obj, QEvent *ev) +bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) { - if (ev->type()==QEvent::MouseButtonPress && ((QMouseEvent *)ev)->button()==QMouseEvent::RightButton) + if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQMouseEvent::RightButton) { KMultiTabBarTab *bt=dynamic_cast(obj); if (bt) @@ -862,14 +862,14 @@ bool Sidebar_Widget::eventFilter(QObject *obj, QEvent *ev) m_buttonPopup->insertItem(SmallIconSet("editdelete"), i18n("Remove"),3); m_buttonPopup->insertSeparator(); m_buttonPopup->insertItem(SmallIconSet("configure"), i18n("Configure Navigation Panel"), m_menu, 4); - connect(m_buttonPopup, SIGNAL(activated(int)), - this, SLOT(buttonPopupActivate(int))); + connect(m_buttonPopup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(buttonPopupActivate(int))); } m_buttonPopup->setItemEnabled(2,!m_currentButton->URL.isEmpty()); m_buttonPopup->changeTitle(50,SmallIcon(m_currentButton->iconName), m_currentButton->displayName); if (!m_disableConfig) - { m_buttonPopup->exec(QCursor::pos()); } + { m_buttonPopup->exec(TQCursor::pos()); } } return true; @@ -878,33 +878,33 @@ bool Sidebar_Widget::eventFilter(QObject *obj, QEvent *ev) return false; } -void Sidebar_Widget::mousePressEvent(QMouseEvent *ev) +void Sidebar_Widget::mousePressEvent(TQMouseEvent *ev) { - if (ev->type()==QEvent::MouseButtonPress && - ((QMouseEvent *)ev)->button()==QMouseEvent::RightButton && + if (ev->type()==TQEvent::MouseButtonPress && + ((TQMouseEvent *)ev)->button()==TQMouseEvent::RightButton && !m_disableConfig) - { m_menu->exec(QCursor::pos()); } + { m_menu->exec(TQCursor::pos()); } } -KonqSidebarPlugin *Sidebar_Widget::loadModule(QWidget *par,QString &desktopName,QString lib_name,ButtonInfo* bi) +KonqSidebarPlugin *Sidebar_Widget::loadModule(TQWidget *par,TQString &desktopName,TQString lib_name,ButtonInfo* bi) { KLibLoader *loader = KLibLoader::self(); // try to load the library - KLibrary *lib = loader->library(QFile::encodeName(lib_name)); + KLibrary *lib = loader->library(TQFile::encodeName(lib_name)); if (lib) { // get the create_ function - QString factory("create_%1"); - void *create = lib->symbol(QFile::encodeName(factory.arg(lib_name))); + TQString factory("create_%1"); + void *create = lib->symbol(TQFile::encodeName(factory.arg(lib_name))); if (create) { // create the module - KonqSidebarPlugin* (*func)(KInstance*,QObject *, QWidget*, QString&, const char *); - func = (KonqSidebarPlugin* (*)(KInstance*,QObject *, QWidget *, QString&, const char *)) create; - QString fullPath(m_path+desktopName); + KonqSidebarPlugin* (*func)(KInstance*,TQObject *, TQWidget*, TQString&, const char *); + func = (KonqSidebarPlugin* (*)(KInstance*,TQObject *, TQWidget *, TQString&, const char *)) create; + TQString fullPath(m_path+desktopName); return (KonqSidebarPlugin*)func(getInstance(),bi,par,fullPath,0); } } else { @@ -939,11 +939,11 @@ bool Sidebar_Widget::createView( ButtonInfo *data) KDockWidget::DockBottom/*|KDockWidget::DockDesktop*/); data->dock->setDockSite(KDockWidget::DockTop|KDockWidget::DockBottom); connectModule(data->module); - connect(this, SIGNAL(fileSelection(const KFileItemList&)), - data->module, SLOT(openPreview(const KFileItemList&))); + connect(this, TQT_SIGNAL(fileSelection(const KFileItemList&)), + data->module, TQT_SLOT(openPreview(const KFileItemList&))); - connect(this, SIGNAL(fileMouseOver(const KFileItem&)), - data->module, SLOT(openPreviewOnMouseOver(const KFileItem&))); + connect(this, TQT_SIGNAL(fileMouseOver(const KFileItem&)), + data->module, TQT_SLOT(openPreviewOnMouseOver(const KFileItem&))); } delete confFile; @@ -976,14 +976,14 @@ void Sidebar_Widget::showHidePage(int page) m_buttonBar->setTab(page,true); connect(info->module, - SIGNAL(setIcon(const QString&)), + TQT_SIGNAL(setIcon(const TQString&)), m_buttonBar->tab(page), - SLOT(setIcon(const QString&))); + TQT_SLOT(setIcon(const TQString&))); connect(info->module, - SIGNAL(setCaption(const QString&)), + TQT_SIGNAL(setCaption(const TQString&)), m_buttonBar->tab(page), - SLOT(setText(const QString&))); + TQT_SLOT(setText(const TQString&))); if (m_singleWidgetMode) { @@ -1059,10 +1059,10 @@ void Sidebar_Widget::collapseExpandSidebar() } } -QSize Sidebar_Widget::sizeHint() const +TQSize Sidebar_Widget::sizeHint() const { if (m_somethingVisible) - return QSize(m_savedWidth,200); + return TQSize(m_savedWidth,200); return minimumSizeHint(); } @@ -1089,17 +1089,17 @@ KInstance *Sidebar_Widget::getInstance() } void Sidebar_Widget::submitFormRequest(const char *action, - const QString& url, - const QByteArray& formData, - const QString& /*target*/, - const QString& contentType, - const QString& /*boundary*/ ) + const TQString& url, + const TQByteArray& formData, + const TQString& /*target*/, + const TQString& contentType, + const TQString& /*boundary*/ ) { KParts::URLArgs args; args.setContentType("Content-Type: " + contentType); args.postData = formData; - args.setDoPost(QCString(action).lower() == "post"); + args.setDoPost(TQCString(action).lower() == "post"); // boundary? emit getExtension()->openURLRequest(KURL( url ), args); } @@ -1127,7 +1127,7 @@ void Sidebar_Widget::enableAction( const char * name, bool enabled ) ButtonInfo *btninfo = static_cast(sender()->parent()); if (btninfo) { - QString n(name); + TQString n(name); if (n == "copy") btninfo->copy = enabled; else if (n == "cut") @@ -1164,82 +1164,82 @@ bool Sidebar_Widget::doEnableActions() } -void Sidebar_Widget::popupMenu( const QPoint &global, const KFileItemList &items ) +void Sidebar_Widget::popupMenu( const TQPoint &global, const KFileItemList &items ) { if (doEnableActions()) getExtension()->popupMenu(global,items); } -void Sidebar_Widget::popupMenu( KXMLGUIClient *client, const QPoint &global, const KFileItemList &items ) +void Sidebar_Widget::popupMenu( KXMLGUIClient *client, const TQPoint &global, const KFileItemList &items ) { if (doEnableActions()) getExtension()->popupMenu(client,global,items); } -void Sidebar_Widget::popupMenu( const QPoint &global, const KURL &url, - const QString &mimeType, mode_t mode) +void Sidebar_Widget::popupMenu( const TQPoint &global, const KURL &url, + const TQString &mimeType, mode_t mode) { if (doEnableActions()) getExtension()->popupMenu(global,url,mimeType,mode); } void Sidebar_Widget::popupMenu( KXMLGUIClient *client, - const QPoint &global, const KURL &url, - const QString &mimeType, mode_t mode ) + const TQPoint &global, const KURL &url, + const TQString &mimeType, mode_t mode ) { if (doEnableActions()) getExtension()->popupMenu(client,global,url,mimeType,mode); } -void Sidebar_Widget::connectModule(QObject *mod) +void Sidebar_Widget::connectModule(TQObject *mod) { if (mod->metaObject()->findSignal("started(KIO::Job*)") != -1) { - connect(mod,SIGNAL(started(KIO::Job *)),this, SIGNAL(started(KIO::Job*))); + connect(mod,TQT_SIGNAL(started(KIO::Job *)),this, TQT_SIGNAL(started(KIO::Job*))); } if (mod->metaObject()->findSignal("completed()") != -1) { - connect(mod,SIGNAL(completed()),this,SIGNAL(completed())); + connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); } - if (mod->metaObject()->findSignal("popupMenu(const QPoint&,const KURL&,const QString&,mode_t)") != -1) { - connect(mod,SIGNAL(popupMenu( const QPoint &, const KURL &, - const QString &, mode_t)),this,SLOT(popupMenu( const - QPoint &, const KURL&, const QString &, mode_t))); + if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) { + connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, + const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const + TQPoint &, const KURL&, const TQString &, mode_t))); } - if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const QPoint&,const KURL&,const QString&,mode_t)") != -1) { - connect(mod,SIGNAL(popupMenu( KXMLGUIClient *, const QPoint &, - const KURL &,const QString &, mode_t)),this, - SLOT(popupMenu( KXMLGUIClient *, const QPoint &, - const KURL &,const QString &, mode_t))); + if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) { + connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &, + const KURL &,const TQString &, mode_t)),this, + TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &, + const KURL &,const TQString &, mode_t))); } - if (mod->metaObject()->findSignal("popupMenu(const QPoint&,const KFileItemList&)") != -1) { - connect(mod,SIGNAL(popupMenu( const QPoint &, const KFileItemList & )), - this,SLOT(popupMenu( const QPoint &, const KFileItemList & ))); + if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) { + connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), + this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & ))); } if (mod->metaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) { - connect(mod,SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), - this,SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), + this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); } - if (mod->metaObject()->findSignal("submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)") != -1) { + if (mod->metaObject()->findSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) { connect(mod, - SIGNAL(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)), + TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, - SLOT(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&))); + TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); } if (mod->metaObject()->findSignal("enableAction(const char*,bool)") != -1) { - connect(mod,SIGNAL(enableAction( const char *, bool)), - this,SLOT(enableAction(const char *, bool))); + connect(mod,TQT_SIGNAL(enableAction( const char *, bool)), + this,TQT_SLOT(enableAction(const char *, bool))); } if (mod->metaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) { - connect(mod,SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), - this,SLOT(createNewWindow( const KURL &, const KParts::URLArgs &))); + connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), + this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &))); } } @@ -1260,29 +1260,29 @@ Sidebar_Widget::~Sidebar_Widget() } } -void Sidebar_Widget::customEvent(QCustomEvent* ev) +void Sidebar_Widget::customEvent(TQCustomEvent* ev) { if (KonqFileSelectionEvent::test(ev)) { emit fileSelection(static_cast(ev)->selection()); } else if (KonqFileMouseOverEvent::test(ev)) { if (!(static_cast(ev)->item())) { - emit fileMouseOver(KFileItem(KURL(),QString::null,KFileItem::Unknown)); + emit fileMouseOver(KFileItem(KURL(),TQString::null,KFileItem::Unknown)); } else { emit fileMouseOver(*static_cast(ev)->item()); } } } -void Sidebar_Widget::resizeEvent(QResizeEvent* ev) +void Sidebar_Widget::resizeEvent(TQResizeEvent* ev) { if (m_somethingVisible && m_userMovedSplitter) { int newWidth = width(); - QSplitter *split = splitter(); + TQSplitter *split = splitter(); if (split && (m_savedWidth != newWidth)) { - QValueList sizes = split->sizes(); + TQValueList sizes = split->sizes(); if ((sizes.count() >= 2) && (sizes[1])) { m_savedWidth = newWidth; @@ -1292,16 +1292,16 @@ void Sidebar_Widget::resizeEvent(QResizeEvent* ev) } } m_userMovedSplitter = false; - QWidget::resizeEvent(ev); + TQWidget::resizeEvent(ev); } -QSplitter *Sidebar_Widget::splitter() const +TQSplitter *Sidebar_Widget::splitter() const { if (m_universalMode) return 0; - QObject *p = parent(); + TQObject *p = parent(); if (!p) return 0; p = p->parent(); - return static_cast(p); + return static_cast(p); } void Sidebar_Widget::userMovedSplitter() diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h index ccaba5224..d30fe3d65 100644 --- a/konqueror/sidebar/sidebar_widget.h +++ b/konqueror/sidebar/sidebar_widget.h @@ -17,10 +17,10 @@ #ifndef _SIDEBAR_WIDGET_ #define _SIDEBAR_WIDGET_ -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -36,15 +36,15 @@ class QHBoxLayout; class QSplitter; class QStringList; -class ButtonInfo: public QObject, public KonqSidebarIface +class ButtonInfo: public TQObject, public KonqSidebarIface { Q_OBJECT public: - ButtonInfo(const QString& file_, class KonqSidebarIface *part, class KDockWidget *dock_, - const QString &url_,const QString &lib, - const QString &dispName_, const QString &iconName_, - QObject *parent) - : QObject(parent), file(file_), dock(dock_), URL(url_), + ButtonInfo(const TQString& file_, class KonqSidebarIface *part, class KDockWidget *dock_, + const TQString &url_,const TQString &lib, + const TQString &dispName_, const TQString &iconName_, + TQObject *parent) + : TQObject(parent), file(file_), dock(dock_), URL(url_), libName(lib), displayName(dispName_), iconName(iconName_), m_part(part) { copy = cut = paste = trash = del = rename =false; @@ -52,13 +52,13 @@ public: ~ButtonInfo() {} - QString file; + TQString file; KDockWidget *dock; KonqSidebarPlugin *module; - QString URL; - QString libName; - QString displayName; - QString iconName; + TQString URL; + TQString libName; + TQString displayName; + TQString iconName; bool copy; bool cut; bool paste; @@ -74,8 +74,8 @@ class addBackEnd: public QObject { Q_OBJECT public: - addBackEnd(QWidget *parent,class QPopupMenu *addmenu, bool universal, - const QString ¤tProfile, const char *name=0); + addBackEnd(TQWidget *parent,class TQPopupMenu *addmenu, bool universal, + const TQString ¤tProfile, const char *name=0); ~addBackEnd(){;} protected slots: void aboutToShowAddMenu(); @@ -84,13 +84,13 @@ signals: void updateNeeded(); void initialCopyNeeded(); private: - QGuardedPtr menu; - QPtrVector libNames; - QPtrVector libParam; + TQGuardedPtr menu; + TQPtrVector libNames; + TQPtrVector libParam; bool m_universal; - QString m_currentProfile; + TQString m_currentProfile; void doRollBack(); - QWidget *m_parent; + TQWidget *m_parent; }; class KDE_EXPORT Sidebar_Widget: public QWidget @@ -99,24 +99,24 @@ class KDE_EXPORT Sidebar_Widget: public QWidget public: friend class ButtonInfo; public: - Sidebar_Widget(QWidget *parent, KParts::ReadOnlyPart *par, + Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, const char * name,bool universalMode, - const QString ¤tProfile); + const TQString ¤tProfile); ~Sidebar_Widget(); bool openURL(const class KURL &url); void stdAction(const char *handlestd); //virtual KParts::ReadOnlyPart *getPart(); KParts::BrowserExtension *getExtension(); - virtual QSize sizeHint() const; + virtual TQSize sizeHint() const; public slots: - void addWebSideBar(const KURL& url, const QString& name); + void addWebSideBar(const KURL& url, const TQString& name); protected: - void customEvent(QCustomEvent* ev); - void resizeEvent(QResizeEvent* ev); - virtual bool eventFilter(QObject*,QEvent*); - virtual void mousePressEvent(QMouseEvent*); + void customEvent(TQCustomEvent* ev); + void resizeEvent(TQResizeEvent* ev); + virtual bool eventFilter(TQObject*,TQEvent*); + virtual void mousePressEvent(TQMouseEvent*); protected slots: void showHidePage(int value); @@ -138,8 +138,8 @@ signals: public: /* interface KonqSidebar_PluginInterface*/ KInstance *getInstance(); -// virtual void showError(QString &); for later extension -// virtual void showMessage(QString &); for later extension +// virtual void showError(TQString &); for later extension +// virtual void showMessage(TQString &); for later extension /* end of interface implementation */ @@ -150,30 +150,30 @@ public slots: * @since 3.2 * ### KDE4 remove me */ - void submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&); + void submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&); void createNewWindow( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() ); void createNewWindow( const KURL &url, const KParts::URLArgs &args, const KParts::WindowArgs &windowArgs, KParts::ReadOnlyPart *&part ); - void popupMenu( const QPoint &global, const KFileItemList &items ); - void popupMenu( KXMLGUIClient *client, const QPoint &global, const KFileItemList &items ); - void popupMenu( const QPoint &global, const KURL &url, - const QString &mimeType, mode_t mode = (mode_t)-1 ); + void popupMenu( const TQPoint &global, const KFileItemList &items ); + void popupMenu( KXMLGUIClient *client, const TQPoint &global, const KFileItemList &items ); + void popupMenu( const TQPoint &global, const KURL &url, + const TQString &mimeType, mode_t mode = (mode_t)-1 ); void popupMenu( KXMLGUIClient *client, - const QPoint &global, const KURL &url, - const QString &mimeType, mode_t mode = (mode_t)-1 ); + const TQPoint &global, const KURL &url, + const TQString &mimeType, mode_t mode = (mode_t)-1 ); void enableAction( const char * name, bool enabled ); void userMovedSplitter(); private: - QSplitter *splitter() const; - bool addButton(const QString &desktoppath,int pos=-1); + TQSplitter *splitter() const; + bool addButton(const TQString &desktoppath,int pos=-1); bool createView(ButtonInfo *data); - KonqSidebarPlugin *loadModule(QWidget *par,QString &desktopName,QString lib_name,ButtonInfo *bi); + KonqSidebarPlugin *loadModule(TQWidget *par,TQString &desktopName,TQString lib_name,ButtonInfo *bi); void readConfig(); void initialCopy(); void doLayout(); - void connectModule(QObject *mod); + void connectModule(TQObject *mod); void collapseExpandSidebar(); bool doEnableActions(); bool m_universalMode; @@ -184,15 +184,15 @@ private: KDockWidget *m_mainDockWidget; KMultiTabBar *m_buttonBar; - QPtrVector m_buttons; - QHBoxLayout *m_layout; + TQPtrVector m_buttons; + TQHBoxLayout *m_layout; KPopupMenu *m_buttonPopup; - QPopupMenu *m_menu; - QGuardedPtr m_activeModule; - QGuardedPtr m_currentButton; + TQPopupMenu *m_menu; + TQGuardedPtr m_activeModule; + TQGuardedPtr m_currentButton; KConfig *m_config; - QTimer m_configTimer; + TQTimer m_configTimer; KURL m_storedUrl; int m_savedWidth; @@ -212,11 +212,11 @@ private: bool m_noUpdate; bool m_initial; - QString m_path; - QString m_relPath; - QString m_currentProfile; - QStringList m_visibleViews; // The views that are actually open - QStringList m_openViews; // The views that should be opened + TQString m_path; + TQString m_relPath; + TQString m_currentProfile; + TQStringList m_visibleViews; // The views that are actually open + TQStringList m_openViews; // The views that should be opened signals: void panelHasBeenExpanded(bool); diff --git a/konqueror/sidebar/test/konqsidebartest.cpp b/konqueror/sidebar/test/konqsidebartest.cpp index 56dfff2fe..a790ee7e1 100644 --- a/konqueror/sidebar/test/konqsidebartest.cpp +++ b/konqueror/sidebar/test/konqsidebartest.cpp @@ -19,7 +19,7 @@ extern "C" { - KDE_EXPORT void* create_konq_sidebartest(KInstance *instance,QObject *par,QWidget *widp,QString &desktopname,const char *name) + KDE_EXPORT void* create_konq_sidebartest(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new SidebarTest(instance,par,widp,desktopname,name); } diff --git a/konqueror/sidebar/test/konqsidebartest.h b/konqueror/sidebar/test/konqsidebartest.h index 0c304e949..5c36080fd 100644 --- a/konqueror/sidebar/test/konqsidebartest.h +++ b/konqueror/sidebar/test/konqsidebartest.h @@ -17,23 +17,23 @@ #ifndef _konq_sidebar_test_h_ #define _konq_sidebar_test_h_ #include -#include -#include +#include +#include class SidebarTest : public KonqSidebarPlugin { Q_OBJECT public: - SidebarTest(KInstance *inst,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name=0): + SidebarTest(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0): KonqSidebarPlugin(inst,parent,widgetParent,desktopName_,name) { - widget=new QLabel("Init Value",widgetParent); + widget=new TQLabel("Init Value",widgetParent); } ~SidebarTest(){;} - virtual QWidget *getWidget(){return widget;} - virtual void *provides(const QString &) {return 0;} + virtual TQWidget *getWidget(){return widget;} + virtual void *provides(const TQString &) {return 0;} protected: - QLabel *widget; + TQLabel *widget; virtual void handleURL(const KURL &url) { widget->setText(url.url()); diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_item.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_item.cpp index c0fae56cc..0bfe4ea67 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_item.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_item.cpp @@ -33,7 +33,7 @@ KonqSidebarBookmarkItem::KonqSidebarBookmarkItem( KonqSidebarTreeItem *parentIte setPixmap( 0, SmallIcon(bk.icon()) ); } -QDragObject * KonqSidebarBookmarkItem::dragObject( QWidget * parent, bool ) +TQDragObject * KonqSidebarBookmarkItem::dragObject( TQWidget * parent, bool ) { KBookmarkDrag * drag = KBookmarkDrag::newDrag( m_bk, parent ); // TODO honour bool move ? @@ -60,7 +60,7 @@ KURL KonqSidebarBookmarkItem::externalURL() const return m_bk.isGroup() ? KURL() : m_bk.url(); } -QString KonqSidebarBookmarkItem::toolTipText() const +TQString KonqSidebarBookmarkItem::toolTipText() const { return m_bk.url().prettyURL(); } @@ -70,9 +70,9 @@ void KonqSidebarBookmarkItem::itemSelected() tree()->enableActions( false, false, false, false, false, false ); } -QString KonqSidebarBookmarkItem::key( int /*column*/, bool /*ascending*/ ) const +TQString KonqSidebarBookmarkItem::key( int /*column*/, bool /*ascending*/ ) const { - return QString::number(m_key).rightJustify( 5, '0' ); + return TQString::number(m_key).rightJustify( 5, '0' ); } KBookmark &KonqSidebarBookmarkItem::bookmark() diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_item.h b/konqueror/sidebar/trees/bookmark_module/bookmark_item.h index 5ffe953e8..0cffd52ea 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_item.h +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_item.h @@ -34,7 +34,7 @@ public: virtual ~KonqSidebarBookmarkItem() {} // Create a drag object from this item. - virtual QDragObject * dragObject( QWidget * parent, bool move = false ); + virtual TQDragObject * dragObject( TQWidget * parent, bool move = false ); virtual void middleButtonClicked(); virtual void rightButtonPressed(); @@ -45,12 +45,12 @@ public: virtual KURL externalURL() const; // overwrite this if you want a tooltip shown on your item - virtual QString toolTipText() const; + virtual TQString toolTipText() const; // Called when this item is selected virtual void itemSelected(); - virtual QString key( int column, bool /*ascending*/ ) const; + virtual TQString key( int column, bool /*ascending*/ ) const; virtual KBookmark &bookmark(); diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index a931ac526..81b32923f 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -16,9 +16,9 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include +#include +#include +#include #include #include @@ -37,47 +37,47 @@ #include KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTree ) - : QObject( 0L ), KonqSidebarTreeModule( parentTree ), + : TQObject( 0L ), KonqSidebarTreeModule( parentTree ), m_topLevelItem( 0L ), m_ignoreOpenChange(true) { // formats handled by KBookmarkDrag: - QStringList formats; + TQStringList formats; formats << "text/uri-list" << "application/x-xbel" << "text/plain"; tree()->setDropFormats(formats); - connect(tree(), SIGNAL(moved(QListViewItem*,QListViewItem*,QListViewItem*)), - this, SLOT(slotMoved(QListViewItem*,QListViewItem*,QListViewItem*))); - connect(tree(), SIGNAL(dropped(KListView*,QDropEvent*,QListViewItem*,QListViewItem*)), - this, SLOT(slotDropped(KListView*,QDropEvent*,QListViewItem*,QListViewItem*))); + connect(tree(), TQT_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)), + this, TQT_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*))); + connect(tree(), TQT_SIGNAL(dropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)), + this, TQT_SLOT(slotDropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*))); - connect(tree(), SIGNAL(expanded(QListViewItem*)), - this, SLOT(slotOpenChange(QListViewItem*))); - connect(tree(), SIGNAL(collapsed(QListViewItem*)), - this, SLOT(slotOpenChange(QListViewItem*))); + connect(tree(), TQT_SIGNAL(expanded(TQListViewItem*)), + this, TQT_SLOT(slotOpenChange(TQListViewItem*))); + connect(tree(), TQT_SIGNAL(collapsed(TQListViewItem*)), + this, TQT_SLOT(slotOpenChange(TQListViewItem*))); m_collection = new KActionCollection( this, "bookmark actions" ); (void) new KAction( i18n("&Create New Folder"), "folder_new", 0, this, - SLOT( slotCreateFolder() ), m_collection, "create_folder"); + TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); (void) new KAction( i18n("Delete Folder"), "editdelete", 0, this, - SLOT( slotDelete() ), m_collection, "delete_folder"); + TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); (void) new KAction( i18n("Delete Bookmark"), "editdelete", 0, this, - SLOT( slotDelete() ), m_collection, "delete_bookmark"); + TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark"); (void) new KAction( i18n("Properties"), "edit", 0, this, - SLOT( slotProperties() ), m_collection, "item_properties"); + TQT_SLOT( slotProperties() ), m_collection, "item_properties"); (void) new KAction( i18n("Open in New Window"), "window_new", 0, this, - SLOT( slotOpenNewWindow() ), m_collection, "open_window"); + TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); (void) new KAction( i18n("Open in New Tab"), "tab_new", 0, this, - SLOT( slotOpenTab() ), m_collection, "open_tab"); + TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); (void) new KAction( i18n("Open Folder in Tabs"), "tab_new", 0, this, - SLOT( slotOpenTab() ), m_collection, "folder_open_tabs"); + TQT_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs"); (void) new KAction( i18n("Copy Link Address"), "editcopy", 0, this, - SLOT( slotCopyLocation() ), m_collection, "copy_location"); + TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); - KStdAction::editBookmarks( KonqBookmarkManager::self(), SLOT( slotEditBookmarks() ), + KStdAction::editBookmarks( KonqBookmarkManager::self(), TQT_SLOT( slotEditBookmarks() ), m_collection, "edit_bookmarks" ); - connect( KonqBookmarkManager::self(), SIGNAL(changed(const QString &, const QString &) ), - SLOT( slotBookmarksChanged(const QString &) ) ); + connect( KonqBookmarkManager::self(), TQT_SIGNAL(changed(const TQString &, const TQString &) ), + TQT_SLOT( slotBookmarksChanged(const TQString &) ) ); } KonqSidebarBookmarkModule::~KonqSidebarBookmarkModule() @@ -94,9 +94,9 @@ void KonqSidebarBookmarkModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * i m_ignoreOpenChange = false; } -bool KonqSidebarBookmarkModule::handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const QPoint& ) +bool KonqSidebarBookmarkModule::handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const TQPoint& ) { - QPopupMenu *menu = new QPopupMenu; + TQPopupMenu *menu = new QPopupMenu; if (tree()->tabSupport()) { m_collection->action("folder_open_tabs")->plug(menu); @@ -107,7 +107,7 @@ bool KonqSidebarBookmarkModule::handleTopLevelContextMenu( KonqSidebarTreeTopLev menu->insertSeparator(); m_collection->action("edit_bookmarks")->plug(menu); - menu->exec( QCursor::pos() ); + menu->exec( TQCursor::pos() ); delete menu; return true; @@ -120,7 +120,7 @@ void KonqSidebarBookmarkModule::showPopupMenu() return; bool tabSupported = tree()->tabSupport(); - QPopupMenu *menu = new QPopupMenu; + TQPopupMenu *menu = new QPopupMenu; if (bi->bookmark().isGroup()) { if (tabSupported) { @@ -141,11 +141,11 @@ void KonqSidebarBookmarkModule::showPopupMenu() menu->insertSeparator(); m_collection->action("item_properties")->plug(menu); - menu->exec( QCursor::pos() ); + menu->exec( TQCursor::pos() ); delete menu; } -void KonqSidebarBookmarkModule::slotMoved(QListViewItem *i, QListViewItem*, QListViewItem *after) +void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQListViewItem *after) { KonqSidebarBookmarkItem *item = dynamic_cast( i ); if (!item) @@ -159,7 +159,7 @@ void KonqSidebarBookmarkModule::slotMoved(QListViewItem *i, QListViewItem*, QLis KBookmarkGroup oldParentGroup = bookmark.parentGroup(); KBookmarkGroup parentGroup; - // try to get the parent group (assume that the QListViewItem has been reparented by KListView)... + // try to get the parent group (assume that the TQListViewItem has been reparented by KListView)... // if anything goes wrong, use the root. if (item->parent()) { bool error = false; @@ -191,20 +191,20 @@ void KonqSidebarBookmarkModule::slotMoved(QListViewItem *i, QListViewItem*, QLis // inform others about the changed groups. quite expensive, so do // our best to update them in only one emitChanged call. - QString oldAddress = oldParentGroup.address(); - QString newAddress = parentGroup.address(); + TQString oldAddress = oldParentGroup.address(); + TQString newAddress = parentGroup.address(); if (oldAddress == newAddress) { KonqBookmarkManager::self()->emitChanged( parentGroup ); } else { int i = 0; while (true) { - QChar c1 = oldAddress[i]; - QChar c2 = newAddress[i]; - if (c1 == QChar::null) { + TQChar c1 = oldAddress[i]; + TQChar c2 = newAddress[i]; + if (c1 == TQChar::null) { // oldParentGroup is probably parent of parentGroup. KonqBookmarkManager::self()->emitChanged( oldParentGroup ); break; - } else if (c2 == QChar::null) { + } else if (c2 == TQChar::null) { // parentGroup is probably parent of oldParentGroup. KonqBookmarkManager::self()->emitChanged( parentGroup ); break; @@ -223,7 +223,7 @@ void KonqSidebarBookmarkModule::slotMoved(QListViewItem *i, QListViewItem*, QLis } } -void KonqSidebarBookmarkModule::slotDropped(KListView *, QDropEvent *e, QListViewItem *parent, QListViewItem *after) +void KonqSidebarBookmarkModule::slotDropped(KListView *, TQDropEvent *e, TQListViewItem *parent, TQListViewItem *after) { if (!KBookmarkDrag::canDecode(e)) return; @@ -257,10 +257,10 @@ void KonqSidebarBookmarkModule::slotDropped(KListView *, QDropEvent *e, QListVie parentGroup = KonqBookmarkManager::self()->root(); } - QValueList bookmarks = KBookmarkDrag::decode(e); + TQValueList bookmarks = KBookmarkDrag::decode(e); // copy - QValueList::iterator it = bookmarks.begin(); + TQValueList::iterator it = bookmarks.begin(); for (;it != bookmarks.end(); ++it) { // insert new item. parentGroup.moveItem(*it, afterBookmark); @@ -320,21 +320,21 @@ void KonqSidebarBookmarkModule::slotDelete() KonqBookmarkManager::self()->emitChanged( parentBookmark ); } -void makeTextNodeMod(KBookmark bk, const QString &m_nodename, const QString &m_newText) { - QDomNode subnode = bk.internalElement().namedItem(m_nodename); +void makeTextNodeMod(KBookmark bk, const TQString &m_nodename, const TQString &m_newText) { + TQDomNode subnode = bk.internalElement().namedItem(m_nodename); if (subnode.isNull()) { subnode = bk.internalElement().ownerDocument().createElement(m_nodename); bk.internalElement().appendChild(subnode); } if (subnode.firstChild().isNull()) { - QDomText domtext = subnode.ownerDocument().createTextNode(""); + TQDomText domtext = subnode.ownerDocument().createTextNode(""); subnode.appendChild(domtext); } - QDomText domtext = subnode.firstChild().toText(); + TQDomText domtext = subnode.firstChild().toText(); - QString m_oldText = domtext.data(); + TQString m_oldText = domtext.data(); domtext.setData(m_newText); } @@ -348,7 +348,7 @@ void KonqSidebarBookmarkModule::slotProperties(KonqSidebarBookmarkItem *bi) KBookmark bookmark = bi->bookmark(); - QString folder = bookmark.isGroup() ? QString::null : bookmark.url().pathOrURL(); + TQString folder = bookmark.isGroup() ? TQString::null : bookmark.url().pathOrURL(); BookmarkEditDialog dlg( bookmark.fullText(), folder, 0, 0, i18n("Bookmark Properties") ); if ( dlg.exec() != KDialogBase::Accepted ) @@ -394,11 +394,11 @@ void KonqSidebarBookmarkModule::slotOpenTab() bookmark = group.first(); while (!bookmark.isNull()) { if (!bookmark.isGroup() && !bookmark.isSeparator()) - ref.call( "newTab(QString)", bookmark.url().url() ); + ref.call( "newTab(TQString)", bookmark.url().url() ); bookmark = group.next(bookmark); } } else { - ref.call( "newTab(QString)", bookmark.url().url() ); + ref.call( "newTab(TQString)", bookmark.url().url() ); } } @@ -419,7 +419,7 @@ void KonqSidebarBookmarkModule::slotCopyLocation() } } -void KonqSidebarBookmarkModule::slotOpenChange(QListViewItem* i) +void KonqSidebarBookmarkModule::slotOpenChange(TQListViewItem* i) { if (m_ignoreOpenChange) return; @@ -438,7 +438,7 @@ void KonqSidebarBookmarkModule::slotOpenChange(QListViewItem* i) m_folderOpenState[bookmark.address()] = open; } -void KonqSidebarBookmarkModule::slotBookmarksChanged( const QString & groupAddress ) +void KonqSidebarBookmarkModule::slotBookmarksChanged( const TQString & groupAddress ) { m_ignoreOpenChange = true; @@ -450,9 +450,9 @@ void KonqSidebarBookmarkModule::slotBookmarksChanged( const QString & groupAddre if (!group.isNull() && item) { // Delete all children of item - QListViewItem * child = item->firstChild(); + TQListViewItem * child = item->firstChild(); while( child ) { - QListViewItem * next = child->nextSibling(); + TQListViewItem * next = child->nextSibling(); delete child; child = next; } @@ -483,7 +483,7 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo KBookmarkGroup grp = bk.toGroup(); fillGroup( item, grp ); - QString address(grp.address()); + TQString address(grp.address()); if (m_folderOpenState.contains(address)) item->setOpen(m_folderOpenState[address]); else @@ -497,12 +497,12 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo } // Borrowed from KEditBookmarks -KonqSidebarBookmarkItem * KonqSidebarBookmarkModule::findByAddress( const QString & address ) const +KonqSidebarBookmarkItem * KonqSidebarBookmarkModule::findByAddress( const TQString & address ) const { - QListViewItem * item = m_topLevelItem; + TQListViewItem * item = m_topLevelItem; // The address is something like /5/10/2 - QStringList addresses = QStringList::split('/',address); - for ( QStringList::Iterator it = addresses.begin() ; it != addresses.end() ; ++it ) + TQStringList addresses = TQStringList::split('/',address); + for ( TQStringList::Iterator it = addresses.begin() ; it != addresses.end() ; ++it ) { uint number = (*it).toUInt(); item = item->firstChild(); @@ -514,8 +514,8 @@ KonqSidebarBookmarkItem * KonqSidebarBookmarkModule::findByAddress( const QStrin } // Borrowed&modified from KBookmarkMenu... -BookmarkEditDialog::BookmarkEditDialog(const QString& title, const QString& url, - QWidget * parent, const char * name, const QString& caption ) +BookmarkEditDialog::BookmarkEditDialog(const TQString& title, const TQString& url, + TQWidget * parent, const char * name, const TQString& caption ) : KDialogBase(parent, name, true, caption, (Ok|Cancel), Ok, false, KGuiItem()), @@ -523,20 +523,20 @@ BookmarkEditDialog::BookmarkEditDialog(const QString& title, const QString& url, { setButtonOK( i18n( "&Update" ) ); - QWidget *main = new QWidget( this ); + TQWidget *main = new TQWidget( this ); setMainWidget( main ); bool folder = url.isNull(); - QGridLayout *grid = new QGridLayout( main, 2, folder?1:2, spacingHint() ); + TQGridLayout *grid = new TQGridLayout( main, 2, folder?1:2, spacingHint() ); - QLabel *nameLabel = new QLabel(i18n("Name:"), main, "title label"); + TQLabel *nameLabel = new TQLabel(i18n("Name:"), main, "title label"); grid->addWidget(nameLabel, 0, 0); m_title = new KLineEdit(main, "title edit"); m_title->setText(title); nameLabel->setBuddy(m_title); grid->addWidget(m_title, 0, 1); if(!folder) { - QLabel *locationLabel = new QLabel(i18n("Location:"), main, "location label"); + TQLabel *locationLabel = new TQLabel(i18n("Location:"), main, "location label"); grid->addWidget(locationLabel, 1, 0); m_location = new KLineEdit(main, "location edit"); m_location->setText(url); @@ -556,20 +556,20 @@ void BookmarkEditDialog::slotCancel() reject(); } -QString BookmarkEditDialog::finalUrl() const +TQString BookmarkEditDialog::finalUrl() const { if (m_location!=0) return m_location->text(); else - return QString::null; + return TQString::null; } -QString BookmarkEditDialog::finalTitle() const +TQString BookmarkEditDialog::finalTitle() const { if (m_title!=0) return m_title->text(); else - return QString::null; + return TQString::null; } extern "C" diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h index b38cdb540..738bd7566 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h @@ -19,8 +19,8 @@ #ifndef bookmark_module_h #define bookmark_module_h -#include -#include +#include +#include #include #include #include @@ -32,7 +32,7 @@ class KLineEdit; /** * This module displays bookmarks in the tree */ -class KonqSidebarBookmarkModule : public QObject, public KonqSidebarTreeModule +class KonqSidebarBookmarkModule : public TQObject, public KonqSidebarTreeModule { Q_OBJECT public: @@ -41,15 +41,15 @@ public: // Handle this new toplevel item [can only be called once currently] virtual void addTopLevelItem( KonqSidebarTreeTopLevelItem * item ); - virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const QPoint& ); + virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const TQPoint& ); void showPopupMenu(); protected slots: - void slotBookmarksChanged( const QString & ); - void slotMoved(QListViewItem*,QListViewItem*,QListViewItem*); - void slotDropped(KListView*,QDropEvent*,QListViewItem*,QListViewItem*); + void slotBookmarksChanged( const TQString & ); + void slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*); + void slotDropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*); void slotCreateFolder(); void slotDelete(); void slotProperties(KonqSidebarBookmarkItem *bi = 0); @@ -60,10 +60,10 @@ protected slots: protected: void fillListView(); void fillGroup( KonqSidebarTreeItem * parentItem, KBookmarkGroup group ); - KonqSidebarBookmarkItem * findByAddress( const QString & address ) const; + KonqSidebarBookmarkItem * findByAddress( const TQString & address ) const; private slots: - void slotOpenChange(QListViewItem*); + void slotOpenChange(TQListViewItem*); private: KonqSidebarTreeTopLevelItem * m_topLevelItem; @@ -72,7 +72,7 @@ private: KActionCollection *m_collection; bool m_ignoreOpenChange; - QMap m_folderOpenState; + TQMap m_folderOpenState; }; class BookmarkEditDialog : public KDialogBase @@ -80,12 +80,12 @@ class BookmarkEditDialog : public KDialogBase Q_OBJECT public: - BookmarkEditDialog( const QString& title, const QString& url, - QWidget * = 0, const char * = 0, - const QString& caption = i18n( "Add Bookmark" ) ); + BookmarkEditDialog( const TQString& title, const TQString& url, + TQWidget * = 0, const char * = 0, + const TQString& caption = i18n( "Add Bookmark" ) ); - QString finalUrl() const; - QString finalTitle() const; + TQString finalUrl() const; + TQString finalTitle() const; protected slots: void slotOk(); diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp index 7f7ee8849..811867b14 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp @@ -25,13 +25,13 @@ #include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include -#include +#include #define MYMODULE static_cast(module()) @@ -64,7 +64,7 @@ void KonqSidebarDirTreeItem::reset() KURL url = m_fileItem->url(); if ( url.isLocalFile() ) { - QCString path( QFile::encodeName(url.path())); + TQCString path( TQFile::encodeName(url.path())); struct stat buff; if ( ::stat( path.data(), &buff ) != -1 ) { @@ -108,15 +108,15 @@ bool KonqSidebarDirTreeItem::hasStandardIcon() return m_fileItem->iconName() == "folder"; } -void KonqSidebarDirTreeItem::paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment ) +void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { if (m_fileItem->isLink()) { - QFont f( _painter->font() ); + TQFont f( _painter->font() ); f.setItalic( TRUE ); _painter->setFont( f ); } - QListViewItem::paintCell( _painter, _cg, _column, _width, _alignment ); + TQListViewItem::paintCell( _painter, _cg, _column, _width, _alignment ); } KURL KonqSidebarDirTreeItem::externalURL() const @@ -124,27 +124,27 @@ KURL KonqSidebarDirTreeItem::externalURL() const return m_fileItem->url(); } -QString KonqSidebarDirTreeItem::externalMimeType() const +TQString KonqSidebarDirTreeItem::externalMimeType() const { if (m_fileItem->isMimeTypeKnown()) return m_fileItem->mimetype(); else - return QString::null; + return TQString::null; } -bool KonqSidebarDirTreeItem::acceptsDrops( const QStrList & formats ) +bool KonqSidebarDirTreeItem::acceptsDrops( const TQStrList & formats ) { if ( formats.contains("text/uri-list") ) return m_fileItem->acceptsDrops(); return false; } -void KonqSidebarDirTreeItem::drop( QDropEvent * ev ) +void KonqSidebarDirTreeItem::drop( TQDropEvent * ev ) { KonqOperations::doDrop( m_fileItem, externalURL(), ev, tree() ); } -QDragObject * KonqSidebarDirTreeItem::dragObject( QWidget * parent, bool move ) +TQDragObject * KonqSidebarDirTreeItem::dragObject( TQWidget * parent, bool move ) { KURL::List lst; lst.append( m_fileItem->url() ); @@ -162,7 +162,7 @@ void KonqSidebarDirTreeItem::itemSelected() if ( m_fileItem->url().directory(false) == KGlobalSettings::trashPath() ) bInTrash = true; - QMimeSource *data = QApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); bool paste = ( data->encodedData( data->format() ).size() != 0 ); tree()->enableActions( true, true, paste, true && !bInTrash, true, true ); @@ -190,14 +190,14 @@ void KonqSidebarDirTreeItem::rightButtonPressed() { KFileItemList lstItems; lstItems.append( m_fileItem ); - emit tree()->popupMenu( QCursor::pos(), lstItems ); + emit tree()->popupMenu( TQCursor::pos(), lstItems ); } void KonqSidebarDirTreeItem::paste() { // move or not move ? bool move = false; - QMimeSource *data = QApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); if ( data->provides( "application/x-kde-cutselection" ) ) { move = KonqDrag::decodeIsCutSelection( data ); kdDebug(1201) << "move (from clipboard data) = " << move << endl; @@ -229,7 +229,7 @@ void KonqSidebarDirTreeItem::delOperation( int method ) KonqOperations::del(tree(), method, lst); } -QString KonqSidebarDirTreeItem::toolTipText() const +TQString KonqSidebarDirTreeItem::toolTipText() const { return m_fileItem->url().pathOrURL(); } @@ -239,7 +239,7 @@ void KonqSidebarDirTreeItem::rename() tree()->rename( this, 0 ); } -void KonqSidebarDirTreeItem::rename( const QString & name ) +void KonqSidebarDirTreeItem::rename( const TQString & name ) { KonqOperations::rename( tree(), m_fileItem->url(), name ); } diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h index fe98595e6..f8025d230 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h @@ -21,7 +21,7 @@ #include "konq_sidebartreeitem.h" #include -#include +#include class QDropEvent; class KFileItem; @@ -36,11 +36,11 @@ public: virtual void setOpen( bool open ); - virtual void paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment ); + virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ); - virtual bool acceptsDrops( const QStrList & formats ); - virtual void drop( QDropEvent * ev ); - virtual QDragObject * dragObject( QWidget * parent, bool move = false ); + virtual bool acceptsDrops( const TQStrList & formats ); + virtual void drop( TQDropEvent * ev ); + virtual TQDragObject * dragObject( TQWidget * parent, bool move = false ); virtual void middleButtonClicked(); virtual void rightButtonPressed(); @@ -50,12 +50,12 @@ public: virtual void del(); virtual void shred(); virtual void rename(); // start a rename operation - void rename( const QString & name ); // do the actual renaming + void rename( const TQString & name ); // do the actual renaming // The URL to open when this link is clicked virtual KURL externalURL() const; - virtual QString externalMimeType() const; - virtual QString toolTipText() const; + virtual TQString externalMimeType() const; + virtual TQString toolTipText() const; virtual void itemSelected(); @@ -63,7 +63,7 @@ public: bool hasStandardIcon(); - QString id; + TQString id; private: void delOperation( int method ); diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index 725927362..ac26b1285 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -53,8 +53,8 @@ KonqSidebarDirTreeModule::~KonqSidebarDirTreeModule() // KDirLister may still emit canceled while being deleted. if (m_dirLister) { - disconnect( m_dirLister, SIGNAL( canceled( const KURL & ) ), - this, SLOT( slotListingStopped( const KURL & ) ) ); + disconnect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ), + this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); delete m_dirLister; } } @@ -87,12 +87,12 @@ void KonqSidebarDirTreeModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it { targetURL = cfg.readURL(); // some services might want to make their URL configurable in kcontrol - QString configured = cfg.readEntry("X-KDE-ConfiguredURL"); + TQString configured = cfg.readEntry("X-KDE-ConfiguredURL"); if (!configured.isEmpty()) { - QStringList list = QStringList::split(':', configured); + TQStringList list = TQStringList::split(':', configured); KConfig config(list[0]); if (list[1] != "noGroup") config.setGroup(list[1]); - QString conf_url = config.readEntry(list[2]); + TQString conf_url = config.readEntry(list[2]); if (!conf_url.isEmpty()) { targetURL = conf_url; } @@ -101,7 +101,7 @@ void KonqSidebarDirTreeModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it else if ( cfg.hasDeviceType() ) { // Determine the mountpoint - QString mp = cfg.readEntry("MountPoint"); + TQString mp = cfg.readEntry("MountPoint"); if ( mp.isEmpty() ) return; @@ -133,7 +133,7 @@ void KonqSidebarDirTreeModule::openTopLevelItem( KonqSidebarTreeTopLevelItem * i void KonqSidebarDirTreeModule::addSubDir( KonqSidebarTreeItem *item ) { - QString id = item->externalURL().url(-1); + TQString id = item->externalURL().url(-1); kdDebug(1201) << this << " KonqSidebarDirTreeModule::addSubDir " << id << endl; m_dictSubDirs.insert(id, item ); @@ -144,9 +144,9 @@ void KonqSidebarDirTreeModule::addSubDir( KonqSidebarTreeItem *item ) // Remove from dict, taking into account that there maybe // other items with the same key. -static void remove(QDict &dict, const QString &key, KonqSidebarTreeItem *item) +static void remove(TQDict &dict, const TQString &key, KonqSidebarTreeItem *item) { - QPtrList *otherItems = 0; + TQPtrList *otherItems = 0; while(true) { KonqSidebarTreeItem *takeItem = dict.take(key); if (!takeItem || (takeItem == item)) @@ -164,7 +164,7 @@ static void remove(QDict &dict, const QString &key, KonqSid } // Not the item we are looking for if (!otherItems) - otherItems = new QPtrList(); + otherItems = new TQPtrList(); otherItems->prepend(takeItem); } @@ -173,7 +173,7 @@ static void remove(QDict &dict, const QString &key, KonqSid // Looks up key in dict and returns it in item, if there are multiple items // with the same key, additional items are returned in itemList which should // be deleted by the caller. -static void lookupItems(QDict &dict, const QString &key, KonqSidebarTreeItem *&item, QPtrList *&itemList) +static void lookupItems(TQDict &dict, const TQString &key, KonqSidebarTreeItem *&item, TQPtrList *&itemList) { itemList = 0; item = dict.take(key); @@ -196,7 +196,7 @@ static void lookupItems(QDict &dict, const QString &key, Ko return; } if (!itemList) - itemList = new QPtrList(); + itemList = new TQPtrList(); itemList->prepend(takeItem); } @@ -204,9 +204,9 @@ static void lookupItems(QDict &dict, const QString &key, Ko // Remove from dict, taking into account that there maybe // other items with the same key. -static void remove(QPtrDict &dict, void *key, KonqSidebarTreeItem *item) +static void remove(TQPtrDict &dict, void *key, KonqSidebarTreeItem *item) { - QPtrList *otherItems = 0; + TQPtrList *otherItems = 0; while(true) { KonqSidebarTreeItem *takeItem = dict.take(key); if (!takeItem || (takeItem == item)) @@ -224,7 +224,7 @@ static void remove(QPtrDict &dict, void *key, KonqSidebarTr } // Not the item we are looking for if (!otherItems) - otherItems = new QPtrList(); + otherItems = new TQPtrList(); otherItems->prepend(takeItem); } @@ -233,7 +233,7 @@ static void remove(QPtrDict &dict, void *key, KonqSidebarTr // Looks up key in dict and returns it in item, if there are multiple items // with the same key, additional items are returned in itemList which should // be deleted by the caller. -static void lookupItems(QPtrDict &dict, void *key, KonqSidebarTreeItem *&item, QPtrList *&itemList) +static void lookupItems(TQPtrDict &dict, void *key, KonqSidebarTreeItem *&item, TQPtrList *&itemList) { itemList = 0; item = dict.take(key); @@ -256,7 +256,7 @@ static void lookupItems(QPtrDict &dict, void *key, KonqSide return; } if (!itemList) - itemList = new QPtrList(); + itemList = new TQPtrList(); itemList->prepend(takeItem); } @@ -280,7 +280,7 @@ void KonqSidebarDirTreeModule::removeSubDir( KonqSidebarTreeItem *item, bool chi if ( !childrenOnly ) { - QString id = item->externalURL().url(-1); + TQString id = item->externalURL().url(-1); remove(m_dictSubDirs, id, item); while (!(item->alias.isEmpty())) { @@ -303,22 +303,22 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item ) { m_dirLister = new KDirLister( true ); //m_dirLister->setDirOnlyMode( true ); -// QStringList mimetypes; -// mimetypes<setMimeFilter(mimetypes); - connect( m_dirLister, SIGNAL( newItems( const KFileItemList & ) ), - this, SLOT( slotNewItems( const KFileItemList & ) ) ); - connect( m_dirLister, SIGNAL( refreshItems( const KFileItemList & ) ), - this, SLOT( slotRefreshItems( const KFileItemList & ) ) ); - connect( m_dirLister, SIGNAL( deleteItem( KFileItem * ) ), - this, SLOT( slotDeleteItem( KFileItem * ) ) ); - connect( m_dirLister, SIGNAL( completed( const KURL & ) ), - this, SLOT( slotListingStopped( const KURL & ) ) ); - connect( m_dirLister, SIGNAL( canceled( const KURL & ) ), - this, SLOT( slotListingStopped( const KURL & ) ) ); - connect( m_dirLister, SIGNAL( redirection( const KURL &, const KURL & ) ), - this, SLOT( slotRedirection( const KURL &, const KURL & ) ) ); + connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ), + this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) ); + connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), + this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) ); + connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), + this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ), + this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); + connect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ), + this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); + connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ), + this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); } @@ -326,7 +326,7 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item ) static_cast(item)->hasStandardIcon() ) { int size = KGlobal::iconLoader()->currentSize( KIcon::Small ); - QPixmap pix = DesktopIcon( "folder_open", size ); + TQPixmap pix = DesktopIcon( "folder_open", size ); m_pTree->startAnimation( item, "kde", 6, &pix ); } else @@ -338,10 +338,10 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item ) void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item ) { // This causes a reparsing, but gets rid of the trailing slash - QString strUrl = item->externalURL().url(-1); + TQString strUrl = item->externalURL().url(-1); KURL url( strUrl ); - QPtrList *itemList; + TQPtrList *itemList; KonqSidebarTreeItem * openItem; lookupItems(m_dictSubDirs, strUrl, openItem, itemList); @@ -407,13 +407,13 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries ) dir.setFileName( "" ); kdDebug(1201) << this << " KonqSidebarDirTreeModule::slotNewItems dir=" << dir.url(-1) << endl; - QPtrList *parentItemList; + TQPtrList *parentItemList; KonqSidebarTreeItem * parentItem; lookupItems(m_dictSubDirs, dir.url(-1), parentItem, parentItemList); if ( !parentItem ) // hack for dnssd://domain/type/service listed in dnssd:/type/ dir { - dir.setHost( QString::null ); + dir.setHost( TQString::null ); lookupItems( m_dictSubDirs, dir.url(-1), parentItem, parentItemList ); } @@ -428,7 +428,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries ) do { kdDebug()<<"Parent Item URL:"<externalURL()< kit ( entries ); + TQPtrListIterator kit ( entries ); for( ; kit.current(); ++kit ) { KFileItem * fileItem = *kit; @@ -458,13 +458,13 @@ void KonqSidebarDirTreeModule::slotRefreshItems( const KFileItemList &entries ) { int size = KGlobal::iconLoader()->currentSize( KIcon::Small ); - QPtrListIterator kit ( entries ); + TQPtrListIterator kit ( entries ); kdDebug(1201) << "KonqSidebarDirTreeModule::slotRefreshItems " << entries.count() << " entries. First: " << kit.current()->url().url() << endl; for( ; kit.current(); ++kit ) { KFileItem *fileItem = kit.current(); - QPtrList *itemList; + TQPtrList *itemList; KonqSidebarTreeItem * item; lookupItems(m_ptrdictSubDirs, fileItem, item, itemList); @@ -517,7 +517,7 @@ void KonqSidebarDirTreeModule::slotDeleteItem( KFileItem *fileItem ) kdDebug(1201) << "KonqSidebarDirTreeModule::slotDeleteItem( " << fileItem->url().url(-1) << " )" << endl; // All items are in m_ptrdictSubDirs, so look it up fast - QPtrList *itemList; + TQPtrList *itemList; KonqSidebarTreeItem * item; lookupItems(m_ptrdictSubDirs, fileItem, item, itemList); while(item) @@ -534,10 +534,10 @@ void KonqSidebarDirTreeModule::slotRedirection( const KURL & oldUrl, const KURL { kdDebug(1201) << "******************************KonqSidebarDirTreeModule::slotRedirection(" << newUrl.prettyURL() << ")" << endl; - QString oldUrlStr = oldUrl.url(-1); - QString newUrlStr = newUrl.url(-1); + TQString oldUrlStr = oldUrl.url(-1); + TQString newUrlStr = newUrl.url(-1); - QPtrList *itemList; + TQPtrList *itemList; KonqSidebarTreeItem * item; lookupItems(m_dictSubDirs, oldUrlStr, item, itemList); @@ -565,7 +565,7 @@ void KonqSidebarDirTreeModule::slotListingStopped( const KURL & url ) { kdDebug(1201) << "KonqSidebarDirTree::slotListingStopped " << url.url(-1) << endl; - QPtrList *itemList; + TQPtrList *itemList; KonqSidebarTreeItem * item; lookupItems(m_dictSubDirs, url.url(-1), item, itemList); diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h index dc46d3b9e..af915aa46 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include +#include +#include class KDirLister; class KonqSidebarTree; @@ -31,7 +31,7 @@ class KonqSidebarTreeItem; class KonqSidebarDirTreeItem; class KonqPropsView; -class KonqSidebarDirTreeModule : public QObject, public KonqSidebarTreeModule +class KonqSidebarDirTreeModule : public TQObject, public KonqSidebarTreeModule { Q_OBJECT public: @@ -64,10 +64,10 @@ private: // URL -> item // Each KonqSidebarDirTreeItem is indexed on item->id() and // all item->alias'es - QDict m_dictSubDirs; + TQDict m_dictSubDirs; // KFileItem -> item - QPtrDict m_ptrdictSubDirs; + TQPtrDict m_ptrdictSubDirs; KDirLister * m_dirLister; diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp index bfda3152c..981be03bb 100644 --- a/konqueror/sidebar/trees/history_module/history_item.cpp +++ b/konqueror/sidebar/trees/history_module/history_item.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include @@ -53,12 +53,12 @@ void KonqSidebarHistoryItem::update( const KonqHistoryEntry *entry ) if (!entry) return; - QString title( entry->title ); + TQString title( entry->title ); if ( !title.stripWhiteSpace().isEmpty() && title != entry->url.url() ) setText( 0, title ); else { - QString path( entry->url.path() ); + TQString path( entry->url.path() ); if ( path.isEmpty() ) path += '/'; setText( 0, path ); @@ -66,10 +66,10 @@ void KonqSidebarHistoryItem::update( const KonqHistoryEntry *entry ) KonqSidebarHistoryGroupItem *group = MYGROUP; assert(group); - QString path = entry->url.path(); + TQString path = entry->url.path(); if ( group->hasFavIcon() && (path.isNull() || path == "/") ) { - const QPixmap *pm = group->pixmap(0); + const TQPixmap *pm = group->pixmap(0); if (pm) setPixmap( 0, *pm ); } @@ -91,9 +91,9 @@ void KonqSidebarHistoryItem::rightButtonPressed() MYMODULE->showPopupMenu(); } -QDragObject * KonqSidebarHistoryItem::dragObject( QWidget * parent, bool /*move*/ ) +TQDragObject * KonqSidebarHistoryItem::dragObject( TQWidget * parent, bool /*move*/ ) { - QString icon = KonqFavIconMgr::iconForURL( m_entry->url.url() ); + TQString icon = KonqFavIconMgr::iconForURL( m_entry->url.url() ); KBookmark bookmark = KBookmark::standaloneBookmark( m_entry->title, m_entry->url, icon ); KBookmarkDrag *drag = KBookmarkDrag::newDrag( bookmark, parent ); @@ -101,35 +101,35 @@ QDragObject * KonqSidebarHistoryItem::dragObject( QWidget * parent, bool /*move* } // new items go on top -QString KonqSidebarHistoryItem::key( int column, bool ascending ) const +TQString KonqSidebarHistoryItem::key( int column, bool ascending ) const { if ( MYMODULE->sortsByName() ) return KonqSidebarTreeItem::key( column, ascending ); - QString tmp; + TQString tmp; tmp.sprintf( "%08x", m_entry->lastVisited.secsTo(MYMODULE->currentTime())); return tmp; } -QString KonqSidebarHistoryItem::toolTipText() const +TQString KonqSidebarHistoryItem::toolTipText() const { if ( s_settings->m_detailedTips ) { // this weird ordering of %4, %1, %2, %3 is due to the reason, that some // urls seem to contain %N, which would get substituted in the next // .arg() calls. So to fix this, we first substitute the last items // and then put in the url. - QString tip = i18n("

%4
Last visited: %1
First visited: %2
Number of times visited: %3"); + TQString tip = i18n("
%4
Last visited: %1
First visited: %2
Number of times visited: %3"); return tip.arg( KGlobal::locale()->formatDateTime( m_entry->lastVisited ) ).arg( KGlobal::locale()->formatDateTime( m_entry->firstVisited ) ).arg( m_entry->numberOfTimesVisited ).arg( m_entry->url.url() ); } return m_entry->url.url(); } -void KonqSidebarHistoryItem::paintCell( QPainter *p, const QColorGroup & cg, +void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg, int column, int width, int alignment ) { - QDateTime dt; - QDateTime current = QDateTime::currentDateTime(); + TQDateTime dt; + TQDateTime current = TQDateTime::currentDateTime(); if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS ) dt = current.addDays( - s_settings->m_valueYoungerThan ); @@ -164,7 +164,7 @@ KonqSidebarHistoryGroupItem::KonqSidebarHistoryGroupItem( const KURL& url, { } -void KonqSidebarHistoryGroupItem::setFavIcon( const QPixmap& pix ) +void KonqSidebarHistoryGroupItem::setFavIcon( const TQPixmap& pix ) { setPixmap( 0, pix ); m_hasFavIcon = true; @@ -187,7 +187,7 @@ void KonqSidebarHistoryGroupItem::remove() KonqSidebarHistoryItem * KonqSidebarHistoryGroupItem::findChild(const KonqHistoryEntry *entry) const { - QListViewItem *child = firstChild(); + TQListViewItem *child = firstChild(); KonqSidebarHistoryItem *item = 0L; while ( child ) { @@ -220,12 +220,12 @@ void KonqSidebarHistoryGroupItem::setOpen( bool open ) } // new items go on top -QString KonqSidebarHistoryGroupItem::key( int column, bool ascending ) const +TQString KonqSidebarHistoryGroupItem::key( int column, bool ascending ) const { if ( !m_lastVisited.isValid() || MYMODULE->sortsByName() ) return KonqSidebarTreeItem::key( column, ascending ); - QString tmp; + TQString tmp; tmp.sprintf( "%08x", m_lastVisited.secsTo( MYMODULE->currentTime() )); return tmp; } @@ -236,10 +236,10 @@ void KonqSidebarHistoryGroupItem::itemUpdated( KonqSidebarHistoryItem *item ) m_lastVisited = item->lastVisited(); } -QDragObject * KonqSidebarHistoryGroupItem::dragObject( QWidget *parent, bool /*move*/) +TQDragObject * KonqSidebarHistoryGroupItem::dragObject( TQWidget *parent, bool /*move*/) { - QString icon = KonqFavIconMgr::iconForURL( m_url.url() ); - KBookmark bookmark = KBookmark::standaloneBookmark( QString::null, m_url, + TQString icon = KonqFavIconMgr::iconForURL( m_url.url() ); + KBookmark bookmark = KBookmark::standaloneBookmark( TQString::null, m_url, icon ); KBookmarkDrag *drag = KBookmarkDrag::newDrag( bookmark, parent ); return drag; diff --git a/konqueror/sidebar/trees/history_module/history_item.h b/konqueror/sidebar/trees/history_module/history_item.h index a7c77a677..fb7786e60 100644 --- a/konqueror/sidebar/trees/history_module/history_item.h +++ b/konqueror/sidebar/trees/history_module/history_item.h @@ -43,23 +43,23 @@ public: // The URL to open when this link is clicked virtual KURL externalURL() const { return m_entry->url; } const KURL& url() const { return m_entry->url; } // a faster one - virtual QString toolTipText() const; + virtual TQString toolTipText() const; - QString host() const { return m_entry->url.host(); } - QString path() const { return m_entry->url.path(); } + TQString host() const { return m_entry->url.host(); } + TQString path() const { return m_entry->url.path(); } - const QDateTime& lastVisited() const { return m_entry->lastVisited; } + const TQDateTime& lastVisited() const { return m_entry->lastVisited; } void update( const KonqHistoryEntry *entry ); const KonqHistoryEntry *entry() const { return m_entry; } - virtual QDragObject * dragObject( QWidget * parent, bool move = false ); + virtual TQDragObject * dragObject( TQWidget * parent, bool move = false ); - virtual QString key( int column, bool ascending ) const; + virtual TQString key( int column, bool ascending ) const; static void setSettings( KonqSidebarHistorySettings *s ) { s_settings = s; } - virtual void paintCell( QPainter *, const QColorGroup & cg, int column, + virtual void paintCell( TQPainter *, const TQColorGroup & cg, int column, int width, int alignment ); private: @@ -85,25 +85,25 @@ public: virtual void setOpen( bool open ); - virtual QString key( int column, bool ascending ) const; + virtual TQString key( int column, bool ascending ) const; void itemUpdated( KonqSidebarHistoryItem *item ); bool hasFavIcon() const { return m_hasFavIcon; } - void setFavIcon( const QPixmap& pix ); + void setFavIcon( const TQPixmap& pix ); - virtual QDragObject * dragObject( QWidget *, bool ); + virtual TQDragObject * dragObject( TQWidget *, bool ); virtual void itemSelected(); // we don't support the following of KonqSidebarTreeItem - bool acceptsDrops( const QStrList& ) { return false; } - virtual void drop( QDropEvent * ) {} + bool acceptsDrops( const TQStrList& ) { return false; } + virtual void drop( TQDropEvent * ) {} virtual KURL externalURL() const { return KURL(); } private: bool m_hasFavIcon; const KURL m_url; - QDateTime m_lastVisited; + TQDateTime m_lastVisited; }; diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index 832abd74e..2f80c26c0 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include #include @@ -39,7 +39,7 @@ static KStaticDeleter sd; KonqSidebarHistorySettings * KonqSidebarHistoryModule::s_settings = 0L; KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree, const char *name ) - : QObject( 0L, name ), KonqSidebarTreeModule( parentTree ), + : TQObject( 0L, name ), KonqSidebarTreeModule( parentTree ), m_dict( 349 ), m_topLevelItem( 0L ), m_dlg( 0L ), @@ -51,10 +51,10 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree s_settings->readSettings( true ); } - connect( s_settings, SIGNAL( settingsChanged() ), SLOT( slotSettingsChanged() )); + connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() )); m_dict.setAutoDelete( true ); - m_currentTime = QDateTime::currentDateTime(); + m_currentTime = TQDateTime::currentDateTime(); KConfig *kc = KGlobal::config(); KConfigGroupSaver cs( kc, "HistorySettings" ); @@ -63,35 +63,35 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree KonqHistoryManager *manager = KonqHistoryManager::kself(); - connect( manager, SIGNAL( loadingFinished() ), SLOT( slotCreateItems() )); - connect( manager, SIGNAL( cleared() ), SLOT( clear() )); + connect( manager, TQT_SIGNAL( loadingFinished() ), TQT_SLOT( slotCreateItems() )); + connect( manager, TQT_SIGNAL( cleared() ), TQT_SLOT( clear() )); - connect( manager, SIGNAL( entryAdded( const KonqHistoryEntry * ) ), - SLOT( slotEntryAdded( const KonqHistoryEntry * ) )); - connect( manager, SIGNAL( entryRemoved( const KonqHistoryEntry *) ), - SLOT( slotEntryRemoved( const KonqHistoryEntry *) )); + connect( manager, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * ) ), + TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * ) )); + connect( manager, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry *) ), + TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry *) )); - connect( parentTree, SIGNAL( expanded( QListViewItem * )), - SLOT( slotItemExpanded( QListViewItem * ))); + connect( parentTree, TQT_SIGNAL( expanded( TQListViewItem * )), + TQT_SLOT( slotItemExpanded( TQListViewItem * ))); m_collection = new KActionCollection( this, "history actions" ); (void) new KAction( i18n("New &Window"), "window_new", 0, this, - SLOT( slotNewWindow() ), m_collection, "open_new"); + TQT_SLOT( slotNewWindow() ), m_collection, "open_new"); (void) new KAction( i18n("&Remove Entry"), "editdelete", 0, this, - SLOT( slotRemoveEntry() ), m_collection, "remove"); + TQT_SLOT( slotRemoveEntry() ), m_collection, "remove"); (void) new KAction( i18n("C&lear History"), "history_clear", 0, this, - SLOT( slotClearHistory() ), m_collection, "clear"); + TQT_SLOT( slotClearHistory() ), m_collection, "clear"); (void) new KAction( i18n("&Preferences..."), "configure", 0, this, - SLOT( slotPreferences()), m_collection, "preferences"); + TQT_SLOT( slotPreferences()), m_collection, "preferences"); KRadioAction *sort; sort = new KRadioAction( i18n("By &Name"), 0, this, - SLOT( slotSortByName() ), m_collection, "byName"); + TQT_SLOT( slotSortByName() ), m_collection, "byName"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( m_sortsByName ); sort = new KRadioAction( i18n("By &Date"), 0, this, - SLOT( slotSortByDate() ), m_collection, "byDate"); + TQT_SLOT( slotSortByDate() ), m_collection, "byDate"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( !m_sortsByName ); @@ -104,7 +104,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree KonqSidebarHistoryModule::~KonqSidebarHistoryModule() { HistoryItemIterator it( m_dict ); - QStringList openGroups; + TQStringList openGroups; while ( it.current() ) { if ( it.current()->isOpen() ) openGroups.append( it.currentKey() ); @@ -125,14 +125,14 @@ void KonqSidebarHistoryModule::slotSettingsChanged() void KonqSidebarHistoryModule::slotCreateItems() { - QApplication::setOverrideCursor( KCursor::waitCursor() ); + TQApplication::setOverrideCursor( KCursor::waitCursor() ); clear(); KonqSidebarHistoryItem *item; KonqHistoryEntry *entry; KonqHistoryList entries( KonqHistoryManager::kself()->entries() ); KonqHistoryIterator it( entries ); - m_currentTime = QDateTime::currentDateTime(); + m_currentTime = TQDateTime::currentDateTime(); // the group item and the item of the serverroot '/' get a fav-icon // if available. All others get the protocol icon. @@ -145,8 +145,8 @@ void KonqSidebarHistoryModule::slotCreateItems() KConfig *kc = KGlobal::config(); KConfigGroupSaver cs( kc, "HistorySettings" ); - QStringList openGroups = kc->readListEntry("OpenGroups"); - QStringList::Iterator it2 = openGroups.begin(); + TQStringList openGroups = kc->readListEntry("OpenGroups"); + TQStringList::Iterator it2 = openGroups.begin(); KonqSidebarHistoryGroupItem *group; while ( it2 != openGroups.end() ) { group = m_dict.find( *it2 ); @@ -156,7 +156,7 @@ void KonqSidebarHistoryModule::slotCreateItems() ++it2; } - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); m_initialized = true; } @@ -171,7 +171,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry ) if ( !m_initialized ) return; - m_currentTime = QDateTime::currentDateTime(); + m_currentTime = TQDateTime::currentDateTime(); KonqSidebarHistoryGroupItem *group = getGroupItem( entry->url ); KonqSidebarHistoryItem *item = group->findChild( entry ); if ( !item ) @@ -179,7 +179,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry ) else item->update( entry ); - // QListView scrolls when calling sort(), so we have to hack around that + // TQListView scrolls when calling sort(), so we have to hack around that // (we don't want no scrolling every time an entry is added) KonqSidebarTree *t = tree(); t->lockScrolling( true ); @@ -194,7 +194,7 @@ void KonqSidebarHistoryModule::slotEntryRemoved( const KonqHistoryEntry *entry ) if ( !m_initialized ) return; - QString groupKey = groupForURL( entry->url ); + TQString groupKey = groupForURL( entry->url ); KonqSidebarHistoryGroupItem *group = m_dict.find( groupKey ); if ( !group ) return; @@ -211,7 +211,7 @@ void KonqSidebarHistoryModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it } bool KonqSidebarHistoryModule::handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, - const QPoint& pos ) + const TQPoint& pos ) { showPopupMenu( ModuleContextMenu, pos ); return true; @@ -219,16 +219,16 @@ bool KonqSidebarHistoryModule::handleTopLevelContextMenu( KonqSidebarTreeTopLeve void KonqSidebarHistoryModule::showPopupMenu() { - showPopupMenu( EntryContextMenu | ModuleContextMenu, QCursor::pos() ); + showPopupMenu( EntryContextMenu | ModuleContextMenu, TQCursor::pos() ); } -void KonqSidebarHistoryModule::showPopupMenu( int which, const QPoint& pos ) +void KonqSidebarHistoryModule::showPopupMenu( int which, const TQPoint& pos ) { - QPopupMenu *sortMenu = new QPopupMenu; + TQPopupMenu *sortMenu = new QPopupMenu; m_collection->action("byName")->plug( sortMenu ); m_collection->action("byDate")->plug( sortMenu ); - QPopupMenu *menu = new QPopupMenu; + TQPopupMenu *menu = new QPopupMenu; if ( which & EntryContextMenu ) { @@ -252,7 +252,7 @@ void KonqSidebarHistoryModule::slotNewWindow() { kdDebug(1201)<<"void KonqSidebarHistoryModule::slotNewWindow()"<selectedItem(); + TQListViewItem *item = tree()->selectedItem(); KonqSidebarHistoryItem *hi = dynamic_cast( item ); if ( hi ) { @@ -263,7 +263,7 @@ void KonqSidebarHistoryModule::slotNewWindow() void KonqSidebarHistoryModule::slotRemoveEntry() { - QListViewItem *item = tree()->selectedItem(); + TQListViewItem *item = tree()->selectedItem(); KonqSidebarHistoryItem *hi = dynamic_cast( item ); if ( hi ) // remove a single entry KonqHistoryManager::kself()->emitRemoveFromHistory( hi->externalURL()); @@ -303,7 +303,7 @@ void KonqSidebarHistoryModule::sortingChanged() kc->sync(); } -void KonqSidebarHistoryModule::slotItemExpanded( QListViewItem *item ) +void KonqSidebarHistoryModule::slotItemExpanded( TQListViewItem *item ) { if ( item == m_topLevelItem && !m_initialized ) slotCreateItems(); @@ -323,12 +323,12 @@ void KonqSidebarHistoryModule::groupOpened( KonqSidebarHistoryGroupItem *item, b KonqSidebarHistoryGroupItem * KonqSidebarHistoryModule::getGroupItem( const KURL& url ) { - const QString& groupKey = groupForURL( url ); + const TQString& groupKey = groupForURL( url ); KonqSidebarHistoryGroupItem *group = m_dict.find( groupKey ); if ( !group ) { group = new KonqSidebarHistoryGroupItem( url, m_topLevelItem ); - QString icon = KonqFavIconMgr::iconForURL( url.url() ); + TQString icon = KonqFavIconMgr::iconForURL( url.url() ); if ( icon.isEmpty() ) group->setPixmap( 0, m_folderClosed ); else diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h index 30295fc3f..752ff57fd 100644 --- a/konqueror/sidebar/trees/history_module/history_module.h +++ b/konqueror/sidebar/trees/history_module/history_module.h @@ -19,10 +19,10 @@ #ifndef HISTORY_MODULE_H #define HISTORY_MODULE_H -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -36,7 +36,7 @@ class KonqSidebarHistorySettings; class KonqSidebarTree; class KonqSidebarTreeItem; -class KonqSidebarHistoryModule : public QObject, public KonqSidebarTreeModule +class KonqSidebarHistoryModule : public TQObject, public KonqSidebarTreeModule { Q_OBJECT @@ -50,18 +50,18 @@ public: virtual ~KonqSidebarHistoryModule(); virtual void addTopLevelItem( KonqSidebarTreeTopLevelItem * item ); - virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *item, const QPoint& pos ); + virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *item, const TQPoint& pos ); - void showPopupMenu( int which, const QPoint& pos ); + void showPopupMenu( int which, const TQPoint& pos ); // called by the items void showPopupMenu(); void groupOpened( KonqSidebarHistoryGroupItem *item, bool open ); - const QDateTime& currentTime() const { return m_currentTime; } + const TQDateTime& currentTime() const { return m_currentTime; } bool sortsByName() const { return m_sortsByName; } - static QString groupForURL( const KURL& url ) { - static const QString& misc = KGlobal::staticQString(i18n("Miscellaneous")); + static TQString groupForURL( const KURL& url ) { + static const TQString& misc = KGlobal::staticQString(i18n("Miscellaneous")); return url.host().isEmpty() ? misc : url.host(); } @@ -78,7 +78,7 @@ private slots: void slotPreferences(); void slotSettingsChanged(); - void slotItemExpanded( QListViewItem * ); + void slotItemExpanded( TQListViewItem * ); void slotSortByName(); void slotSortByDate(); @@ -89,19 +89,19 @@ private: KonqSidebarHistoryGroupItem *getGroupItem( const KURL& url ); void sortingChanged(); - typedef QDictIterator HistoryItemIterator; - QDict m_dict; + typedef TQDictIterator HistoryItemIterator; + TQDict m_dict; KonqSidebarTreeTopLevelItem * m_topLevelItem; KActionCollection *m_collection; KDialogBase *m_dlg; - QPixmap m_folderClosed; - QPixmap m_folderOpen; + TQPixmap m_folderClosed; + TQPixmap m_folderOpen; bool m_initialized; bool m_sortsByName; - QDateTime m_currentTime; // used for sorting the items by date + TQDateTime m_currentTime; // used for sorting the items by date static KonqSidebarHistorySettings *s_settings; }; diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp index ed8bc7756..6871415a0 100644 --- a/konqueror/sidebar/trees/history_module/history_settings.cpp +++ b/konqueror/sidebar/trees/history_module/history_settings.cpp @@ -6,22 +6,22 @@ #include "history_settings.h" -KonqSidebarHistorySettings::KonqSidebarHistorySettings( QObject *parent, const char *name ) - : QObject( parent, name ), +KonqSidebarHistorySettings::KonqSidebarHistorySettings( TQObject *parent, const char *name ) + : TQObject( parent, name ), DCOPObject( "KonqSidebarHistorySettings" ) { m_fontOlderThan.setItalic( true ); // default } KonqSidebarHistorySettings::KonqSidebarHistorySettings() - : QObject(), + : TQObject(), DCOPObject( "KonqSidebarHistorySettings" ) { m_fontOlderThan.setItalic( true ); // default } KonqSidebarHistorySettings::KonqSidebarHistorySettings( const KonqSidebarHistorySettings& s ) - : QObject(), + : TQObject(), DCOPObject( "KonqSidebarHistorySettings" ) { m_valueYoungerThan = s.m_valueYoungerThan; @@ -43,7 +43,7 @@ KonqSidebarHistorySettings::~KonqSidebarHistorySettings() void KonqSidebarHistorySettings::readSettings(bool global) { KConfig *config; - QString oldgroup; + TQString oldgroup; if (global) { config = KGlobal::config(); @@ -56,9 +56,9 @@ void KonqSidebarHistorySettings::readSettings(bool global) m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 ); m_valueOlderThan = config->readNumEntry("Value olderThan", 2 ); - QString minutes = QString::fromLatin1("minutes"); - QString days = QString::fromLatin1("days"); - QString metric = config->readEntry("Metric youngerThan", days ); + TQString minutes = TQString::fromLatin1("minutes"); + TQString days = TQString::fromLatin1("days"); + TQString metric = config->readEntry("Metric youngerThan", days ); m_metricYoungerThan = (metric == days) ? DAYS : MINUTES; metric = config->readEntry("Metric olderThan", days ); m_metricOlderThan = (metric == days) ? DAYS : MINUTES; @@ -83,8 +83,8 @@ void KonqSidebarHistorySettings::applySettings() config->writeEntry("Value youngerThan", m_valueYoungerThan ); config->writeEntry("Value olderThan", m_valueOlderThan ); - QString minutes = QString::fromLatin1("minutes"); - QString days = QString::fromLatin1("days"); + TQString minutes = TQString::fromLatin1("minutes"); + TQString days = TQString::fromLatin1("days"); config->writeEntry("Metric youngerThan", m_metricYoungerThan == DAYS ? days : minutes ); config->writeEntry("Metric olderThan", m_metricOlderThan == DAYS ? @@ -99,7 +99,7 @@ void KonqSidebarHistorySettings::applySettings() // notify konqueror instances about the new configuration kapp->dcopClient()->send( "konqueror*", "KonqSidebarHistorySettings", - "notifySettingsChanged()", QByteArray() ); + "notifySettingsChanged()", TQByteArray() ); } void KonqSidebarHistorySettings::notifySettingsChanged() diff --git a/konqueror/sidebar/trees/history_module/history_settings.h b/konqueror/sidebar/trees/history_module/history_settings.h index 21bcd01db..7b7d75006 100644 --- a/konqueror/sidebar/trees/history_module/history_settings.h +++ b/konqueror/sidebar/trees/history_module/history_settings.h @@ -20,12 +20,12 @@ #ifndef HISTORY_SETTINGS_H #define HISTORY_SETTINGS_H -#include -#include +#include +#include #include -class KonqSidebarHistorySettings : public QObject, public DCOPObject +class KonqSidebarHistorySettings : public TQObject, public DCOPObject { K_DCOP Q_OBJECT @@ -33,7 +33,7 @@ class KonqSidebarHistorySettings : public QObject, public DCOPObject public: enum { MINUTES, DAYS }; - KonqSidebarHistorySettings( QObject *parent, const char *name ); + KonqSidebarHistorySettings( TQObject *parent, const char *name ); virtual ~KonqSidebarHistorySettings(); void readSettings(bool global); @@ -47,8 +47,8 @@ public: bool m_detailedTips; - QFont m_fontYoungerThan; - QFont m_fontOlderThan; + TQFont m_fontYoungerThan; + TQFont m_fontOlderThan; signals: void settingsChanged(); diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp index e4b31b232..ccedf65d9 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp +++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp @@ -20,11 +20,11 @@ * along with this program; if not, write to the Free Software */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -45,10 +45,10 @@ #include "kcmhistory.h" #include "history_settings.h" -typedef KGenericFactory KCMHistoryFactory; +typedef KGenericFactory KCMHistoryFactory; K_EXPORT_COMPONENT_FACTORY (kcm_history, KCMHistoryFactory("kcmhistory") ) -HistorySidebarConfig::HistorySidebarConfig( QWidget *parent, const char* name, const QStringList & ) +HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name, const TQStringList & ) : KCModule (KCMHistoryFactory::instance(), parent, name) { KGlobal::locale()->insertCatalogue("konqueror"); @@ -56,7 +56,7 @@ HistorySidebarConfig::HistorySidebarConfig( QWidget *parent, const char* name, c m_settings = new KonqSidebarHistorySettings( 0, "history settings" ); m_settings->readSettings( false ); - QVBoxLayout *topLayout = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); dialog = new KonqSidebarHistoryDlg(this); dialog->spinEntries->setRange( 0, INT_MAX, 1, false ); @@ -75,33 +75,33 @@ HistorySidebarConfig::HistorySidebarConfig( QWidget *parent, const char* name, c dialog->comboOlder->insertItem( i18n("Days"), KonqSidebarHistorySettings::DAYS ); - connect( dialog->cbExpire, SIGNAL( toggled( bool )), - dialog->spinExpire, SLOT( setEnabled( bool ))); - connect( dialog->spinExpire, SIGNAL( valueChanged( int )), - this, SLOT( slotExpireChanged( int ))); - - connect( dialog->spinNewer, SIGNAL( valueChanged( int )), - SLOT( slotNewerChanged( int ))); - connect( dialog->spinOlder, SIGNAL( valueChanged( int )), - SLOT( slotOlderChanged( int ))); - - connect( dialog->btnFontNewer, SIGNAL( clicked() ), - SLOT( slotGetFontNewer() )); - connect( dialog->btnFontOlder, SIGNAL( clicked() ), - SLOT( slotGetFontOlder() )); - connect( dialog->btnClearHistory, SIGNAL( clicked() ), - SLOT( slotClearHistory() )); - - connect( dialog->cbDetailedTips, SIGNAL( toggled( bool )), - SLOT( configChanged() )); - connect( dialog->cbExpire, SIGNAL( toggled( bool )), - SLOT( configChanged() )); - connect( dialog->spinEntries, SIGNAL( valueChanged( int )), - SLOT( configChanged() )); - connect( dialog->comboNewer, SIGNAL( activated( int )), - SLOT( configChanged() )); - connect( dialog->comboOlder, SIGNAL( activated( int )), - SLOT( configChanged() )); + connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )), + dialog->spinExpire, TQT_SLOT( setEnabled( bool ))); + connect( dialog->spinExpire, TQT_SIGNAL( valueChanged( int )), + this, TQT_SLOT( slotExpireChanged( int ))); + + connect( dialog->spinNewer, TQT_SIGNAL( valueChanged( int )), + TQT_SLOT( slotNewerChanged( int ))); + connect( dialog->spinOlder, TQT_SIGNAL( valueChanged( int )), + TQT_SLOT( slotOlderChanged( int ))); + + connect( dialog->btnFontNewer, TQT_SIGNAL( clicked() ), + TQT_SLOT( slotGetFontNewer() )); + connect( dialog->btnFontOlder, TQT_SIGNAL( clicked() ), + TQT_SLOT( slotGetFontOlder() )); + connect( dialog->btnClearHistory, TQT_SIGNAL( clicked() ), + TQT_SLOT( slotClearHistory() )); + + connect( dialog->cbDetailedTips, TQT_SIGNAL( toggled( bool )), + TQT_SLOT( configChanged() )); + connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )), + TQT_SLOT( configChanged() )); + connect( dialog->spinEntries, TQT_SIGNAL( valueChanged( int )), + TQT_SLOT( configChanged() )); + connect( dialog->comboNewer, TQT_SIGNAL( activated( int )), + TQT_SLOT( configChanged() )); + connect( dialog->comboOlder, TQT_SIGNAL( activated( int )), + TQT_SLOT( configChanged() )); dialog->show(); topLayout->add(dialog); @@ -152,17 +152,17 @@ void HistorySidebarConfig::save() config.writeEntry( "Maximum of History entries", count ); config.writeEntry( "Maximum age of History entries", age ); - QByteArray dataAge; - QDataStream streamAge( dataAge, IO_WriteOnly ); + TQByteArray dataAge; + TQDataStream streamAge( dataAge, IO_WriteOnly ); streamAge << age << "foo"; kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", - "notifyMaxAge(Q_UINT32, QCString)", dataAge ); + "notifyMaxAge(Q_UINT32, TQCString)", dataAge ); - QByteArray dataCount; - QDataStream streamCount( dataCount, IO_WriteOnly ); + TQByteArray dataCount; + TQDataStream streamCount( dataCount, IO_WriteOnly ); streamCount << count << "foo"; kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", - "notifyMaxCount(Q_UINT32, QCString)", dataCount ); + "notifyMaxCount(Q_UINT32, TQCString)", dataCount ); m_settings->m_valueYoungerThan = dialog->spinNewer->value(); m_settings->m_valueOlderThan = dialog->spinOlder->value(); @@ -194,14 +194,14 @@ void HistorySidebarConfig::defaults() dialog->cbDetailedTips->setChecked( true ); - m_fontNewer = QFont(); + m_fontNewer = TQFont(); m_fontNewer.setItalic( true ); - m_fontOlder = QFont(); + m_fontOlder = TQFont(); emit changed(true); } -QString HistorySidebarConfig::quickHelp() const +TQString HistorySidebarConfig::quickHelp() const { return i18n("

History Sidebar

" " You can configure the history sidebar here."); diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.h b/konqueror/sidebar/trees/history_module/kcmhistory.h index 5eaaf3a64..0e354af65 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.h +++ b/konqueror/sidebar/trees/history_module/kcmhistory.h @@ -32,13 +32,13 @@ class HistorySidebarConfig : public KCModule Q_OBJECT public: - HistorySidebarConfig( QWidget *parent=0, const char* name=0, const QStringList &list=QStringList() ); + HistorySidebarConfig( TQWidget *parent=0, const char* name=0, const TQStringList &list=TQStringList() ); void load(); void save(); void defaults(); - QString quickHelp() const; + TQString quickHelp() const; private slots: void configChanged(); @@ -53,8 +53,8 @@ private slots: void slotClearHistory(); private: - QFont m_fontNewer; - QFont m_fontOlder; + TQFont m_fontNewer; + TQFont m_fontOlder; KonqSidebarHistoryDlg* dialog; KonqSidebarHistorySettings *m_settings; diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index e30e21ac9..8117d5223 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -20,12 +20,12 @@ #include "konq_sidebartreemodule.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -53,18 +53,18 @@ static const int autoOpenTimeout = 750; -getModule KonqSidebarTree::getPluginFactory(QString name) +getModule KonqSidebarTree::getPluginFactory(TQString name) { if (!pluginFactories.contains(name)) { KLibLoader *loader = KLibLoader::self(); - QString libName = pluginInfo[name]; - KLibrary *lib = loader->library(QFile::encodeName(libName)); + TQString libName = pluginInfo[name]; + KLibrary *lib = loader->library(TQFile::encodeName(libName)); if (lib) { // get the create_ function - QString factory = "create_" + libName; - void *create = lib->symbol(QFile::encodeName(factory)); + TQString factory = "create_" + libName; + void *create = lib->symbol(TQFile::encodeName(factory)); if (create) { getModule func = (getModule)create; @@ -88,15 +88,15 @@ void KonqSidebarTree::loadModuleFactories() pluginFactories.clear(); pluginInfo.clear(); KStandardDirs *dirs=KGlobal::dirs(); - QStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true); + TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true); - for (QStringList::ConstIterator it=list.begin();it!=list.end();++it) + for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it) { KSimpleConfig ksc(*it); ksc.setGroup("Desktop Entry"); - QString name = ksc.readEntry("X-KDE-TreeModule"); - QString libName = ksc.readEntry("X-KDE-TreeModule-Lib"); + TQString name = ksc.readEntry("X-KDE-TreeModule"); + TQString libName = ksc.readEntry("X-KDE-TreeModule-Lib"); if ((name.isEmpty()) || (libName.isEmpty())) {kdWarning()<<"Bad Configuration file for a dirtree module "<<*it<setAcceptDrops( true ); m_lstModules.setAutoDelete( true ); - setSelectionMode( QListView::Single ); + setSelectionMode( TQListView::Single ); setDragEnabled(true); m_part = parent; - m_animationTimer = new QTimer( this ); - connect( m_animationTimer, SIGNAL( timeout() ), - this, SLOT( slotAnimation() ) ); + m_animationTimer = new TQTimer( this ); + connect( m_animationTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( slotAnimation() ) ); m_currentBeforeDropItem = 0; m_dropItem = 0; m_bOpeningFirstChild=false; - addColumn( QString::null ); + addColumn( TQString::null ); header()->hide(); setTreeStepSize(15); - m_autoOpenTimer = new QTimer( this ); - connect( m_autoOpenTimer, SIGNAL( timeout() ), - this, SLOT( slotAutoOpenFolder() ) ); + m_autoOpenTimer = new TQTimer( this ); + connect( m_autoOpenTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( slotAutoOpenFolder() ) ); - connect( this, SIGNAL( doubleClicked( QListViewItem * ) ), - this, SLOT( slotDoubleClicked( QListViewItem * ) ) ); - connect( this, SIGNAL( mouseButtonPressed(int, QListViewItem*, const QPoint&, int)), - this, SLOT( slotMouseButtonPressed(int, QListViewItem*, const QPoint&, int)) ); - connect( this, SIGNAL( mouseButtonClicked( int, QListViewItem*, const QPoint&, int ) ), - this, SLOT( slotMouseButtonClicked( int, QListViewItem*, const QPoint&, int ) ) ); - connect( this, SIGNAL( returnPressed( QListViewItem * ) ), - this, SLOT( slotDoubleClicked( QListViewItem * ) ) ); - connect( this, SIGNAL( selectionChanged() ), - this, SLOT( slotSelectionChanged() ) ); + connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQT_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQT_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) ); + connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ), + this, TQT_SLOT( slotMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) ); + connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQT_SIGNAL( selectionChanged() ), + this, TQT_SLOT( slotSelectionChanged() ) ); - connect( this, SIGNAL(itemRenamed(QListViewItem*, const QString &, int)), - this, SLOT(slotItemRenamed(QListViewItem*, const QString &, int))); + connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), + this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); /* assert( m_part->getInterfaces()->getInstance()->dirs ); - QString dirtreeDir = m_part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); */ + TQString dirtreeDir = m_part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); */ // assert( KGlobal::dirs() ); -// QString dirtreeDir = part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); +// TQString dirtreeDir = part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); if (virt==VIRT_Folder) { @@ -190,7 +190,7 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, QWidget *parentWidge m_bOpeningFirstChild = false; } - setFrameStyle( QFrame::ToolBarPanel | QFrame::Raised ); + setFrameStyle( TQFrame::ToolBarPanel | TQFrame::Raised ); } KonqSidebarTree::~KonqSidebarTree() @@ -210,7 +210,7 @@ void KonqSidebarTree::itemDestructed( KonqSidebarTreeItem *item ) } } -void KonqSidebarTree::setDropFormats(const QStringList &formats) +void KonqSidebarTree::setDropFormats(const TQStringList &formats) { d->m_dropFormats = formats; } @@ -244,7 +244,7 @@ void KonqSidebarTree::followURL( const KURL &url ) } kdDebug(1201) << "KonqDirTree::followURL: " << url.url() << endl; - QPtrListIterator topItem ( m_topLevelItems ); + TQPtrListIterator topItem ( m_topLevelItems ); for (; topItem.current(); ++topItem ) { if ( topItem.current()->externalURL().isParentOf( url ) ) @@ -256,7 +256,7 @@ void KonqSidebarTree::followURL( const KURL &url ) kdDebug(1201) << "KonqDirTree::followURL: Not found" << endl; } -void KonqSidebarTree::contentsDragEnterEvent( QDragEnterEvent *ev ) +void KonqSidebarTree::contentsDragEnterEvent( TQDragEnterEvent *ev ) { m_dropItem = 0; m_currentBeforeDropItem = selectedItem(); @@ -267,9 +267,9 @@ void KonqSidebarTree::contentsDragEnterEvent( QDragEnterEvent *ev ) m_lstDropFormats.append( ev->format( i ) ); } -void KonqSidebarTree::contentsDragMoveEvent( QDragMoveEvent *e ) +void KonqSidebarTree::contentsDragMoveEvent( TQDragMoveEvent *e ) { - QListViewItem *item = itemAt( contentsToViewport( e->pos() ) ); + TQListViewItem *item = itemAt( contentsToViewport( e->pos() ) ); // Accept drops on the background, if URLs if ( !item && m_lstDropFormats.contains("text/uri-list") ) @@ -308,7 +308,7 @@ void KonqSidebarTree::contentsDragMoveEvent( QDragMoveEvent *e ) } } -void KonqSidebarTree::contentsDragLeaveEvent( QDragLeaveEvent *ev ) +void KonqSidebarTree::contentsDragLeaveEvent( TQDragLeaveEvent *ev ) { // Restore the current item to what it was before the dragging (#17070) if ( m_currentBeforeDropItem ) @@ -324,7 +324,7 @@ void KonqSidebarTree::contentsDragLeaveEvent( QDragLeaveEvent *ev ) } } -void KonqSidebarTree::contentsDropEvent( QDropEvent *ev ) +void KonqSidebarTree::contentsDropEvent( TQDropEvent *ev ) { if (d->m_dropMode == SidebarTreeMode) { m_autoOpenTimer->stop(); @@ -352,23 +352,23 @@ void KonqSidebarTree::contentsDropEvent( QDropEvent *ev ) } } -static QString findUniqueFilename(const QString &path, QString filename) +static TQString findUniqueFilename(const TQString &path, TQString filename) { if (filename.endsWith(".desktop")) filename.truncate(filename.length()-8); - QString name = filename; + TQString name = filename; int n = 2; - while(QFile::exists(path + filename + ".desktop")) + while(TQFile::exists(path + filename + ".desktop")) { - filename = QString("%2_%1").arg(n++).arg(name); + filename = TQString("%2_%1").arg(n++).arg(name); } return path+filename+".desktop"; } void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url) { - QString path; + TQString path; if (item) path = item->path(); else @@ -378,23 +378,23 @@ void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url if (url.isLocalFile() && url.fileName().endsWith(".desktop")) { - QString filename = findUniqueFilename(path, url.fileName()); + TQString filename = findUniqueFilename(path, url.fileName()); destUrl.setPath(filename); KIO::NetAccess::copy(url, destUrl, this); } else { - QString name = url.host(); + TQString name = url.host(); if (name.isEmpty()) name = url.fileName(); - QString filename = findUniqueFilename(path, name); + TQString filename = findUniqueFilename(path, name); destUrl.setPath(filename); KDesktopFile cfg(filename); cfg.writeEntry("Encoding", "UTF-8"); cfg.writeEntry("Type","Link"); cfg.writeEntry("URL", url.url()); - QString icon = "folder"; + TQString icon = "folder"; if (!url.isLocalFile()) icon = KMimeType::favIconForURL(url); if (icon.isEmpty()) @@ -413,7 +413,7 @@ void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url item->setOpen(true); } -bool KonqSidebarTree::acceptDrag(QDropEvent* e) const +bool KonqSidebarTree::acceptDrag(TQDropEvent* e) const { // for KListViewMode... for( int i = 0; e->format( i ); i++ ) @@ -422,31 +422,31 @@ bool KonqSidebarTree::acceptDrag(QDropEvent* e) const return false; } -QDragObject* KonqSidebarTree::dragObject() +TQDragObject* KonqSidebarTree::dragObject() { KonqSidebarTreeItem* item = static_cast( selectedItem() ); if ( !item ) return 0; - QDragObject* drag = item->dragObject( viewport(), false ); + TQDragObject* drag = item->dragObject( viewport(), false ); if ( !drag ) return 0; - const QPixmap *pix = item->pixmap(0); + const TQPixmap *pix = item->pixmap(0); if ( pix && drag->pixmap().isNull() ) drag->setPixmap( *pix ); return drag; } -void KonqSidebarTree::leaveEvent( QEvent *e ) +void KonqSidebarTree::leaveEvent( TQEvent *e ) { KListView::leaveEvent( e ); -// emitStatusBarText( QString::null ); +// emitStatusBarText( TQString::null ); } -void KonqSidebarTree::slotDoubleClicked( QListViewItem *item ) +void KonqSidebarTree::slotDoubleClicked( TQListViewItem *item ) { //kdDebug(1201) << "KonqSidebarTree::slotDoubleClicked " << item << endl; if ( !item ) @@ -459,7 +459,7 @@ void KonqSidebarTree::slotDoubleClicked( QListViewItem *item ) item->setOpen( !item->isOpen() ); } -void KonqSidebarTree::slotExecuted( QListViewItem *item ) +void KonqSidebarTree::slotExecuted( TQListViewItem *item ) { kdDebug(1201) << "KonqSidebarTree::slotExecuted " << item << endl; if ( !item ) @@ -479,7 +479,7 @@ void KonqSidebarTree::slotExecuted( QListViewItem *item ) openURLRequest( externalURL, args ); } -void KonqSidebarTree::slotMouseButtonPressed( int _button, QListViewItem* _item, const QPoint&, int col ) +void KonqSidebarTree::slotMouseButtonPressed( int _button, TQListViewItem* _item, const TQPoint&, int col ) { KonqSidebarTreeItem * item = static_cast( _item ); if (_button == RightButton) @@ -492,7 +492,7 @@ void KonqSidebarTree::slotMouseButtonPressed( int _button, QListViewItem* _item, } } -void KonqSidebarTree::slotMouseButtonClicked(int _button, QListViewItem* _item, const QPoint&, int col) +void KonqSidebarTree::slotMouseButtonClicked(int _button, TQListViewItem* _item, const TQPoint&, int col) { KonqSidebarTreeItem * item = static_cast(_item); if(_item && col < 2) @@ -554,7 +554,7 @@ void KonqSidebarTree::FilesAdded( const KURL & dir ) kdDebug(1201) << "KonqSidebarTree::FilesAdded " << dir.url() << endl; if ( m_dirtreeDir.dir.isParentOf( dir ) ) // We use a timer in case of DCOP re-entrance.. - QTimer::singleShot( 0, this, SLOT( rescanConfiguration() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) ); } void KonqSidebarTree::FilesRemoved( const KURL::List & urls ) @@ -565,7 +565,7 @@ void KonqSidebarTree::FilesRemoved( const KURL::List & urls ) //kdDebug(1201) << "KonqSidebarTree::FilesRemoved " << (*it).prettyURL() << endl; if ( m_dirtreeDir.dir.isParentOf( *it ) ) { - QTimer::singleShot( 0, this, SLOT( rescanConfiguration() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) ); kdDebug(1201) << "KonqSidebarTree::FilesRemoved done" << endl; return; } @@ -579,17 +579,17 @@ void KonqSidebarTree::FilesChanged( const KURL::List & urls ) FilesRemoved( urls ); } -void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const QString &path, bool isRoot ) +void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path, bool isRoot ) { - QDir dir( path ); + TQDir dir( path ); if ( !dir.isReadable() ) return; kdDebug(1201) << "scanDir " << path << endl; - QStringList entries = dir.entryList( QDir::Files ); - QStringList dirEntries = dir.entryList( QDir::Dirs | QDir::NoSymLinks ); + TQStringList entries = dir.entryList( TQDir::Files ); + TQStringList dirEntries = dir.entryList( TQDir::Dirs | TQDir::NoSymLinks ); dirEntries.remove( "." ); dirEntries.remove( ".." ); @@ -606,7 +606,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const QString &path, // Version 5 includes the audiocd browser // Version 6 includes the printmanager and lan browser const int currentVersion = 6; - QString key = QString::fromLatin1("X-KDE-DirTreeVersionNumber"); + TQString key = TQString::fromLatin1("X-KDE-DirTreeVersionNumber"); KSimpleConfig versionCfg( path + "/.directory" ); int versionNumber = versionCfg.readNumEntry( key, 1 ); kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl; @@ -620,64 +620,64 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const QString &path, if (copyConfig) { // We will copy over the configuration for the dirtree, from the global directory - QStringList dirtree_dirs = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/"); + TQStringList dirtree_dirs = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/"); -// QString dirtree_dir = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/").last(); // most global +// TQString dirtree_dir = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/").last(); // most global // kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir=" << dirtree_dir << endl; /* // debug code - QStringList blah = m_part->getInterfaces->getInstance()->dirs()->dirs()->findDirs( "data", "konqueror/dirtree" ); - QStringList::ConstIterator eIt = blah.begin(); - QStringList::ConstIterator eEnd = blah.end(); + TQStringList blah = m_part->getInterfaces->getInstance()->dirs()->dirs()->findDirs( "data", "konqueror/dirtree" ); + TQStringList::ConstIterator eIt = blah.begin(); + TQStringList::ConstIterator eEnd = blah.end(); for (; eIt != eEnd; ++eIt ) kdDebug(1201) << "KonqSidebarTree::scanDir findDirs got me " << *eIt << endl; // end debug code */ - for (QStringList::const_iterator ddit=dirtree_dirs.begin();ddit!=dirtree_dirs.end();++ddit) { - QString dirtree_dir=*ddit; + for (TQStringList::const_iterator ddit=dirtree_dirs.begin();ddit!=dirtree_dirs.end();++ddit) { + TQString dirtree_dir=*ddit; if (dirtree_dir==path) continue; // if ( !dirtree_dir.isEmpty() && dirtree_dir != path ) { - QDir globalDir( dirtree_dir ); + TQDir globalDir( dirtree_dir ); Q_ASSERT( globalDir.isReadable() ); // Only copy the entries that don't exist yet in the local dir - QStringList globalDirEntries = globalDir.entryList(); - QStringList::ConstIterator eIt = globalDirEntries.begin(); - QStringList::ConstIterator eEnd = globalDirEntries.end(); + TQStringList globalDirEntries = globalDir.entryList(); + TQStringList::ConstIterator eIt = globalDirEntries.begin(); + TQStringList::ConstIterator eEnd = globalDirEntries.end(); for (; eIt != eEnd; ++eIt ) { //kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl; if ( *eIt != "." && *eIt != ".." && !entries.contains( *eIt ) && !dirEntries.contains( *eIt ) ) { // we don't have that one yet -> copy it. - QString cp("cp -R -- "); + TQString cp("cp -R -- "); cp += KProcess::quote(dirtree_dir + *eIt); cp += " "; cp += KProcess::quote(path); kdDebug(1201) << "KonqSidebarTree::scanDir executing " << cp << endl; - ::system( QFile::encodeName(cp) ); + ::system( TQFile::encodeName(cp) ); } } } } - // hack to make QDir refresh the lists + // hack to make TQDir refresh the lists dir.setPath(path); - entries = dir.entryList( QDir::Files ); - dirEntries = dir.entryList( QDir::Dirs ); + entries = dir.entryList( TQDir::Files ); + dirEntries = dir.entryList( TQDir::Dirs ); dirEntries.remove( "." ); dirEntries.remove( ".." ); } } - QStringList::ConstIterator eIt = entries.begin(); - QStringList::ConstIterator eEnd = entries.end(); + TQStringList::ConstIterator eIt = entries.begin(); + TQStringList::ConstIterator eEnd = entries.end(); for (; eIt != eEnd; ++eIt ) { - QString filePath = QString( *eIt ).prepend( path ); + TQString filePath = TQString( *eIt ).prepend( path ); KURL u; u.setPath( filePath ); if ( KMimeType::findByURL( u, 0, true )->name() == "application/x-desktop" ) @@ -689,7 +689,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const QString &path, for (; eIt != eEnd; eIt++ ) { - QString newPath = QString( path ).append( *eIt ).append( '/' ); + TQString newPath = TQString( path ).append( *eIt ).append( '/' ); if ( newPath == KGlobalSettings::autostartPath() ) continue; @@ -698,18 +698,18 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const QString &path, } } -void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const QString &path ) +void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const TQString &path ) { - QDir dir( path ); - QString name = dir.dirName(); - QString icon = "folder"; + TQDir dir( path ); + TQString name = dir.dirName(); + TQString icon = "folder"; bool open = false; kdDebug(1201) << "Scanning " << path << endl; - QString dotDirectoryFile = QString( path ).append( "/.directory" ); + TQString dotDirectoryFile = TQString( path ).append( "/.directory" ); - if ( QFile::exists( dotDirectoryFile ) ) + if ( TQFile::exists( dotDirectoryFile ) ) { kdDebug(1201) << "Reading the .directory" << endl; KSimpleConfig cfg( dotDirectoryFile, true ); @@ -745,15 +745,15 @@ void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const QStr item->setExpandable( false ); } -void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const QString &filename ) +void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const TQString &filename ) { KDesktopFile cfg( filename, true ); cfg.setDollarExpansion(true); - QFileInfo inf( filename ); + TQFileInfo inf( filename ); - QString path = filename; - QString name = KIO::decodeFileName( inf.fileName() ); + TQString path = filename; + TQString name = KIO::decodeFileName( inf.fileName() ); if ( name.length() > 8 && name.right( 8 ) == ".desktop" ) name.truncate( name.length() - 8 ); if ( name.length() > 7 && name.right( 7 ) == ".kdelnk" ) @@ -764,8 +764,8 @@ void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const QStr // Here's where we need to create the right module... // ### TODO: make this KTrader/KLibrary based. - QString moduleName = cfg.readEntry( "X-KDE-TreeModule" ); - QString showHidden=cfg.readEntry("X-KDE-TreeModule-ShowHidden"); + TQString moduleName = cfg.readEntry( "X-KDE-TreeModule" ); + TQString showHidden=cfg.readEntry("X-KDE-TreeModule-ShowHidden"); if (moduleName.isEmpty()) moduleName="Directory"; kdDebug(1201) << "##### Loading module: " << moduleName << " file: " << filename << endl; @@ -806,7 +806,7 @@ void KonqSidebarTree::slotAnimation() for (; it != end; ++it ) { uint & iconNumber = it.data().iconNumber; - QString icon = QString::fromLatin1( it.data().iconBaseName ).append( QString::number( iconNumber ) ); + TQString icon = TQString::fromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) ); it.key()->setPixmap( 0, SmallIcon( icon)); iconNumber++; @@ -816,9 +816,9 @@ void KonqSidebarTree::slotAnimation() } -void KonqSidebarTree::startAnimation( KonqSidebarTreeItem * item, const char * iconBaseName, uint iconCount, const QPixmap * originalPixmap ) +void KonqSidebarTree::startAnimation( KonqSidebarTreeItem * item, const char * iconBaseName, uint iconCount, const TQPixmap * originalPixmap ) { - const QPixmap *pix = originalPixmap ? originalPixmap : item->pixmap(0); + const TQPixmap *pix = originalPixmap ? originalPixmap : item->pixmap(0); if (pix) { m_mapCurrentOpeningFolders.insert( item, AnimationInfo( iconBaseName, iconCount, *pix ) ); @@ -851,7 +851,7 @@ void KonqSidebarTree::setContentsPos( int x, int y ) KListView::setContentsPos( x, y ); } -void KonqSidebarTree::slotItemRenamed(QListViewItem* item, const QString &name, int col) +void KonqSidebarTree::slotItemRenamed(TQListViewItem* item, const TQString &name, int col) { Q_ASSERT(col==0); if (col != 0) return; @@ -881,7 +881,7 @@ bool KonqSidebarTree::tabSupport() QCStringList funcs; reply.get(funcs, "QCStringList"); for (QCStringList::ConstIterator it = funcs.begin(); it != funcs.end(); ++it) { - if ((*it) == "void newTab(QString url)") { + if ((*it) == "void newTab(TQString url)") { return true; break; } @@ -901,24 +901,24 @@ void KonqSidebarTree::showToplevelContextMenu() { m_collection = new KActionCollection( this, "bookmark actions" ); (void) new KAction( i18n("&Create New Folder..."), "folder_new", 0, this, - SLOT( slotCreateFolder() ), m_collection, "create_folder"); + TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); (void) new KAction( i18n("Delete Folder"), "editdelete", 0, this, - SLOT( slotDelete() ), m_collection, "delete_folder"); + TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); (void) new KAction( i18n("Rename"), 0, this, - SLOT( slotRename() ), m_collection, "rename"); + TQT_SLOT( slotRename() ), m_collection, "rename"); (void) new KAction( i18n("Delete Link"), "editdelete", 0, this, - SLOT( slotDelete() ), m_collection, "delete_link"); + TQT_SLOT( slotDelete() ), m_collection, "delete_link"); (void) new KAction( i18n("Properties"), "edit", 0, this, - SLOT( slotProperties() ), m_collection, "item_properties"); + TQT_SLOT( slotProperties() ), m_collection, "item_properties"); (void) new KAction( i18n("Open in New Window"), "window_new", 0, this, - SLOT( slotOpenNewWindow() ), m_collection, "open_window"); + TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); (void) new KAction( i18n("Open in New Tab"), "tab_new", 0, this, - SLOT( slotOpenTab() ), m_collection, "open_tab"); + TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); (void) new KAction( i18n("Copy Link Address"), "editcopy", 0, this, - SLOT( slotCopyLocation() ), m_collection, "copy_location"); + TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); } - QPopupMenu *menu = new QPopupMenu; + TQPopupMenu *menu = new QPopupMenu; if (item) { if (item->isTopLevelGroup()) { @@ -943,7 +943,7 @@ void KonqSidebarTree::showToplevelContextMenu() m_currentTopLevelItem = item; - menu->exec( QCursor::pos() ); + menu->exec( TQCursor::pos() ); delete menu; m_currentTopLevelItem = 0; @@ -951,8 +951,8 @@ void KonqSidebarTree::showToplevelContextMenu() void KonqSidebarTree::slotCreateFolder() { - QString path; - QString name = i18n("New Folder"); + TQString path; + TQString name = i18n("New Folder"); while(true) { @@ -971,7 +971,7 @@ void KonqSidebarTree::slotCreateFolder() path = path + name; - if (!QFile::exists(path)) + if (!TQFile::exists(path)) break; name = name + "-2"; @@ -1017,7 +1017,7 @@ void KonqSidebarTree::slotOpenTab() { if (!m_currentTopLevelItem) return; DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name()); - ref.call( "newTab(QString)", m_currentTopLevelItem->externalURL().url() ); + ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() ); } void KonqSidebarTree::slotCopyLocation() @@ -1032,11 +1032,11 @@ void KonqSidebarTree::slotCopyLocation() /////////////////////////////////////////////////////////////////// -void KonqSidebarTreeToolTip::maybeTip( const QPoint &point ) +void KonqSidebarTreeToolTip::maybeTip( const TQPoint &point ) { - QListViewItem *item = m_view->itemAt( point ); + TQListViewItem *item = m_view->itemAt( point ); if ( item ) { - QString text = static_cast( item )->toolTipText(); + TQString text = static_cast( item )->toolTipText(); if ( !text.isEmpty() ) tip ( m_view->itemRect( item ), text ); } diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h index cc2035466..b536355ba 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.h +++ b/konqueror/sidebar/trees/konq_sidebartree.h @@ -24,10 +24,10 @@ #include "konq_sidebartreetoplevelitem.h" #include "konqsidebar_tree.h" #include -#include -#include -#include -#include +#include +#include +#include +#include class KonqSidebarTreeModule; class KonqSidebarTreeItem; @@ -46,20 +46,20 @@ typedef struct DirTreeConfigData_ { KURL dir; int type; - QString relDir; + TQString relDir; } DirTreeConfigData; class KonqSidebarTreeToolTip : public QToolTip { public: - KonqSidebarTreeToolTip( QListView *view ) : QToolTip( view->viewport() ), m_view( view ) {} + KonqSidebarTreeToolTip( TQListView *view ) : TQToolTip( view->viewport() ), m_view( view ) {} protected: - virtual void maybeTip( const QPoint & ); + virtual void maybeTip( const TQPoint & ); private: - QListView *m_view; + TQListView *m_view; }; typedef enum { @@ -77,7 +77,7 @@ class KonqSidebarTree : public KListView, public KDirNotify { Q_OBJECT public: - KonqSidebarTree( KonqSidebar_Tree *parent, QWidget *parentWidget, int virt, const QString& path ); + KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path ); virtual ~KonqSidebarTree(); void followURL( const KURL &url ); @@ -87,7 +87,7 @@ public: */ KonqSidebarTreeItem * currentItem() const; - void startAnimation( KonqSidebarTreeItem * item, const char * iconBaseName = "kde", uint iconCount = 6, const QPixmap * originalPixmap = 0L ); + void startAnimation( KonqSidebarTreeItem * item, const char * iconBaseName = "kde", uint iconCount = 6, const TQPixmap * originalPixmap = 0L ); void stopAnimation( KonqSidebarTreeItem * item ); // Reimplemented from KDirNotify @@ -106,7 +106,7 @@ public: void itemDestructed( KonqSidebarTreeItem *item ); - void setDropFormats( const QStringList &formats ); // used in KListView mode + void setDropFormats( const TQStringList &formats ); // used in KListView mode // Show context menu for toplevel items void showToplevelContextMenu(); @@ -121,21 +121,21 @@ public slots: virtual void setContentsPos( int x, int y ); protected: - virtual void contentsDragEnterEvent( QDragEnterEvent *e ); - virtual void contentsDragMoveEvent( QDragMoveEvent *e ); - virtual void contentsDragLeaveEvent( QDragLeaveEvent *e ); - virtual void contentsDropEvent( QDropEvent *ev ); - virtual bool acceptDrag(QDropEvent* e) const; // used in KListView mode + virtual void contentsDragEnterEvent( TQDragEnterEvent *e ); + virtual void contentsDragMoveEvent( TQDragMoveEvent *e ); + virtual void contentsDragLeaveEvent( TQDragLeaveEvent *e ); + virtual void contentsDropEvent( TQDropEvent *ev ); + virtual bool acceptDrag(TQDropEvent* e) const; // used in KListView mode - virtual void leaveEvent( QEvent * ); + virtual void leaveEvent( TQEvent * ); - virtual QDragObject* dragObject(); + virtual TQDragObject* dragObject(); private slots: - void slotDoubleClicked( QListViewItem *item ); - void slotExecuted( QListViewItem *item ); - void slotMouseButtonPressed(int _button, QListViewItem* _item, const QPoint&, int col); - void slotMouseButtonClicked(int _button, QListViewItem* _item, const QPoint&, int col); + void slotDoubleClicked( TQListViewItem *item ); + void slotExecuted( TQListViewItem *item ); + void slotMouseButtonPressed(int _button, TQListViewItem* _item, const TQPoint&, int col); + void slotMouseButtonClicked(int _button, TQListViewItem* _item, const TQPoint&, int col); void slotSelectionChanged(); void slotAnimation(); @@ -144,7 +144,7 @@ private slots: void rescanConfiguration(); - void slotItemRenamed(QListViewItem*, const QString &, int); + void slotItemRenamed(TQListViewItem*, const TQString &, int); void slotCreateFolder(); void slotDelete(); @@ -156,41 +156,41 @@ private slots: private: void clearTree(); - void scanDir( KonqSidebarTreeItem *parent, const QString &path, bool isRoot = false ); - void loadTopLevelGroup( KonqSidebarTreeItem *parent, const QString &path ); - void loadTopLevelItem( KonqSidebarTreeItem *parent, const QString &filename ); + void scanDir( KonqSidebarTreeItem *parent, const TQString &path, bool isRoot = false ); + void loadTopLevelGroup( KonqSidebarTreeItem *parent, const TQString &path ); + void loadTopLevelItem( KonqSidebarTreeItem *parent, const TQString &filename ); void loadModuleFactories(); private: - QPtrList m_topLevelItems; + TQPtrList m_topLevelItems; KonqSidebarTreeTopLevelItem *m_currentTopLevelItem; - QPtrList m_lstModules; + TQPtrList m_lstModules; KonqSidebarPlugin *m_part; struct AnimationInfo { - AnimationInfo( const char * _iconBaseName, uint _iconCount, const QPixmap & _originalPixmap ) + AnimationInfo( const char * _iconBaseName, uint _iconCount, const TQPixmap & _originalPixmap ) : iconBaseName(_iconBaseName), iconCount(_iconCount), iconNumber(1), originalPixmap(_originalPixmap) {} AnimationInfo() : iconCount(0) {} - QCString iconBaseName; + TQCString iconBaseName; uint iconCount; uint iconNumber; - QPixmap originalPixmap; + TQPixmap originalPixmap; }; - typedef QMap MapCurrentOpeningFolders; + typedef TQMap MapCurrentOpeningFolders; MapCurrentOpeningFolders m_mapCurrentOpeningFolders; - QTimer *m_animationTimer; + TQTimer *m_animationTimer; - QListViewItem *m_currentBeforeDropItem; // The item that was current before the drag-enter event happened - QListViewItem *m_dropItem; // The item we are moving the mouse over (during a drag) - QStrList m_lstDropFormats; + TQListViewItem *m_currentBeforeDropItem; // The item that was current before the drag-enter event happened + TQListViewItem *m_dropItem; // The item we are moving the mouse over (during a drag) + TQStrList m_lstDropFormats; - QTimer *m_autoOpenTimer; + TQTimer *m_autoOpenTimer; // The base URL for our configuration directory //KURL m_dirtreeDir; @@ -199,10 +199,10 @@ private: KonqSidebarTreeToolTip m_toolTip; bool m_scrollingLocked; - getModule getPluginFactory(QString name); + getModule getPluginFactory(TQString name); - QMap pluginInfo; - QMap pluginFactories; + TQMap pluginInfo; + TQMap pluginFactories; bool m_bOpeningFirstChild; KActionCollection *m_collection; @@ -216,9 +216,9 @@ signals: #define signals protected void openURLRequest( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() ); void createNewWindow( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() ); - void popupMenu( const QPoint &global, const KURL &url, - const QString &mimeType, mode_t mode = (mode_t)-1 ); - void popupMenu( const QPoint &global, const KFileItemList &items ); + void popupMenu( const TQPoint &global, const KURL &url, + const TQString &mimeType, mode_t mode = (mode_t)-1 ); + void popupMenu( const TQPoint &global, const KFileItemList &items ); void enableAction( const char * name, bool enabled ); }; diff --git a/konqueror/sidebar/trees/konq_sidebartreeitem.cpp b/konqueror/sidebar/trees/konq_sidebartreeitem.cpp index daa0ae777..cc3f83950 100644 --- a/konqueror/sidebar/trees/konq_sidebartreeitem.cpp +++ b/konqueror/sidebar/trees/konq_sidebartreeitem.cpp @@ -22,13 +22,13 @@ //#include "konq_sidebartreepart.h" KonqSidebarTreeItem::KonqSidebarTreeItem( KonqSidebarTreeItem *parentItem, KonqSidebarTreeTopLevelItem *topLevelItem ) - : QListViewItem( parentItem ) + : TQListViewItem( parentItem ) { initItem( topLevelItem ); } KonqSidebarTreeItem::KonqSidebarTreeItem( KonqSidebarTree *parent, KonqSidebarTreeTopLevelItem *topLevelItem ) - : QListViewItem( parent ) + : TQListViewItem( parent ) { initItem( topLevelItem ); } diff --git a/konqueror/sidebar/trees/konq_sidebartreeitem.h b/konqueror/sidebar/trees/konq_sidebartreeitem.h index ef6f73931..0cb7a7d12 100644 --- a/konqueror/sidebar/trees/konq_sidebartreeitem.h +++ b/konqueror/sidebar/trees/konq_sidebartreeitem.h @@ -20,8 +20,8 @@ #ifndef konq_treeitem_h #define konq_treeitem_h -#include -#include +#include +#include #include class QPainter; @@ -48,14 +48,14 @@ public: virtual ~KonqSidebarTreeItem(); // Whether the item accepts a drop consisting in those @p formats - virtual bool acceptsDrops( const QStrList & ) { return false; } + virtual bool acceptsDrops( const TQStrList & ) { return false; } // Handle a drop on this item. If you didn't want it, you shouln't // have return true in acceptsDrops :) - virtual void drop( QDropEvent * ) {} + virtual void drop( TQDropEvent * ) {} // Create a drag object from this item. - virtual QDragObject * dragObject( QWidget * parent, bool move = false ) = 0; + virtual TQDragObject * dragObject( TQWidget * parent, bool move = false ) = 0; virtual void middleButtonClicked(); virtual void rightButtonPressed() = 0; @@ -65,17 +65,17 @@ public: virtual void del() {} virtual void shred() {} virtual void rename() {} - virtual void rename( const QString& ) {} + virtual void rename( const TQString& ) {} // The URL to open when this link is clicked virtual KURL externalURL() const = 0; // The mimetype to use when this link is clicked - // If unknown, return QString::null, konq will determine the mimetype itself - virtual QString externalMimeType() const { return QString::null; } + // If unknown, return TQString::null, konq will determine the mimetype itself + virtual TQString externalMimeType() const { return TQString::null; } // overwrite this if you want a tooltip shown on your item - virtual QString toolTipText() const { return QString::null; } + virtual TQString toolTipText() const { return TQString::null; } // Called when this item is selected // Reimplement, and call tree()->part()->extension()->enableActions(...) @@ -100,10 +100,10 @@ public: // returns the tree inside which this item is KonqSidebarTree *tree() const; - virtual QString key( int column, bool ) const { return text( column ).lower(); } + virtual TQString key( int column, bool ) const { return text( column ).lower(); } // List of alternative names (URLs) this entry is known under - QStringList alias; + TQStringList alias; protected: // Create an item at the toplevel - only for toplevel items -> protected KonqSidebarTreeItem( KonqSidebarTree *parent, KonqSidebarTreeTopLevelItem *topLevelItem ); diff --git a/konqueror/sidebar/trees/konq_sidebartreemodule.h b/konqueror/sidebar/trees/konq_sidebartreemodule.h index 9f9863311..80d3ea062 100644 --- a/konqueror/sidebar/trees/konq_sidebartreemodule.h +++ b/konqueror/sidebar/trees/konq_sidebartreemodule.h @@ -19,7 +19,7 @@ #ifndef konq_treemodule_h #define konq_treemodule_h -#include +#include #include "konq_sidebartree.h" class QDragObject; class KonqSidebarTreeItem; @@ -53,7 +53,7 @@ public: bool showHidden() { return m_showHidden;} virtual void setShowHidden(bool showhidden) {m_showHidden=showhidden;} - virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const QPoint& ) { return false; } + virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const TQPoint& ) { return false; } protected: KonqSidebarTree * m_pTree; diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp index d71959c1e..4ce6fe445 100644 --- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp +++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp @@ -25,14 +25,14 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include void KonqSidebarTreeTopLevelItem::init() { - QString desktopFile = m_path; + TQString desktopFile = m_path; if ( isTopLevelGroup() ) desktopFile += "/.directory"; KSimpleConfig cfg( desktopFile, true ); @@ -50,18 +50,18 @@ void KonqSidebarTreeTopLevelItem::setOpen( bool open ) void KonqSidebarTreeTopLevelItem::itemSelected() { kdDebug() << "KonqSidebarTreeTopLevelItem::itemSelected" << endl; - QMimeSource *data = QApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); bool paste = m_bTopLevelGroup && data->provides("text/uri-list"); tree()->enableActions( true, true, paste, true, true, true /*rename*/ ); } -bool KonqSidebarTreeTopLevelItem::acceptsDrops( const QStrList & formats ) +bool KonqSidebarTreeTopLevelItem::acceptsDrops( const TQStrList & formats ) { return formats.contains("text/uri-list") && ( m_bTopLevelGroup || !externalURL().isEmpty() ); } -void KonqSidebarTreeTopLevelItem::drop( QDropEvent * ev ) +void KonqSidebarTreeTopLevelItem::drop( TQDropEvent * ev ) { if ( m_bTopLevelGroup ) { @@ -85,7 +85,7 @@ void KonqSidebarTreeTopLevelItem::drop( QDropEvent * ev ) } } -QDragObject * KonqSidebarTreeTopLevelItem::dragObject( QWidget * parent, bool move ) +TQDragObject * KonqSidebarTreeTopLevelItem::dragObject( TQWidget * parent, bool move ) { // 100% duplicated from KonqDirTreeItem::dragObject :( KURL::List lst; @@ -95,10 +95,10 @@ QDragObject * KonqSidebarTreeTopLevelItem::dragObject( QWidget * parent, bool mo KonqDrag * drag = KonqDrag::newDrag( lst, false, parent ); - const QPixmap * pix = pixmap(0); + const TQPixmap * pix = pixmap(0); if (pix) { - QPoint hotspot( pix->width() / 2, pix->height() / 2 ); + TQPoint hotspot( pix->width() / 2, pix->height() / 2 ); drag->setPixmap( *pix, hotspot ); } drag->setMoveSelection( move ); @@ -121,7 +121,7 @@ void KonqSidebarTreeTopLevelItem::rightButtonPressed() // i.e. the filename instead of the Name field). There's the Rename item for that. // Only missing thing is changing the URL of a link. Hmm... - if ( !module() || !module()->handleTopLevelContextMenu( this, QCursor::pos() ) ) + if ( !module() || !module()->handleTopLevelContextMenu( this, TQCursor::pos() ) ) { tree()->showToplevelContextMenu(); } @@ -157,7 +157,7 @@ void KonqSidebarTreeTopLevelItem::paste() { // move or not move ? bool move = false; - QMimeSource *data = QApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); if ( data->provides( "application/x-kde-cutselection" ) ) { move = KonqDrag::decodeIsCutSelection( data ); kdDebug(1201) << "move (from clipboard data) = " << move << endl; @@ -177,7 +177,7 @@ void KonqSidebarTreeTopLevelItem::rename() tree()->rename( this, 0 ); } -void KonqSidebarTreeTopLevelItem::rename( const QString & name ) +void KonqSidebarTreeTopLevelItem::rename( const TQString & name ) { KURL url; url.setPath( m_path ); @@ -186,7 +186,7 @@ void KonqSidebarTreeTopLevelItem::rename( const QString & name ) // of the .directory or desktop file //KonqOperations::rename( tree(), url, name ); - QString desktopFile = m_path; + TQString desktopFile = m_path; if ( isTopLevelGroup() ) desktopFile += "/.directory"; KSimpleConfig cfg( desktopFile ); @@ -201,7 +201,7 @@ void KonqSidebarTreeTopLevelItem::rename( const QString & name ) allDirNotify.FilesChanged( lst ); } -QString KonqSidebarTreeTopLevelItem::toolTipText() const +TQString KonqSidebarTreeTopLevelItem::toolTipText() const { return m_comment; } diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.h b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.h index fc67e274e..6e20e7e03 100644 --- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.h +++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.h @@ -38,7 +38,7 @@ public: * @param module the module handling this toplevel item * @param path the path to the desktop file that was the reason for creating this item */ - KonqSidebarTreeTopLevelItem( KonqSidebarTree *parent, KonqSidebarTreeModule * module, const QString & path ) + KonqSidebarTreeTopLevelItem( KonqSidebarTree *parent, KonqSidebarTreeModule * module, const TQString & path ) : KonqSidebarTreeItem(parent, 0L), m_module(module), m_path(path), m_bTopLevelGroup(false) { init(); } /** @@ -46,14 +46,14 @@ public: * @param module the module handling this toplevel item * @param path the path to the desktop file that was the reason for creating this item */ - KonqSidebarTreeTopLevelItem( KonqSidebarTreeItem *parentItem, KonqSidebarTreeModule * module, const QString & path ) + KonqSidebarTreeTopLevelItem( KonqSidebarTreeItem *parentItem, KonqSidebarTreeModule * module, const TQString & path ) : KonqSidebarTreeItem( parentItem, 0L), m_module(module), m_path(path), m_bTopLevelGroup(false) { init(); } void init(); - virtual bool acceptsDrops( const QStrList & formats ); - virtual void drop( QDropEvent * ev ); - virtual QDragObject * dragObject( QWidget * parent, bool move = false ); + virtual bool acceptsDrops( const TQStrList & formats ); + virtual void drop( TQDropEvent * ev ); + virtual TQDragObject * dragObject( TQWidget * parent, bool move = false ); virtual void middleButtonClicked(); virtual void rightButtonPressed(); @@ -62,7 +62,7 @@ public: virtual void del(); virtual void shred(); virtual void rename(); // start a rename operation - virtual void rename( const QString & name ); // do the actual renaming + virtual void rename( const TQString & name ); // do the actual renaming virtual void setOpen( bool open ); @@ -71,7 +71,7 @@ public: virtual KURL externalURL() const { return m_externalURL; } - virtual QString toolTipText() const; + virtual TQString toolTipText() const; virtual void itemSelected(); @@ -87,13 +87,13 @@ public: KonqSidebarTreeModule *module() const { return m_module; } // The path to the desktop file responsible for this toplevel item - QString path() const { return m_path; } + TQString path() const { return m_path; } protected: void delOperation( int method ); KonqSidebarTreeModule *m_module; - QString m_path; - QString m_comment; + TQString m_path; + TQString m_comment; KURL m_externalURL; bool m_bTopLevelGroup; }; diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp index 9b53f195d..219063026 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.cpp +++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp @@ -8,12 +8,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -KonqSidebar_Tree::KonqSidebar_Tree(KInstance *instance,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name): +KonqSidebar_Tree::KonqSidebar_Tree(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name): KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name) { KSimpleConfig ksc(desktopName_); @@ -21,48 +21,48 @@ KonqSidebar_Tree::KonqSidebar_Tree(KInstance *instance,QObject *parent,QWidget * int virt= ( (ksc.readEntry("X-KDE-TreeModule","")=="Virtual") ?VIRT_Folder:VIRT_Link); if (virt==1) desktopName_=ksc.readEntry("X-KDE-RelURL",""); - widget = new QVBox(widgetParent); + widget = new TQVBox(widgetParent); if (ksc.readBoolEntry("X-KDE-SearchableTreeModule",false)) { - QHBox* searchline = new QHBox(widget); + TQHBox* searchline = new TQHBox(widget); searchline->setSpacing(KDialog::spacingHint()); tree=new KonqSidebarTree(this,widget,virt,desktopName_); - QToolButton *clearSearch = new QToolButton(searchline); + TQToolButton *clearSearch = new TQToolButton(searchline); clearSearch->setTextLabel(i18n("Clear Search"), true); - clearSearch->setIconSet(SmallIconSet(QApplication::reverseLayout() ? "clear_left" : "locationbar_erase")); - QLabel* slbl = new QLabel(i18n("Se&arch:"), searchline); + clearSearch->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase")); + TQLabel* slbl = new TQLabel(i18n("Se&arch:"), searchline); KListViewSearchLine* listViewSearch = new KListViewSearchLine(searchline,tree); slbl->setBuddy(listViewSearch); - connect(clearSearch, SIGNAL(pressed()), listViewSearch, SLOT(clear())); + connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); } else tree=new KonqSidebarTree(this,widget,virt,desktopName_); - connect(tree, SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)), - this,SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(tree, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)), + this,TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &))); - connect(tree,SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), - this,SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &))); + connect(tree,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), + this,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &))); - connect(tree,SIGNAL(popupMenu( const QPoint &, const KURL &, const QString &, mode_t )), - this,SIGNAL(popupMenu( const QPoint &, const KURL &, const QString &, mode_t ))); + connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )), + this,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ))); - connect(tree,SIGNAL(popupMenu( const QPoint &, const KFileItemList & )), - this,SIGNAL(popupMenu( const QPoint &, const KFileItemList & ))); + connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), + this,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & ))); - connect(tree,SIGNAL(enableAction( const char *, bool )), - this,SIGNAL(enableAction( const char *, bool))); + connect(tree,TQT_SIGNAL(enableAction( const char *, bool )), + this,TQT_SIGNAL(enableAction( const char *, bool))); } KonqSidebar_Tree::~KonqSidebar_Tree(){;} -void* KonqSidebar_Tree::provides(const QString &) {return 0;} +void* KonqSidebar_Tree::provides(const TQString &) {return 0;} -//void KonqSidebar_Tree::emitStatusBarText (const QString &) {;} +//void KonqSidebar_Tree::emitStatusBarText (const TQString &) {;} -QWidget *KonqSidebar_Tree::getWidget(){return widget;} +TQWidget *KonqSidebar_Tree::getWidget(){return widget;} void KonqSidebar_Tree::handleURL(const KURL &url) { @@ -73,16 +73,16 @@ void KonqSidebar_Tree::handleURL(const KURL &url) void KonqSidebar_Tree::cut() { - QDragObject * drag = static_cast(tree->selectedItem())->dragObject( 0L, true ); + TQDragObject * drag = static_cast(tree->selectedItem())->dragObject( 0L, true ); if (drag) - QApplication::clipboard()->setData( drag ); + TQApplication::clipboard()->setData( drag ); } void KonqSidebar_Tree::copy() { - QDragObject * drag = static_cast(tree->selectedItem())->dragObject( 0L ); + TQDragObject * drag = static_cast(tree->selectedItem())->dragObject( 0L ); if (drag) - QApplication::clipboard()->setData( drag ); + TQApplication::clipboard()->setData( drag ); } void KonqSidebar_Tree::paste() @@ -123,7 +123,7 @@ void KonqSidebar_Tree::rename() extern "C" { - KDE_EXPORT void* create_konqsidebar_tree(KInstance *inst,QObject *par,QWidget *widp,QString &desktopname,const char *name) + KDE_EXPORT void* create_konqsidebar_tree(KInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new KonqSidebar_Tree(inst,par,widp,desktopname,name); } @@ -131,19 +131,19 @@ extern "C" extern "C" { - KDE_EXPORT bool add_konqsidebar_tree(QString* fn, QString*, QMap *map) + KDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap *map) { KStandardDirs *dirs=KGlobal::dirs(); - QStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true); - QStringList names; - for (QStringList::ConstIterator it=list.begin();it!=list.end();++it) + TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true); + TQStringList names; + for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it) { KSimpleConfig sc(*it); sc.setGroup("Desktop Entry"); names< -#include -#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include -#include +#include class KonqSidebarTree; class QVBox; @@ -18,13 +18,13 @@ class KonqSidebar_Tree: public KonqSidebarPlugin { Q_OBJECT public: - KonqSidebar_Tree(KInstance *instance,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name=0); + KonqSidebar_Tree(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_Tree(); - virtual void *provides(const QString &); -// void emitStatusBarText (const QString &); - virtual QWidget *getWidget(); + virtual void *provides(const TQString &); +// void emitStatusBarText (const TQString &); + virtual TQWidget *getWidget(); protected: - class QVBox *widget; + class TQVBox *widget; class KonqSidebarTree *tree; virtual void handleURL(const KURL &url); protected slots: @@ -38,9 +38,9 @@ class KonqSidebar_Tree: public KonqSidebarPlugin signals: void openURLRequest( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() ); void createNewWindow( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() ); - void popupMenu( const QPoint &global, const KURL &url, - const QString &mimeType, mode_t mode = (mode_t)-1 ); - void popupMenu( const QPoint &global, const KFileItemList &items ); + void popupMenu( const TQPoint &global, const KURL &url, + const TQString &mimeType, mode_t mode = (mode_t)-1 ); + void popupMenu( const TQPoint &global, const KFileItemList &items ); void enableAction( const char * name, bool enabled ); }; diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp index ab77c40a0..2c8de18f8 100644 --- a/konqueror/sidebar/web_module/web_module.cpp +++ b/konqueror/sidebar/web_module/web_module.cpp @@ -17,10 +17,10 @@ */ #include "web_module.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -32,34 +32,34 @@ #include -KonqSideBarWebModule::KonqSideBarWebModule(KInstance *instance, QObject *parent, QWidget *widgetParent, QString &desktopName, const char* name) +KonqSideBarWebModule::KonqSideBarWebModule(KInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name) : KonqSidebarPlugin(instance, parent, widgetParent, desktopName, name) { _htmlPart = new KHTMLSideBar(universalMode()); - connect(_htmlPart, SIGNAL(reload()), this, SLOT(reload())); - connect(_htmlPart, SIGNAL(completed()), this, SLOT(pageLoaded())); + connect(_htmlPart, TQT_SIGNAL(reload()), this, TQT_SLOT(reload())); + connect(_htmlPart, TQT_SIGNAL(completed()), this, TQT_SLOT(pageLoaded())); connect(_htmlPart, - SIGNAL(setWindowCaption(const QString&)), + TQT_SIGNAL(setWindowCaption(const TQString&)), this, - SLOT(setTitle(const QString&))); + TQT_SLOT(setTitle(const TQString&))); connect(_htmlPart, - SIGNAL(openURLRequest(const QString&, KParts::URLArgs)), + TQT_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)), this, - SLOT(urlClicked(const QString&, KParts::URLArgs))); + TQT_SLOT(urlClicked(const TQString&, KParts::URLArgs))); connect(_htmlPart->browserExtension(), - SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), + TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), this, - SLOT(formClicked(const KURL&, const KParts::URLArgs&))); + TQT_SLOT(formClicked(const KURL&, const KParts::URLArgs&))); connect(_htmlPart, - SIGNAL(setAutoReload()), this, SLOT( setAutoReload() )); + TQT_SIGNAL(setAutoReload()), this, TQT_SLOT( setAutoReload() )); connect(_htmlPart, - SIGNAL(openURLNewWindow(const QString&, KParts::URLArgs)), + TQT_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)), this, - SLOT(urlNewWindow(const QString&, KParts::URLArgs))); + TQT_SLOT(urlNewWindow(const TQString&, KParts::URLArgs))); connect(_htmlPart, - SIGNAL(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)), + TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, - SIGNAL(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&))); + TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); _desktopName = desktopName; @@ -69,7 +69,7 @@ KonqSideBarWebModule::KonqSideBarWebModule(KInstance *instance, QObject *parent, _url = ksc.readPathEntry("URL"); _htmlPart->openURL(_url ); // Must load this delayed - QTimer::singleShot(0, this, SLOT(loadFavicon())); + TQTimer::singleShot(0, this, TQT_SLOT(loadFavicon())); } @@ -79,18 +79,18 @@ KonqSideBarWebModule::~KonqSideBarWebModule() { } -QWidget *KonqSideBarWebModule::getWidget() { +TQWidget *KonqSideBarWebModule::getWidget() { return _htmlPart->widget(); } void KonqSideBarWebModule::setAutoReload(){ KDialogBase dlg(0, "", true, i18n("Set Refresh Timeout (0 disables)"), KDialogBase::Ok|KDialogBase::Cancel); - QHBox *hbox = dlg.makeHBoxMainWidget(); + TQHBox *hbox = dlg.makeHBoxMainWidget(); - QSpinBox *mins = new QSpinBox( 0, 120, 1, hbox ); + TQSpinBox *mins = new TQSpinBox( 0, 120, 1, hbox ); mins->setSuffix( i18n(" min") ); - QSpinBox *secs = new QSpinBox( 0, 59, 1, hbox ); + TQSpinBox *secs = new TQSpinBox( 0, 59, 1, hbox ); secs->setSuffix( i18n(" sec") ); if( reloadTimeout > 0 ) { @@ -99,7 +99,7 @@ void KonqSideBarWebModule::setAutoReload(){ mins->setValue( ( seconds - secs->value() ) / 60 ); } - if( dlg.exec() == QDialog::Accepted ) { + if( dlg.exec() == TQDialog::Accepted ) { int msec = ( mins->value() * 60 + secs->value() ) * 1000; reloadTimeout = msec; KSimpleConfig ksc(_desktopName); @@ -109,7 +109,7 @@ void KonqSideBarWebModule::setAutoReload(){ } } -void *KonqSideBarWebModule::provides(const QString &) { +void *KonqSideBarWebModule::provides(const TQString &) { return 0L; } @@ -118,13 +118,13 @@ void KonqSideBarWebModule::handleURL(const KURL &) { } -void KonqSideBarWebModule::urlNewWindow(const QString& url, KParts::URLArgs args) +void KonqSideBarWebModule::urlNewWindow(const TQString& url, KParts::URLArgs args) { emit createNewWindow(KURL(url), args); } -void KonqSideBarWebModule::urlClicked(const QString& url, KParts::URLArgs args) +void KonqSideBarWebModule::urlClicked(const TQString& url, KParts::URLArgs args) { emit openURLRequest(KURL(url), args); } @@ -138,7 +138,7 @@ void KonqSideBarWebModule::formClicked(const KURL& url, const KParts::URLArgs& a void KonqSideBarWebModule::loadFavicon() { - QString icon = KonqPixmapProvider::iconForURL(_url.url()); + TQString icon = KonqPixmapProvider::iconForURL(_url.url()); if (icon.isEmpty()) { KonqFavIconMgr::downloadHostIcon(_url); icon = KonqPixmapProvider::iconForURL(_url.url()); @@ -161,7 +161,7 @@ void KonqSideBarWebModule::reload() { } -void KonqSideBarWebModule::setTitle(const QString& title) { +void KonqSideBarWebModule::setTitle(const TQString& title) { if (!title.isEmpty()) { emit setCaption(title); @@ -176,27 +176,27 @@ void KonqSideBarWebModule::setTitle(const QString& title) { void KonqSideBarWebModule::pageLoaded() { if( reloadTimeout > 0 ) { - QTimer::singleShot( reloadTimeout, this, SLOT( reload() ) ); + TQTimer::singleShot( reloadTimeout, this, TQT_SLOT( reload() ) ); } } extern "C" { - KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(KInstance *instance, QObject *parent, QWidget *widget, QString &desktopName, const char *name) { + KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(KInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) { return new KonqSideBarWebModule(instance, parent, widget, desktopName, name); } } extern "C" { - KDE_EXPORT bool add_konqsidebar_web(QString* fn, QString* param, QMap *map) { + KDE_EXPORT bool add_konqsidebar_web(TQString* fn, TQString* param, TQMap *map) { Q_UNUSED(param); KGlobal::dirs()->addResourceType("websidebardata", KStandardDirs::kde_default("data") + "konqsidebartng/websidebar"); KURL url; url.setProtocol("file"); - QStringList paths = KGlobal::dirs()->resourceDirs("websidebardata"); - for (QStringList::Iterator i = paths.begin(); i != paths.end(); ++i) { - if (QFileInfo(*i + "websidebar.html").exists()) { + TQStringList paths = KGlobal::dirs()->resourceDirs("websidebardata"); + for (TQStringList::Iterator i = paths.begin(); i != paths.end(); ++i) { + if (TQFileInfo(*i + "websidebar.html").exists()) { url.setPath(*i + "websidebar.html"); break; } diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h index 58650b309..eb10414a9 100644 --- a/konqueror/sidebar/web_module/web_module.h +++ b/konqueror/sidebar/web_module/web_module.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include // A wrapper for KHTMLPart to make it behave the way we want it to. @@ -41,9 +41,9 @@ class KHTMLSideBar : public KHTMLPart setFormNotification(KHTMLPart::Only); connect(this, - SIGNAL(formSubmitNotification(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)), + TQT_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, - SLOT(formProxy(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)) + TQT_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)) ); @@ -51,36 +51,36 @@ class KHTMLSideBar : public KHTMLPart "link context menu"); if (!universal) { _linkMenu->insertItem(i18n("&Open Link"), - this, SLOT(loadPage())); + this, TQT_SLOT(loadPage())); _linkMenu->insertItem(i18n("Open in New &Window"), - this, SLOT(loadNewWindow())); + this, TQT_SLOT(loadNewWindow())); } else { _linkMenu->insertItem(i18n("Open in New &Window"), - this, SLOT(loadPage())); + this, TQT_SLOT(loadPage())); } _menu = new KPopupMenu(widget(), "context menu"); _menu->insertItem(SmallIcon("reload"), i18n("&Reload"), - this, SIGNAL(reload())); - _menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"), this, SIGNAL(setAutoReload())); + this, TQT_SIGNAL(reload())); + _menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"), this, TQT_SIGNAL(setAutoReload())); connect(this, - SIGNAL(popupMenu(const QString&,const QPoint&)), + TQT_SIGNAL(popupMenu(const TQString&,const TQPoint&)), this, - SLOT(showMenu(const QString&, const QPoint&))); + TQT_SLOT(showMenu(const TQString&, const TQPoint&))); } virtual ~KHTMLSideBar() {} signals: - void submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&); - void openURLRequest(const QString& url, KParts::URLArgs args); - void openURLNewWindow(const QString& url, KParts::URLArgs args); + void submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&); + void openURLRequest(const TQString& url, KParts::URLArgs args); + void openURLNewWindow(const TQString& url, KParts::URLArgs args); void reload(); void setAutoReload(); protected: - virtual void urlSelected( const QString &url, int button, - int state, const QString &_target, + virtual void urlSelected( const TQString &url, int button, + int state, const TQString &_target, KParts::URLArgs args = KParts::URLArgs()) { if (button == LeftButton ){ if (_target.lower() == "_self") { @@ -116,7 +116,7 @@ class KHTMLSideBar : public KHTMLPart KParts::URLArgs()); } - void showMenu(const QString& url, const QPoint& pos) { + void showMenu(const TQString& url, const TQPoint& pos) { if (url.isEmpty()) { _menu->popup(pos); } else { @@ -126,15 +126,15 @@ class KHTMLSideBar : public KHTMLPart } void formProxy(const char *action, - const QString& url, - const QByteArray& formData, - const QString& target, - const QString& contentType, - const QString& boundary) { - QString t = target.lower(); - QString u; - - if (QCString(action).lower() != "post") { + const TQString& url, + const TQByteArray& formData, + const TQString& target, + const TQString& contentType, + const TQString& boundary) { + TQString t = target.lower(); + TQString u; + + if (TQCString(action).lower() != "post") { // GET KURL kurl = completeURL(url); kurl.setQuery(formData.data()); @@ -157,7 +157,7 @@ class KHTMLSideBar : public KHTMLPart } private: KPopupMenu *_menu, *_linkMenu; - QString _lastUrl; + TQString _lastUrl; }; @@ -166,28 +166,28 @@ class KonqSideBarWebModule : public KonqSidebarPlugin { Q_OBJECT public: - KonqSideBarWebModule(KInstance *instance, QObject *parent, - QWidget *widgetParent, QString &desktopName, + KonqSideBarWebModule(KInstance *instance, TQObject *parent, + TQWidget *widgetParent, TQString &desktopName, const char *name); virtual ~KonqSideBarWebModule(); - virtual QWidget *getWidget(); - virtual void *provides(const QString &); + virtual TQWidget *getWidget(); + virtual void *provides(const TQString &); signals: - void submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&); + void submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&); void openURLRequest(const KURL &url, const KParts::URLArgs &args); void createNewWindow(const KURL &url, const KParts::URLArgs &args); protected: virtual void handleURL(const KURL &url); private slots: - void urlClicked(const QString& url, KParts::URLArgs args); + void urlClicked(const TQString& url, KParts::URLArgs args); void formClicked(const KURL& url, const KParts::URLArgs& args); - void urlNewWindow(const QString& url, KParts::URLArgs args); + void urlNewWindow(const TQString& url, KParts::URLArgs args); void pageLoaded(); void loadFavicon(); - void setTitle(const QString&); + void setTitle(const TQString&); void setAutoReload(); void reload(); @@ -195,7 +195,7 @@ class KonqSideBarWebModule : public KonqSidebarPlugin KHTMLSideBar *_htmlPart; KURL _url; int reloadTimeout; - QString _desktopName; + TQString _desktopName; }; #endif -- cgit v1.2.3