summaryrefslogtreecommitdiffstats
path: root/konqueror
diff options
context:
space:
mode:
Diffstat (limited to 'konqueror')
-rw-r--r--konqueror/KonqMainWindowIface.cc22
-rw-r--r--konqueror/KonqMainWindowIface.h18
-rw-r--r--konqueror/KonqViewIface.cc20
-rw-r--r--konqueror/KonqViewIface.h22
-rw-r--r--konqueror/KonquerorIface.cc100
-rw-r--r--konqueror/KonquerorIface.h54
-rw-r--r--konqueror/about/konq_aboutpage.cc160
-rw-r--r--konqueror/about/konq_aboutpage.h38
-rw-r--r--konqueror/client/kfmclient.cc144
-rw-r--r--konqueror/client/kfmclient.h6
-rw-r--r--konqueror/delayedinitializer.cc10
-rw-r--r--konqueror/delayedinitializer.h6
-rw-r--r--konqueror/iconview/konq_iconview.cc286
-rw-r--r--konqueror/iconview/konq_iconview.h46
-rw-r--r--konqueror/keditbookmarks/actionsimpl.cpp160
-rw-r--r--konqueror/keditbookmarks/actionsimpl.h2
-rw-r--r--konqueror/keditbookmarks/bookmarkinfo.cpp94
-rw-r--r--konqueror/keditbookmarks/bookmarkinfo.h16
-rw-r--r--konqueror/keditbookmarks/bookmarkiterator.cpp12
-rw-r--r--konqueror/keditbookmarks/bookmarkiterator.h10
-rw-r--r--konqueror/keditbookmarks/commands.cpp180
-rw-r--r--konqueror/keditbookmarks/commands.h148
-rw-r--r--konqueror/keditbookmarks/dcop.cpp16
-rw-r--r--konqueror/keditbookmarks/dcop.h4
-rw-r--r--konqueror/keditbookmarks/exporters.cpp12
-rw-r--r--konqueror/keditbookmarks/exporters.h8
-rw-r--r--konqueror/keditbookmarks/favicons.cpp10
-rw-r--r--konqueror/keditbookmarks/favicons.h6
-rw-r--r--konqueror/keditbookmarks/importers.cpp58
-rw-r--r--konqueror/keditbookmarks/importers.h70
-rw-r--r--konqueror/keditbookmarks/kbookmarkmerger.cpp18
-rw-r--r--konqueror/keditbookmarks/kebsearchline.cpp14
-rw-r--r--konqueror/keditbookmarks/kebsearchline.h14
-rw-r--r--konqueror/keditbookmarks/listview.cpp250
-rw-r--r--konqueror/keditbookmarks/listview.h96
-rw-r--r--konqueror/keditbookmarks/main.cpp34
-rw-r--r--konqueror/keditbookmarks/testlink.cpp116
-rw-r--r--konqueror/keditbookmarks/testlink.h28
-rw-r--r--konqueror/keditbookmarks/toplevel.cpp64
-rw-r--r--konqueror/keditbookmarks/toplevel.h34
-rw-r--r--konqueror/keditbookmarks/updater.cpp48
-rw-r--r--konqueror/keditbookmarks/updater.h10
-rw-r--r--konqueror/konq_actions.cc102
-rw-r--r--konqueror/konq_actions.h52
-rw-r--r--konqueror/konq_combo.cc238
-rw-r--r--konqueror/konq_combo.h44
-rw-r--r--konqueror/konq_extensionmanager.cc24
-rw-r--r--konqueror/konq_extensionmanager.h2
-rw-r--r--konqueror/konq_factory.cc42
-rw-r--r--konqueror/konq_factory.h18
-rw-r--r--konqueror/konq_frame.cc202
-rw-r--r--konqueror/konq_frame.h124
-rw-r--r--konqueror/konq_guiclients.cc88
-rw-r--r--konqueror/konq_guiclients.h20
-rw-r--r--konqueror/konq_main.cc46
-rw-r--r--konqueror/konq_mainwindow.cc1104
-rw-r--r--konqueror/konq_mainwindow.h170
-rw-r--r--konqueror/konq_mainwindow_p.h6
-rw-r--r--konqueror/konq_misc.cc54
-rw-r--r--konqueror/konq_misc.h28
-rw-r--r--konqueror/konq_openurlrequest.h16
-rw-r--r--konqueror/konq_profiledlg.cc82
-rw-r--r--konqueror/konq_profiledlg.h26
-rw-r--r--konqueror/konq_run.cc16
-rw-r--r--konqueror/konq_run.h10
-rw-r--r--konqueror/konq_tabs.cc182
-rw-r--r--konqueror/konq_tabs.h48
-rw-r--r--konqueror/konq_view.cc330
-rw-r--r--konqueror/konq_view.h98
-rw-r--r--konqueror/konq_viewmgr.cc244
-rw-r--r--konqueror/konq_viewmgr.h64
-rw-r--r--konqueror/kttsplugin/khtmlkttsd.cpp44
-rw-r--r--konqueror/kttsplugin/khtmlkttsd.h2
-rw-r--r--konqueror/listview/konq_infolistviewitem.cc54
-rw-r--r--konqueror/listview/konq_infolistviewitem.h12
-rw-r--r--konqueror/listview/konq_infolistviewwidget.cc70
-rw-r--r--konqueror/listview/konq_infolistviewwidget.h12
-rw-r--r--konqueror/listview/konq_listview.cc112
-rw-r--r--konqueror/listview/konq_listview.h20
-rw-r--r--konqueror/listview/konq_listviewitems.cc74
-rw-r--r--konqueror/listview/konq_listviewitems.h18
-rw-r--r--konqueror/listview/konq_listviewwidget.cc314
-rw-r--r--konqueror/listview/konq_listviewwidget.h104
-rw-r--r--konqueror/listview/konq_textviewitem.cc28
-rw-r--r--konqueror/listview/konq_textviewitem.h12
-rw-r--r--konqueror/listview/konq_textviewwidget.cc16
-rw-r--r--konqueror/listview/konq_textviewwidget.h12
-rw-r--r--konqueror/listview/konq_treeviewitem.cc8
-rw-r--r--konqueror/listview/konq_treeviewitem.h6
-rw-r--r--konqueror/listview/konq_treeviewwidget.cc40
-rw-r--r--konqueror/listview/konq_treeviewwidget.h14
-rw-r--r--konqueror/preloader/preloader.cc26
-rw-r--r--konqueror/preloader/preloader.h20
-rw-r--r--konqueror/remoteencodingplugin/kremoteencodingplugin.cpp48
-rw-r--r--konqueror/remoteencodingplugin/kremoteencodingplugin.h8
-rw-r--r--konqueror/shellcmdplugin/kshellcmddialog.cpp20
-rw-r--r--konqueror/shellcmdplugin/kshellcmddialog.h4
-rw-r--r--konqueror/shellcmdplugin/kshellcmdexecutor.cpp24
-rw-r--r--konqueror/shellcmdplugin/kshellcmdexecutor.h12
-rw-r--r--konqueror/shellcmdplugin/kshellcmdplugin.cpp12
-rw-r--r--konqueror/shellcmdplugin/kshellcmdplugin.h2
-rw-r--r--konqueror/sidebar/konqsidebar.cpp28
-rw-r--r--konqueror/sidebar/konqsidebar.h16
-rw-r--r--konqueror/sidebar/konqsidebarplugin.cpp6
-rw-r--r--konqueror/sidebar/konqsidebarplugin.h38
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp354
-rw-r--r--konqueror/sidebar/sidebar_widget.h108
-rw-r--r--konqueror/sidebar/test/konqsidebartest.cpp2
-rw-r--r--konqueror/sidebar/test/konqsidebartest.h14
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_item.cpp8
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_item.h6
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp134
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_module.h30
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp38
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.h18
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp90
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_module.h12
-rw-r--r--konqueror/sidebar/trees/history_module/history_item.cpp42
-rw-r--r--konqueror/sidebar/trees/history_module/history_item.h26
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.cpp76
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.h32
-rw-r--r--konqueror/sidebar/trees/history_module/history_settings.cpp22
-rw-r--r--konqueror/sidebar/trees/history_module/history_settings.h12
-rw-r--r--konqueror/sidebar/trees/history_module/kcmhistory.cpp88
-rw-r--r--konqueror/sidebar/trees/history_module/kcmhistory.h8
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp254
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.h86
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreeitem.cpp4
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreeitem.h22
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreemodule.h4
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp30
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreetoplevelitem.h20
-rw-r--r--konqueror/sidebar/trees/konqsidebar_tree.cpp68
-rw-r--r--konqueror/sidebar/trees/konqsidebar_tree.h26
-rw-r--r--konqueror/sidebar/web_module/web_module.cpp70
-rw-r--r--konqueror/sidebar/web_module/web_module.h70
136 files changed, 4477 insertions, 4477 deletions
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<KAction *> lst = m_dcopActionProxy->actions();
- QValueList<KAction *>::ConstIterator it = lst.begin();
- QValueList<KAction *>::ConstIterator end = lst.end();
+ TQValueList<KAction *> lst = m_dcopActionProxy->actions();
+ TQValueList<KAction *>::ConstIterator it = lst.begin();
+ TQValueList<KAction *>::ConstIterator end = lst.end();
for (; it != end; ++it )
res.append( (*it)->name() );
return res;
}
-QMap<QCString,DCOPRef> KonqMainWindowIface::actionMap()
+TQMap<TQCString,DCOPRef> 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 <dcopobject.h>
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
#include <dcopref.h>
#include <kmainwindowiface.h>
@@ -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<QCString,DCOPRef> actionMap();
+ TQMap<TQCString,DCOPRef> 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 <dcopclient.h>
#include <kdebug.h>
-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 <dcopobject.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include <dcopref.h>
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 <kapplication.h>
#include <dcopclient.h>
#include <kdebug.h>
-#include <qfile.h>
+#include <tqfile.h>
#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<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();
+ TQPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();
if ( mainWindows )
{
- QPtrListIterator<KonqMainWindow> it( *mainWindows );
+ TQPtrListIterator<KonqMainWindow> it( *mainWindows );
for (; it.current(); ++it )
it.current()->reparseConfiguration();
}
@@ -197,47 +197,47 @@ void KonquerorIface::reparseConfiguration()
void KonquerorIface::updateProfileList()
{
- QPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();
+ TQPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();
if ( !mainWindows )
return;
- QPtrListIterator<KonqMainWindow> it( *mainWindows );
+ TQPtrListIterator<KonqMainWindow> it( *mainWindows );
for (; it.current(); ++it )
it.current()->viewManager()->profileListDirty( false );
}
-QString KonquerorIface::crashLogFile()
+TQString KonquerorIface::crashLogFile()
{
return KonqMainWindow::s_crashlog_file->name();
}
-QValueList<DCOPRef> KonquerorIface::getWindows()
+TQValueList<DCOPRef> KonquerorIface::getWindows()
{
- QValueList<DCOPRef> lst;
- QPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();
+ TQValueList<DCOPRef> lst;
+ TQPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();
if ( mainWindows )
{
- QPtrListIterator<KonqMainWindow> it( *mainWindows );
+ TQPtrListIterator<KonqMainWindow> 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<KonqMainWindow>* windows = KonqMainWindow::mainWindowList();
+ TQPtrList<KonqMainWindow>* 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<KonqMainWindow> it1( *windows );
+ for( TQPtrListIterator<KonqMainWindow> 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 <dcopobject.h>
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
#include <dcopref.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
/**
* 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<DCOPRef> getWindows();
+ TQValueList<DCOPRef> 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 <qtextcodec.h>
+#include <tqtextcodec.h>
#include <kaboutdata.h>
#include <kapplication.h>
@@ -16,19 +16,19 @@
#include <kconfig.h>
#include <assert.h>
-#include <qfile.h>
-#include <qdir.h>
+#include <tqfile.h>
+#include <tqdir.h>
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<KonqFrame *>( 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("<BASE HREF=\"file:") +
+ TQString basehref = TQString::fromLatin1("<BASE HREF=\"file:") +
file.left( file.findRev( '/' )) +
- QString::fromLatin1("/\">\n");
- QRegExp reg("<head>");
+ TQString::fromLatin1("/\">\n");
+ TQRegExp reg("<head>");
reg.setCaseSensitive(FALSE);
res.replace(reg, "<head>\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( "<!--search bar splitter-->", res );
+ TQStringList parts = TQStringList::split( "<!--search bar splitter-->", 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 "
"<img width='16' height='16' src=\"%1\"> 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("<td>Plugin</td><td>Description</td><td>File</td><td>Types</td>"))
.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 <signal.h>
#include <unistd.h>
-#include <qdir.h>
+#include <tqdir.h>
#include <kio/job.h>
#include <kcmdlineargs.h>
@@ -39,7 +39,7 @@
#include <kdebug.h>
#include <dcopclient.h>
#include <kservice.h>
-#include <qregexp.h>
+#include <tqregexp.h>
#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 <qtimer.h>
+#include <tqtimer.h>
-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 <qobject.h>
+#include <tqobject.h>
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 <sys/stat.h>
#include <time.h>
#include <unistd.h>
-#include <qfile.h>
+#include <tqfile.h>
#include <kaction.h>
#include <kapplication.h>
@@ -43,13 +43,13 @@
#include <kmessagebox.h>
#include <kstaticdeleter.h>
-#include <qregexp.h>
-#include <qdatetime.h>
+#include <tqregexp.h>
+#include <tqdatetime.h>
#include <config.h>
-template class QPtrList<KFileIVI>;
-//template class QValueList<int>;
+template class TQPtrList<KFileIVI>;
+//template class TQValueList<int>;
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<KFileIVI,KonqKfmIconView>(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<KRadioAction *>(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<KFileIVI*>(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<KFileItem> kit( items );
+ TQPtrListIterator<KFileItem> 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<KFileIVI*>(_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<KFileIVI *>(item)->item()->getStatusBarInfo() );
emitMouseOver( static_cast<KFileIVI*>(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<KFileIVI *>( 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<KFileIVI *>( 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<SpringLoadingManager> 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<KonqKfmIconView*>(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 <konq_operations.h>
#include <konq_dirpart.h>
#include <kmimetyperesolver.h>
-#include <qptrdict.h>
-#include <qptrlist.h>
+#include <tqptrdict.h>
+#include <tqptrlist.h>
#include <kfileivi.h>
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<KFileIVI> m_paOutstandingOverlays;
- QTimer *m_paOutstandingOverlaysTimer;
+ TQPtrList<KFileIVI> m_paOutstandingOverlays;
+ TQTimer *m_paOutstandingOverlaysTimer;
/* KToggleAction *m_paImagePreview;
KToggleAction *m_paTextPreview;
KToggleAction *m_paHTMLPreview;*/
KActionMenu *m_pamPreview;
- QPtrList<KToggleAction> m_paPreviewPlugins;
+ TQPtrList<KToggleAction> m_paPreviewPlugins;
KActionMenu *m_pamSort;
KAction *m_paSelect;
@@ -216,13 +216,13 @@ protected:
KonqIconViewWidget *m_pIconView;
- QTimer *m_pTimeoutRefreshTimer;
+ TQTimer *m_pTimeoutRefreshTimer;
- QPtrDict<KFileIVI> m_itemDict; // maps KFileItem * -> KFileIVI *
+ TQPtrDict<KFileIVI> m_itemDict; // maps KFileItem * -> KFileIVI *
KMimeTypeResolver<KFileIVI,KonqKfmIconView> * 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 <stdlib.h>
-#include <qclipboard.h>
-#include <qpopupmenu.h>
-#include <qpainter.h>
+#include <tqclipboard.h>
+#include <tqpopupmenu.h>
+#include <tqpainter.h>
#include <klocale.h>
#include <dcopclient.h>
@@ -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<KBookmark> bookmarks
+ TQValueList<KBookmark> 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<KParts::ReadOnlyPart>(
- "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( "<HTML><BODY>FOO</BODY></HTML>" ) );
+ // doc->writeStream( TQCString( "<HTML><BODY>FOO</BODY></HTML>" ) );
// 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<KBookmark> getList(const KBookmarkGroup &);
+ TQValueList<KBookmark> getList(const KBookmarkGroup &);
private:
virtual void visit(const KBookmark &) { ; }
virtual void visitEnter(const KBookmarkGroup &);
virtual void visitLeave(const KBookmarkGroup &) { ; }
private:
KBookmarkManager *m_manager;
- QValueList<KBookmark> m_list;
+ TQValueList<KBookmark> m_list;
};
KBookmarkGroupList::KBookmarkGroupList( KBookmarkManager *manager ) {
m_manager = manager;
}
-QValueList<KBookmark> KBookmarkGroupList::getList( const KBookmarkGroup &grp ) {
+TQValueList<KBookmark> 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<KBookmark> bookmarks = lister.getList(bk.toGroup());
+ TQValueList<KBookmark> bookmarks = lister.getList(bk.toGroup());
bookmarks << bk.toGroup();
- for (QValueListConstIterator<KBookmark> it = bookmarks.begin(); it != bookmarks.end(); ++it) {
+ for (TQValueListConstIterator<KBookmark> 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<KBookmark> bks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
- QValueListIterator<KBookmark> it;
+ TQValueList<KBookmark> bks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
+ TQValueListIterator<KBookmark> 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<KBookmark> bks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
+ TQValueList<KBookmark> 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<KBookmark> bks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
+ TQValueList<KBookmark> 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 <qobject.h>
+#include <tqobject.h>
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 <stdlib.h>
-#include <qtimer.h>
-#include <qclipboard.h>
-#include <qsplitter.h>
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqtimer.h>
+#include <tqclipboard.h>
+#include <tqsplitter.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
#include <klocale.h>
#include <kdebug.h>
@@ -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 <kbookmark.h>
-#include <qwidget.h>
+#include <tqwidget.h>
#include <klineedit.h>
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 <kdebug.h>
-#include <qtimer.h>
+#include <tqtimer.h>
-BookmarkIterator::BookmarkIterator(QValueList<KBookmark> bks) : m_bklist(bks) {
- connect(this, SIGNAL( deleteSelf(BookmarkIterator *) ),
- SLOT( slotCancelTest(BookmarkIterator *) ));
+BookmarkIterator::BookmarkIterator(TQValueList<KBookmark> 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<KBookmark> head = m_bklist.begin();
+ TQValueListIterator<KBookmark> 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 <qobject.h>
-#include <qptrlist.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
#include <kbookmark.h>
class KEBListViewItem;
@@ -33,7 +33,7 @@ class BookmarkIterator : public QObject
Q_OBJECT
public:
- BookmarkIterator(QValueList<KBookmark> bks);
+ BookmarkIterator(TQValueList<KBookmark> bks);
virtual ~BookmarkIterator();
virtual BookmarkIteratorHolder* holder() const = 0;
@@ -53,7 +53,7 @@ protected:
private:
KBookmark m_bk;
- QValueList<KBookmark> m_bklist;
+ TQValueList<KBookmark> m_bklist;
};
class BookmarkIteratorHolder
@@ -68,7 +68,7 @@ protected:
virtual void doItrListChanged() = 0;
int count() const { return m_itrs.count(); }
private:
- QPtrList<BookmarkIterator> m_itrs;
+ TQPtrList<BookmarkIterator> 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 <assert.h>
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
#include <kdebug.h>
#include <klocale.h>
@@ -38,10 +38,10 @@
#include <kurldrag.h>
#include <kdesktopfile.h>
-QString KEBMacroCommand::affectedBookmarks() const
+TQString KEBMacroCommand::affectedBookmarks() const
{
- QPtrListIterator<KCommand> it(m_commands);
- QString affectBook;
+ TQPtrListIterator<KCommand> it(m_commands);
+ TQString affectBook;
if(it.current())
affectBook = dynamic_cast<IKEBCommand *>(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<QString> & addresses)
+bool DeleteManyCommand::isConsecutive(const TQValueList<TQString> & addresses)
{
- QValueList<QString>::const_iterator it, end;
+ TQValueList<TQString>::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<QString> & addresses)
}
-DeleteManyCommand::DeleteManyCommand(const QString &name, const QValueList<QString> & addresses)
+DeleteManyCommand::DeleteManyCommand(const TQString &name, const TQValueList<TQString> & addresses)
: KEBMacroCommand(name)
{
- QValueList<QString>::const_iterator it, begin;
+ TQValueList<TQString>::const_iterator it, begin;
begin = addresses.begin();
it = addresses.end();
while(begin != it)
@@ -110,7 +110,7 @@ DeleteManyCommand::DeleteManyCommand(const QString &name, const QValueList<QStri
else
{
m_currentAddress = preOrderNextAddress( KBookmark::parentAddress( *begin ) );
- if(m_currentAddress == QString::null)
+ if(m_currentAddress == TQString::null)
m_currentAddress = prevOrParentAddress( *begin );
}
}
@@ -119,20 +119,20 @@ DeleteManyCommand::DeleteManyCommand(const QString &name, const QValueList<QStri
// Check if all bookmarks are consecutive
if(isConsecutive(addresses)) // Mark next bookmark after all selected
{ // That's a little work...
- QValueList<QString>::const_iterator last = addresses.end();
+ TQValueList<TQString>::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<QString>::const_iterator jt, end;
+ TQValueList<TQString>::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<QStri
}
}
-QString DeleteManyCommand::currentAddress() const
+TQString DeleteManyCommand::currentAddress() const
{
return m_currentAddress;
}
-QString CreateCommand::name() const {
+TQString CreateCommand::name() const {
if (m_separator) {
return i18n("Insert Separator");
} else if (m_group) {
@@ -160,19 +160,19 @@ QString CreateCommand::name() const {
}
void CreateCommand::execute() {
- QString parentAddress = KBookmark::parentAddress(m_to);
+ TQString parentAddress = KBookmark::parentAddress(m_to);
KBookmarkGroup parentGroup =
CurrentMgr::bookmarkAt(parentAddress).toGroup();
- QString previousSibling = KBookmark::previousAddress(m_to);
+ TQString previousSibling = KBookmark::previousAddress(m_to);
// kdDebug() << "CreateCommand::execute previousSibling="
// << previousSibling << endl;
KBookmark prev = (previousSibling.isEmpty())
- ? KBookmark(QDomElement())
+ ? KBookmark(TQDomElement())
: CurrentMgr::bookmarkAt(previousSibling);
- KBookmark bk = KBookmark(QDomElement());
+ KBookmark bk = KBookmark(TQDomElement());
if (m_separator) {
bk = parentGroup.createNewSeparator();
@@ -207,7 +207,7 @@ void CreateCommand::execute() {
Q_ASSERT(bk.address() == m_to);
}
-QString CreateCommand::finalAddress() const {
+TQString CreateCommand::finalAddress() const {
Q_ASSERT( !m_to.isEmpty() );
return m_to;
}
@@ -223,14 +223,14 @@ void CreateCommand::unexecute() {
bk.parentGroup().deleteBookmark(bk);
}
-QString CreateCommand::affectedBookmarks() const
+TQString CreateCommand::affectedBookmarks() const
{
return KBookmark::parentAddress(m_to);
}
-QString CreateCommand::currentAddress() const
+TQString CreateCommand::currentAddress() const
{
- QString bk = KBookmark::previousAddress( m_to );
+ TQString bk = KBookmark::previousAddress( m_to );
if(CurrentMgr::bookmarkAt( bk).hasParent())
return bk;
else
@@ -239,7 +239,7 @@ QString CreateCommand::currentAddress() const
/* -------------------------------------- */
-QString EditCommand::name() const {
+TQString EditCommand::name() const {
return i18n("%1 Change").arg(m_mytext);
}
@@ -249,7 +249,7 @@ void EditCommand::execute() {
m_reverseEditions.clear();
- QValueList<Edition>::Iterator it = m_editions.begin();
+ TQValueList<Edition>::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<Edition>::Iterator it = m_editions.begin();
- QValueList<Edition>::Iterator end = m_editions.end();
+ TQValueList<Edition>::Iterator it = m_editions.begin();
+ TQValueList<Edition>::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<SortItem, SortByName, QString, SortCommand>
+ kInsertionSort<SortItem, SortByName, TQString, SortCommand>
(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<EditCommand::Edition> lst;
+ TQValueList<EditCommand::Edition> lst;
lst.append(EditCommand::Edition("toolbar", "no"));
lst.append(EditCommand::Edition("icon", ""));
EditCommand *cmd1 = new EditCommand(oldToolbar.address(), lst);
mcmd->addCommand(cmd1);
}
- QValueList<EditCommand::Edition> lst;
+ TQValueList<EditCommand::Edition> 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<KBookmark> &bks, bool show) {
- QString i18n_name = i18n("%1 in Bookmark Toolbar").arg(show ? i18n("Show")
+KEBMacroCommand* CmdGen::setShownInToolbar(const TQValueList<KBookmark> &bks, bool show) {
+ TQString i18n_name = i18n("%1 in Bookmark Toolbar").arg(show ? i18n("Show")
: i18n("Hide"));
KEBMacroCommand *mcmd = new KEBMacroCommand(i18n_name);
- QValueList<KBookmark>::ConstIterator it, end;
+ TQValueList<KBookmark>::ConstIterator it, end;
end = bks.end();
for(it = bks.begin(); it != end; ++it)
{
- QValueList<EditCommand::Edition> lst;
+ TQValueList<EditCommand::Edition> 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<KBookmark> &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<KBookmark> urlBks;
+ TQValueList<KBookmark> 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<KBookmark> bookmarks = KBookmarkDrag::decode(data);
- for (QValueListConstIterator<KBookmark> it = bookmarks.begin();
+ TQString currentAddress = addr;
+ TQValueList<KBookmark> bookmarks = KBookmarkDrag::decode(data);
+ for (TQValueListConstIterator<KBookmark> 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<KEBListViewItem *> & items,
- const QString &newAddress, bool copy) {
+KEBMacroCommand* CmdGen::itemsMoved(const TQValueVector<KEBListViewItem *> & items,
+ const TQString &newAddress, bool copy) {
KEBMacroCommand *mcmd = new KEBMacroCommand(copy ? i18n("Copy Items")
: i18n("Move Items"));
- QValueList<KBookmark> list = ListView::self()->itemsToBookmarks( items );
- QValueList<KBookmark>::const_iterator it, end;
+ TQValueList<KBookmark> list = ListView::self()->itemsToBookmarks( items );
+ TQValueList<KBookmark>::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<KEBListViewItem *> & 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 <kcommand.h>
#include <kbookmark.h>
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
// 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<QString> & addresses);
+ DeleteManyCommand(const TQString &name, const TQValueList<TQString> & addresses);
virtual ~DeleteManyCommand() {};
- virtual QString currentAddress() const;
+ virtual TQString currentAddress() const;
private:
- QString prevOrParentAddress(QString addr);
- QString preOrderNextAddress(QString addr);
- bool isConsecutive(const QValueList<QString> & addresses);
- QString m_currentAddress;
+ TQString prevOrParentAddress(TQString addr);
+ TQString preOrderNextAddress(TQString addr);
+ bool isConsecutive(const TQValueList<TQString> & 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<Edition> &editions,
- const QString &name = QString::null)
+ EditCommand(const TQString &address,
+ const TQValueList<Edition> &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<Edition> m_editions;
- QValueList<Edition> m_reverseEditions;
- QString m_mytext;
+ TQString m_address;
+ TQValueList<Edition> m_editions;
+ TQValueList<Edition> 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<KBookmark> &bk, bool show);
+ static KEBMacroCommand* setShownInToolbar(const TQValueList<KBookmark> &bk, bool show);
static bool shownInToolbar(const KBookmark &bk);
- static KEBMacroCommand* deleteItems(const QString &commandName, const QValueVector<KEBListViewItem *> & items);
- static KEBMacroCommand* insertMimeSource(const QString &cmdName, QMimeSource *data, const QString &addr);
- static KEBMacroCommand* itemsMoved(const QValueVector<KEBListViewItem *> & items, const QString &newAddress, bool copy);
+ static KEBMacroCommand* deleteItems(const TQString &commandName, const TQValueVector<KEBListViewItem *> & items);
+ static KEBMacroCommand* insertMimeSource(const TQString &cmdName, TQMimeSource *data, const TQString &addr);
+ static KEBMacroCommand* itemsMoved(const TQValueVector<KEBListViewItem *> & 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 <stdlib.h>
-#include <qclipboard.h>
-#include <qpopupmenu.h>
-#include <qpainter.h>
+#include <tqclipboard.h>
+#include <tqpopupmenu.h>
+#include <tqpainter.h>
#include <klocale.h>
#include <kbookmarkmanager.h>
@@ -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 <dcopobject.h>
-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 <klocale.h>
#include <kapplication.h>
-#include <qfile.h>
+#include <tqfile.h>
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 "<<m_affectedBookmark<<endl;
CurrentMgr::self()->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 "<<address<<endl;
if(m_affectedBookmark.isNull())
@@ -59,7 +59,7 @@ void FavIconsItrHolder::addAffectedBookmark( const QString & address )
/* -------------------------- */
-FavIconsItr::FavIconsItr(QValueList<KBookmark> bks)
+FavIconsItr::FavIconsItr(TQValueList<KBookmark> 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<KBookmark> bks);
+ FavIconsItr(TQValueList<KBookmark> 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 <qregexp.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <klocale.h>
@@ -40,15 +40,15 @@
#include <kbookmarkimporter_crash.h>
#include <kbookmarkdombuilder.h>
-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<QDomElement> childList;
+ TQValueList<TQDomElement> 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<QDomElement>::Iterator it = childList.begin();
- QValueList<QDomElement>::Iterator end = childList.end();
+ TQValueList<TQDomElement>::Iterator it = childList.begin();
+ TQValueList<TQDomElement>::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 <kcommand.h>
#include <kbookmark.h>
-#include <qptrstack.h>
-#include <qobject.h>
+#include <tqptrstack.h>
+#include <tqobject.h>
// 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 <dcopclient.h>
-#include <qdir.h>
-#include <qdom.h>
-#include <qfile.h>
+#include <tqdir.h>
+#include <tqdom.h>
+#include <tqfile.h>
#include <X11/Xlib.h>
@@ -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 <klistviewsearchline.h>
-#include <qobject.h>
+#include <tqobject.h>
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 <stdlib.h>
-#include <qclipboard.h>
-#include <qpopupmenu.h>
-#include <qpainter.h>
-#include <qheader.h>
+#include <tqclipboard.h>
+#include <tqpopupmenu.h>
+#include <tqpainter.h>
+#include <tqheader.h>
#include <klocale.h>
@@ -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<int>() << 100 << 300);
+ splitter->setSizes(TQValueList<int>() << 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<KBookmark> ListView::itemsToBookmarks(const QValueVector<KEBListViewItem *> & items) const
+TQValueList<KBookmark> ListView::itemsToBookmarks(const TQValueVector<KEBListViewItem *> & items) const
{
- QValueList<KBookmark> bookmarks; //TODO optimize by using a QValueVector
- QValueVector<KEBListViewItem *>::const_iterator it = items.constBegin();
- QValueVector<KEBListViewItem *>::const_iterator end = items.constEnd();
+ TQValueList<KBookmark> bookmarks; //TODO optimize by using a QValueVector
+ TQValueVector<KEBListViewItem *>::const_iterator it = items.constBegin();
+ TQValueVector<KEBListViewItem *>::const_iterator end = items.constEnd();
for( ; it!=end; ++it)
{
if(*it != m_listView->rootItem() )
@@ -158,12 +158,12 @@ QValueList<KBookmark> ListView::itemsToBookmarks(const QValueVector<KEBListViewI
return bookmarks;
}
-void ListView::invalidate(const QString & address)
+void ListView::invalidate(const TQString & address)
{
invalidate(getItemAtAddress(address));
}
-void ListView::invalidate(QListViewItem * item)
+void ListView::invalidate(TQListViewItem * item)
{
if(item->isSelected())
{
@@ -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<KEBListViewItem *, bool>::iterator it, end;
+ TQString least = mSelectedItems.begin().key()->bookmark().address();
+ TQMap<KEBListViewItem *, bool>::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<KEBListViewItem *, bool>::iterator it;
+ TQMap<KEBListViewItem *, bool>::iterator it;
if(s)
mSelectedItems[item] = item;
@@ -223,7 +223,7 @@ void ListView::selected(KEBListViewItem * item, bool s)
KEBApp::self()->updateActions();
- const QValueVector<KEBListViewItem *> & selected = selectedItemsMap();
+ const TQValueVector<KEBListViewItem *> & 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<KEBListViewItem *> ListView::selectedItemsMap() const
+TQValueVector<KEBListViewItem *> ListView::selectedItemsMap() const
{
- QValueVector<KEBListViewItem *> selected;
- QMap<KEBListViewItem *, bool>::ConstIterator it, end;
+ TQValueVector<KEBListViewItem *> selected;
+ TQMap<KEBListViewItem *, bool>::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<KEBListViewItem *> selected = selectedItemsMap();
+ TQValueVector<KEBListViewItem *> selected = selectedItemsMap();
if(selected.isEmpty())
return 0L;
else
@@ -282,11 +282,11 @@ void ListView::deselectAllChildren(KEBListViewItem *item)
}
}
-QValueList<QString> ListView::selectedAddresses()
+TQValueList<TQString> ListView::selectedAddresses()
{
- QValueList<QString> addresses;
- QValueList<KBookmark> bookmarks = itemsToBookmarks( selectedItemsMap() );
- QValueList<KBookmark>::const_iterator it, end;
+ TQValueList<TQString> addresses;
+ TQValueList<KBookmark> bookmarks = itemsToBookmarks( selectedItemsMap() );
+ TQValueList<KBookmark>::const_iterator it, end;
end = bookmarks.end();
for( it = bookmarks.begin(); it != end; ++it)
addresses.append( (*it).address() );
@@ -294,9 +294,9 @@ QValueList<QString> ListView::selectedAddresses()
}
-QValueList<KBookmark> ListView::selectedBookmarksExpanded() const {
- QValueList<KBookmark> bookmarks;
- for (QListViewItemIterator it(m_listView); it.current() != 0; ++it) {
+TQValueList<KBookmark> ListView::selectedBookmarksExpanded() const {
+ TQValueList<KBookmark> 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<KBookmark> ListView::selectedBookmarksExpanded() const {
}
-void ListView::selectedBookmarksExpandedHelper(KEBListViewItem * item, QValueList<KBookmark> & bookmarks) const
+void ListView::selectedBookmarksExpandedHelper(KEBListViewItem * item, TQValueList<KBookmark> & bookmarks) const
{
KEBListViewItem* child = static_cast<KEBListViewItem *>(item->firstChild());
while( child )
@@ -328,9 +328,9 @@ void ListView::selectedBookmarksExpandedHelper(KEBListViewItem * item, QValueLis
}
}
-QValueList<KBookmark> ListView::allBookmarks() const {
- QValueList<KBookmark> bookmarks;
- for (QListViewItemIterator it(m_listView); it.current() != 0; ++it)
+TQValueList<KBookmark> ListView::allBookmarks() const {
+ TQValueList<KBookmark> bookmarks;
+ for (TQListViewItemIterator it(m_listView); it.current() != 0; ++it)
{
KEBListViewItem * item = static_cast<KEBListViewItem *>(it.current());
if (!item->isEmptyFolderPadder() && (item->childCount() == 0))
@@ -341,7 +341,7 @@ QValueList<KBookmark> 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<KEBListViewItem *> selected = selectedItemsMap();
+ TQValueVector<KEBListViewItem *> 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<KEBListViewItem *>(itemAfterQLVI);
- QString newAddress
+ TQString newAddress
= (!itemAfter || itemAfter->isEmptyFolderPadder())
? (static_cast<KEBListViewItem *>(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<KEBListViewItem *> & selected = selectedItemsMap();
+ const TQValueVector<KEBListViewItem *> & 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<KEBListViewItem *, bool>::const_iterator it, end;
+ TQMap<KEBListViewItem *, bool>::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<KEBListViewItem *>(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<QPopupMenu*>(popup)->popup(p);
+ static_cast<TQPopupMenu*>(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<KEBListViewItem *>(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<KEBListViewItem *>(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<KEBListViewItem *>(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<KBookmark> bookmarks =
+TQDragObject *KEBListView::dragObject() {
+ TQValueList<KBookmark> 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 <assert.h>
-#include <qlistview.h>
-#include <qmap.h>
-#include <qvaluevector.h>
+#include <tqlistview.h>
+#include <tqmap.h>
+#include <tqvaluevector.h>
#include <klocale.h>
#include <kbookmark.h>
@@ -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<KEBListViewItem *> selectedItemsMap() const;
+ TQValueVector<KEBListViewItem *> selectedItemsMap() const;
- QValueList<QString> selectedAddresses();
+ TQValueList<TQString> selectedAddresses();
// bookmark helpers
- QValueList<KBookmark> itemsToBookmarks(const QValueVector<KEBListViewItem *> & items) const;
+ TQValueList<KBookmark> itemsToBookmarks(const TQValueVector<KEBListViewItem *> & items) const;
// bookmark stuff
- QValueList<KBookmark> allBookmarks() const;
- QValueList<KBookmark> selectedBookmarksExpanded() const;
+ TQValueList<KBookmark> allBookmarks() const;
+ TQValueList<KBookmark> 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<KBookmark> & bookmarks) const;
+ void selectedBookmarksExpandedHelper(KEBListViewItem * item, TQValueList<KBookmark> & 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<KEBListViewItem *, bool> mSelectedItems;
+ TQMap<KEBListViewItem *, bool> 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 <qtimer.h>
-#include <qpainter.h>
+#include <tqtimer.h>
+#include <tqpainter.h>
#include <kdebug.h>
@@ -49,11 +49,11 @@ void TestLinkItrHolder::doItrListChanged() {
{
kdDebug()<<"Notifing managers "<<m_affectedBookmark<<endl;
CurrentMgr::self()->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 "<<address<<endl;
if(m_affectedBookmark.isNull())
@@ -65,7 +65,7 @@ void TestLinkItrHolder::addAffectedBookmark( const QString & address )
/* -------------------------- */
-TestLinkItr::TestLinkItr(QValueList<KBookmark> bks)
+TestLinkItr::TestLinkItr(TQValueList<KBookmark> 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("<title>", 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("</title>", -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 <qobject.h>
+#include <tqobject.h>
#include <kio/job.h>
#include <kbookmark.h>
@@ -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<QString, QString> m_modify;
- QMap<QString, QString> m_oldModify;
- QString m_affectedBookmark;
+ TQMap<TQString, TQString> m_modify;
+ TQMap<TQString, TQString> m_oldModify;
+ TQString m_affectedBookmark;
};
class TestLinkItr : public BookmarkIterator
@@ -56,13 +56,13 @@ class TestLinkItr : public BookmarkIterator
Q_OBJECT
public:
- TestLinkItr(QValueList<KBookmark> bks);
+ TestLinkItr(TQValueList<KBookmark> 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 <stdlib.h>
-#include <qclipboard.h>
-#include <qsplitter.h>
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqclipboard.h>
+#include <tqsplitter.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
#include <klocale.h>
#include <kdebug.h>
@@ -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"<<endl;
disconnect(m_mgr, 0, 0, 0);
@@ -140,11 +140,11 @@ void CurrentMgr::createManager(const QString &filename) {
m_mgr = KBookmarkManager::managerForFile(filename, false);
- connect(m_mgr, SIGNAL( changed(const QString &, const QString &) ),
- SLOT( slotBookmarksChanged(const QString &, const QString &) ));
+ connect(m_mgr, TQT_SIGNAL( changed(const TQString &, const TQString &) ),
+ TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ));
}
-void CurrentMgr::slotBookmarksChanged(const QString &, const QString &) {
+void CurrentMgr::slotBookmarksChanged(const TQString &, const TQString &) {
if(ignorenext > 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( "<b>Reset Quick Search</b><br>"
"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<int>() << h << 380
+ vsplitter->setOrientation(TQSplitter::Vertical);
+ vsplitter->setSizes(TQValueList<int>() << 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 <qtimer.h>
+#include <tqtimer.h>
#include "updater.h"
@@ -36,7 +36,7 @@
#include <kparts/componentfactory.h>
#include <kparts/browserextension.h>
-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<KParts::ReadOnlyPart>("text/html", QString::null);
+ ::createPartInstanceFromQuery<KParts::ReadOnlyPart>("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<KIO::SimpleJob *>(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<KonqHistoryEntry>;
+template class TQPtrList<KonqHistoryEntry>;
/////////////////
//static - used by KonqHistoryAction and KonqBidiHistoryAction
-void KonqBidiHistoryAction::fillHistoryPopup( const QPtrList<HistoryEntry> &history,
- QPopupMenu * popup,
+void KonqBidiHistoryAction::fillHistoryPopup( const TQPtrList<HistoryEntry> &history,
+ TQPopupMenu * popup,
bool onlyBack,
bool onlyForward,
bool checkCurrentItem,
@@ -50,7 +50,7 @@ void KonqBidiHistoryAction::fillHistoryPopup( const QPtrList<HistoryEntry> &hist
//kdDebug(1202) << "fillHistoryPopup position: " << history.at() << endl;
HistoryEntry * current = history.current();
- QPtrListIterator<HistoryEntry> it( history );
+ TQPtrListIterator<HistoryEntry> it( history );
if (onlyBack || onlyForward)
{
it += history.at(); // Jump to current item
@@ -61,7 +61,7 @@ void KonqBidiHistoryAction::fillHistoryPopup( const QPtrList<HistoryEntry> &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<HistoryEntry> &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<HistoryEntry> & history )
+void KonqBidiHistoryAction::fillGoMenu( const TQPtrList<HistoryEntry> & 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<KonqHistoryEntry *>( item1 );
KonqHistoryEntry *entry2 = static_cast<KonqHistoryEntry *>( 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 <konq_historymgr.h>
#include <kaction.h>
-#include <qptrlist.h>
+#include <tqptrlist.h>
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<HistoryEntry> &history );
+ void fillGoMenu( const TQPtrList<HistoryEntry> &history );
// Used by KonqHistoryAction and KonqBidiHistoryAction
- static void fillHistoryPopup( const QPtrList<HistoryEntry> &history,
- QPopupMenu * popup,
+ static void fillHistoryPopup( const TQPtrList<HistoryEntry> &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 <qpainter.h>
-#include <qstyle.h>
+#include <tqpainter.h>
+#include <tqstyle.h>
#include <kapplication.h>
#include <kconfig.h>
#include <kcompletionbox.h>
@@ -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<KonqHistoryList&>( 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 &pm; }
+ const TQPixmap *pixmap() const { return &pm; }
- 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<QKeyEvent *>( ev );
+ if ( type == TQEvent::KeyPress ) {
+ TQKeyEvent *e = static_cast<TQKeyEvent *>( 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<QChar> chars;
- chars << QChar('/') << QChar('.') << QChar('?') << QChar('#') << QChar(':');
+ TQValueList<TQChar> 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<KonqComboCompletionBox*>( 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 <qevent.h>
+#include <tqevent.h>
#include <kcombobox.h>
#include <konq_historymgr.h>
@@ -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 <qlayout.h>
-#include <qtimer.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
#include <kconfig.h>
#include <kdebug.h>
@@ -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<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(d->mainWindow);
- QPtrListIterator<KParts::Plugin> it(plugins);
+ TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(d->mainWindow);
+ TQPtrListIterator<KParts::Plugin> 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<KParts::Plugin> plugins = KParts::Plugin::pluginObjects( d->activePart );
- QPtrListIterator<KParts::Plugin> it(plugins);
+ TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects( d->activePart );
+ TQPtrListIterator<KParts::Plugin> 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 <klocale.h>
#include <kmessagebox.h>
-#include <qwidget.h>
-#include <qfile.h>
+#include <tqwidget.h>
+#include <tqfile.h>
#include <assert.h>
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<KParts::ReadOnlyPart *>( obj );
- QFrame* frame = ::qt_cast<QFrame*>( part->widget() );
+ TQFrame* frame = ::qt_cast<TQFrame*>( 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 <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include <klibloader.h>
#include <ktrader.h>
@@ -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 <math.h>
-#include <qpainter.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qtoolbutton.h>
-#include <qtabbar.h>
-#include <qptrlist.h>
-#include <qpopupmenu.h>
-#include <qkeysequence.h>
+#include <tqpainter.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
+#include <tqtoolbutton.h>
+#include <tqtabbar.h>
+#include <tqptrlist.h>
+#include <tqpopupmenu.h>
+#include <tqkeysequence.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -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<QMouseEvent *>(e)->button() == RightButton)
+ if ( static_cast<TQMouseEvent *>(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("<<text<<")"<<endl;
//m_pStatusLabel->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<KonqFrame *>( 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<QKeyEvent*>(ev);
+ TQKeyEvent * keyEv = static_cast<TQKeyEvent*>(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 <qguardedptr.h>
-#include <qcolor.h>
-#include <qwidget.h>
-#include <qsplitter.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
+#include <tqguardedptr.h>
+#include <tqcolor.h>
+#include <tqwidget.h>
+#include <tqsplitter.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
#include <kpixmap.h>
#include <kpixmapeffect.h>
@@ -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<KonqView> ChildViewList;
+typedef TQPtrList<KonqView> 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<KonqView> m_pView;
+ TQVBoxLayout *m_pLayout;
+ TQGuardedPtr<KonqView> m_pView;
- QGuardedPtr<KParts::ReadOnlyPart> m_pPart;
+ TQGuardedPtr<KParts::ReadOnlyPart> 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<KAction> ToggleViewGUIClient::actions() const
+TQPtrList<KAction> ToggleViewGUIClient::actions() const
{
- QPtrList<KAction> res;
+ TQPtrList<KAction> res;
- QDictIterator<KAction> it( m_actions );
+ TQDictIterator<KAction> it( m_actions );
for (; it.current(); ++it )
res.append( it.current() );
@@ -230,7 +230,7 @@ QPtrList<KAction> 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<int> newSplitterSizes;
+ TQValueList<int> 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<KonqView> viewList;
+ TQPtrList<KonqView> viewList;
m_mainWindow->listViews( &viewList );
- QPtrListIterator<KonqView> it( viewList );
+ TQPtrListIterator<KonqView> 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 <kxmlguiclient.h>
-#include <qobject.h>
-#include <qdict.h>
+#include <tqobject.h>
+#include <tqdict.h>
#include <ktrader.h>
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<KAction> actions() const;
- KAction *action( const QString &name ) { return m_actions[ name ]; }
+ TQPtrList<KAction> 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<KAction> m_actions;
+ TQDict<KAction> m_actions;
bool m_empty;
- QMap<QString,bool> m_mapOrientation;
+ TQMap<TQString,bool> 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 <kcmdlineargs.h>
#include <dcopclient.h>
#include <kimageio.h>
-#include <qfile.h>
+#include <tqfile.h>
-#include <qwidgetlist.h>
+#include <tqwidgetlist.h>
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 <time.h>
#include <unistd.h>
-#include <qfile.h>
-#include <qclipboard.h>
-#include <qmetaobject.h>
-#include <qvbox.h>
-#include <qlayout.h>
-#include <qfileinfo.h>
-#include <qwhatsthis.h>
+#include <tqfile.h>
+#include <tqclipboard.h>
+#include <tqmetaobject.h>
+#include <tqvbox.h>
+#include <tqlayout.h>
+#include <tqfileinfo.h>
+#include <tqwhatsthis.h>
#include <dcopclient.h>
#include <kaboutdata.h>
@@ -117,13 +117,13 @@
#include <X11/Xatom.h>
#include <fixx11h.h>
-template class QPtrList<QPixmap>;
-template class QPtrList<KToggleAction>;
+template class TQPtrList<TQPixmap>;
+template class TQPtrList<KToggleAction>;
-QPtrList<KonqMainWindow> *KonqMainWindow::s_lstViews = 0;
+TQPtrList<KonqMainWindow> *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<KonqMainWindow>;
+ s_lstViews = new TQPtrList<KonqMainWindow>;
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<QPopupMenu*>(factory()->container("edit",this));
+ TQPopupMenu *popup = static_cast<TQPopupMenu*>(factory()->container("edit",this));
if (popup)
KAcceleratorManager::manage(popup);
- popup = static_cast<QPopupMenu*>(factory()->container("tools",this));
+ popup = static_cast<TQPopupMenu*>(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<KParts::ReadOnlyPart *>( 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<KonqView> listViews;
+ TQPtrList<KonqView> 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<KToolBar> it( mainWindow->toolBarIterator() ); it.current(); ++it )
+ for ( TQPtrListIterator<KToolBar> 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<KonqDirPart*>(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<KAction> it( m_toolBarViewModeActions );
+ TQPtrListIterator<KAction> 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<KonqViewModeAction *>( 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<KonqDirPart*>( 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<p>"
"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<p>"
@@ -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<KToggleAction*>(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<KRadioAction> it( m_viewModeActions );
+ const TQString currentServiceDesktopEntryName = m_currentView->service()->desktopEntryName();
+ TQPtrListIterator<KRadioAction> 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<KAction> ittb( m_toolBarViewModeActions );
+ const TQString currentServiceLibrary = viewModeActionKey( m_currentView->service() );
+ TQPtrListIterator<KAction> ittb( m_toolBarViewModeActions );
for (; ittb.current(); ++ittb ) {
KService::Ptr serv = KService::serviceByDesktopName( ittb.current()->name() );
if ( serv && viewModeActionKey( serv ) == currentServiceLibrary ) {
KToggleAction* ta = static_cast<KToggleAction*>( 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<KParts::ReadOnlyPart> frames = ext->frames();
- QPtrListIterator<KParts::ReadOnlyPart> frameIt( frames );
+ TQPtrList<KParts::ReadOnlyPart> frames = ext->frames();
+ TQPtrListIterator<KParts::ReadOnlyPart> 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<KonqMainWindow> it( *s_lstViews );
+ TQPtrListIterator<KonqMainWindow> 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<QFocusEvent*>(ev);
- if (focusEv->reason() == QFocusEvent::Popup)
+ TQFocusEvent * focusEv = static_cast<TQFocusEvent*>(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<KToolBar> barIt = toolBarIterator();
+ TQPtrListIterator<KToolBar> 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<KAction> lst;
+ TQPtrList<KAction> 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<p>"
+ TQWhatsThis::add( m_combo, i18n( "Location Bar<p>"
"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<p>"
"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<p>"
"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<KURL> list = grp.groupUrlList();
- QValueList<KURL>::Iterator it = list.begin();
+ TQValueList<KURL> list = grp.groupUrlList();
+ TQValueList<KURL>::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<KonqFrameBase>* childFrameList = tabContainer->childFrameList();
+ TQPtrList<KonqFrameBase>* 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<KAction> lst;
+ TQPtrList<KAction> 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<KAction *> actions = actionCollection()->actions();
- QValueList<KAction *>::Iterator it = actions.begin();
- QValueList<KAction *>::Iterator end = actions.end();
+ TQValueList<KAction *> actions = actionCollection()->actions();
+ TQValueList<KAction *>::Iterator it = actions.begin();
+ TQValueList<KAction *>::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<KAction> actions = m_toggleViewGUIClient->actions();
+ TQPtrList<KAction> 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<KAction> actions = m_toggleViewGUIClient->actions();
+ TQPtrList<KAction> 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<KonqDirPart *>(m_currentView->part())->nameFilter();
+ TQString nameFilter = static_cast<KonqDirPart *>(m_currentView->part())->nameFilter();
if ( !nameFilter.isEmpty() )
{
if (!url.endsWith("/"))
@@ -4527,8 +4527,8 @@ void KonqExtendedBookmarkOwner::slotFillBookmarksList( KExtendedBookmarkOwner::Q
KonqFrameTabs* tabContainer = static_cast<KonqFrameTabs*>(docContainer);
- QPtrList<KonqFrameBase> frameList = *tabContainer->childFrameList();
- QPtrListIterator<KonqFrameBase> it( frameList );
+ TQPtrList<KonqFrameBase> frameList = *tabContainer->childFrameList();
+ TQPtrListIterator<KonqFrameBase> 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<KonqPopupMenu> pPopupMenu = new KonqPopupMenu(
+ TQGuardedPtr<KonqPopupMenu> 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<QObject> guard(this); // #149736
+ TQGuardedPtr<TQObject> 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<QLineEdit*>( fw ) )
+ TQWidget* fw = focusWidget();
+ if ( !fw || !::qt_cast<TQLineEdit*>( 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<KFileItem> it( items );
+ TQPtrListIterator<KFileItem> 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<KRadioAction> it( m_viewModeActions );
+ TQPtrListIterator<KRadioAction> 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<QString,KonqViewModeAction*> groupedServiceMap;
+ TQMap<TQString,KonqViewModeAction*> groupedServiceMap;
// Another temporary map, the preferred service for each library (2 entries in our example)
- QMap<QString,QString> preferredServiceMap;
+ TQMap<TQString,TQString> 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<QString,KonqViewModeAction*>::Iterator mapIt = groupedServiceMap.find( library );
+ TQMap<TQString,KonqViewModeAction*>::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<QString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.find( library );
+ TQMap<TQString,KService::Ptr>::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<QString,QString>::Iterator debugIt = preferredServiceMap.begin();
- QMap<QString,QString>::Iterator debugEnd = preferredServiceMap.end();
+ TQMap<TQString,TQString>::Iterator debugIt = preferredServiceMap.begin();
+ TQMap<TQString,TQString>::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<QString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.begin();
- QMap<QString,KService::Ptr>::ConstIterator serviceEnd = m_viewModeToolBarServices.end();
+ TQMap<TQString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.begin();
+ TQMap<TQString,KService::Ptr>::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<KAction> lst;
+ TQPtrList<KAction> 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<KToggleAction*>(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<noslash>
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 <qmap.h>
-#include <qpoint.h>
-#include <qtimer.h>
-#include <qguardedptr.h>
+#include <tqmap.h>
+#include <tqpoint.h>
+#include <tqtimer.h>
+#include <tqguardedptr.h>
#include <kfileitem.h>
#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<KParts::ReadOnlyPart *, KonqView *> MapViews;
+ typedef TQMap<KParts::ReadOnlyPart *, KonqView *> 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<KonqMainWindow> *mainWindowList() { return s_lstViews; }
+ static TQPtrList<KonqMainWindow> *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<HistoryEntry> &history );
+ void fillHistoryPopup( TQPopupMenu *menu, const TQPtrList<HistoryEntry> &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<KonqView> m_currentView;
+ TQGuardedPtr<KonqView> 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<KonqCombo> m_combo;
+ TQLabel* m_locationLabel;
+ TQGuardedPtr<KonqCombo> 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<KAction> m_openWithActions;
+ TQPtrList<KAction> m_openWithActions;
KActionMenu *m_viewModeMenu;
- QPtrList<KAction> m_toolBarViewModeActions; // basically holds two KonqViewActions, one of
+ TQPtrList<KAction> m_toolBarViewModeActions; // basically holds two KonqViewActions, one of
// iconview and one for listview
- QPtrList<KRadioAction> m_viewModeActions;
- QMap<QString,KService::Ptr> m_viewModeToolBarServices; // similar to m_toolBarViewModeActions
+ TQPtrList<KRadioAction> m_viewModeActions;
+ TQMap<TQString,KService::Ptr> 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<KonqMainWindow> *s_lstViews;
+ static TQPtrList<KonqMainWindow> *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 <qwhatsthis.h>
-#include <qstyle.h>
-#include <qdir.h>
+#include <tqwhatsthis.h>
+#include <tqstyle.h>
+#include <tqdir.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -47,10 +47,10 @@
// Terminates fullscreen-mode for any full-screen window on the current desktop
void KonqMisc::abortFullScreenMode()
{
- QPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();
+ TQPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();
if ( mainWindows )
{
- QPtrListIterator<KonqMainWindow> it( *mainWindows );
+ TQPtrListIterator<KonqMainWindow> 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 <qlabel.h>
+#include <tqlabel.h>
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 <qstringlist.h>
+#include <tqstringlist.h>
#include <kparts/browserextension.h>
@@ -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 <qcheckbox.h>
-#include <qdir.h>
-#include <qvbox.h>
-#include <qlabel.h>
-#include <qheader.h>
-#include <qlineedit.h>
+#include <tqcheckbox.h>
+#include <tqdir.h>
+#include <tqvbox.h>
+#include <tqlabel.h>
+#include <tqheader.h>
+#include <tqlineedit.h>
#include <klistview.h>
#include <kdebug.h>
@@ -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<KonqProfileItem *>( 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 <kdialogbase.h>
-#include <qlistview.h>
-#include <qmap.h>
+#include <tqlistview.h>
+#include <tqmap.h>
class KonqViewManager;
class QListViewItem;
@@ -33,22 +33,22 @@ class QLineEdit;
class KPushButton;
class KListView;
-typedef QMap<QString, QString> KonqProfileMap;
+typedef TQMap<TQString, TQString> 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<KIO::StatJob*>( 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<KIO::TransferJob*>( 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 <kparts/browserrun.h>
-#include <qguardedptr.h>
+#include <tqguardedptr.h>
#include <kservice.h>
#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<KonqMainWindow> m_pMainWindow;
- QGuardedPtr<KonqView> m_pView;
+ TQGuardedPtr<KonqMainWindow> m_pMainWindow;
+ TQGuardedPtr<KonqView> 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 <qapplication.h>
-#include <qclipboard.h>
-#include <qptrlist.h>
-#include <qpopupmenu.h>
-#include <qtoolbutton.h>
-#include <qtooltip.h>
+#include <tqapplication.h>
+#include <tqclipboard.h>
+#include <tqptrlist.h>
+#include <tqpopupmenu.h>
+#include <tqtoolbutton.h>
+#include <tqtooltip.h>
#include <kdebug.h>
#include <kiconloader.h>
@@ -43,9 +43,9 @@
#include <kaccelmanager.h>
#include <konq_pixmapprovider.h>
#include <kstdaccel.h>
-#include <qtabbar.h>
-#include <qwhatsthis.h>
-#include <qstyle.h>
+#include <tqtabbar.h>
+#include <tqwhatsthis.h>
+#include <tqstyle.h>
#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<KonqFrameBase>;
+ m_pChildFrameList = new TQPtrList<KonqFrameBase>;
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<KonqFrameBase> it( *m_pChildFrameList ); *it; ++it )
+ for( TQPtrListIterator<KonqFrameBase> 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<KonqFrameBase*>(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<KonqFrame *>(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<KonqFrameBase*>(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<KonqFrameBase*>( 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<KonqFrameBase>* childFrameList() { return m_pChildFrameList; }
+ TQPtrList<KonqFrameBase>* 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<KonqFrameBase>* m_pChildFrameList;
+ TQPtrList<KonqFrameBase>* 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 <kdebug.h>
#include <kcursor.h>
#include <kurldrag.h>
-#include <qscrollview.h>
+#include <tqscrollview.h>
-#include <qapplication.h>
-#include <qmetaobject.h>
-#include <qobjectlist.h>
+#include <tqapplication.h>
+#include <tqmetaobject.h>
+#include <tqobjectlist.h>
#include <config.h>
#include <private/qucomextra_p.h>
#include <kmessagebox.h>
@@ -53,7 +53,7 @@
//#define DEBUG_HISTORY
-template class QPtrList<HistoryEntry>;
+template class TQPtrList<HistoryEntry>;
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( con