summaryrefslogtreecommitdiffstats
path: root/konqueror/sidebar
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:33:34 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:33:34 +0000
commitc663b6440964f6ac48027143ac9e63298991f9d0 (patch)
tree6d8b0c5a5f9db1ee16acf98b1397cea9126b281d /konqueror/sidebar
parenta061f7191beebb0e4a3b0c0a7c534ec5f22f2dc7 (diff)
downloadtdebase-c663b6440964f6ac48027143ac9e63298991f9d0.tar.gz
tdebase-c663b6440964f6ac48027143ac9e63298991f9d0.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'konqueror/sidebar')
-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
35 files changed, 931 insertions, 931 deletions
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index ae2880b13..bdc99a4ca 100644
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@@ -19,11 +19,11 @@
#include <konq_events.h>
#include <kdebug.h>
-#include <qapplication.h>
+#include <tqapplication.h>
#include <kaccelmanager.h>
-KonqSidebar::KonqSidebar( QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name, bool universalMode )
+KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name, bool universalMode )
: KParts::ReadOnlyPart(parent, name),KonqSidebarIface()
{
// we need an instance
@@ -32,11 +32,11 @@ KonqSidebar::KonqSidebar( QWidget *parentWidget, const char *widgetName,
// this should be your custom internal widget
m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() );
m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" );
- connect(m_widget,SIGNAL(started(KIO::Job *)),
- this, SIGNAL(started(KIO::Job*)));
- connect(m_widget,SIGNAL(completed()),this,SIGNAL(completed()));
- connect(m_extension, SIGNAL(addWebSideBar(const KURL&, const QString&)),
- m_widget, SLOT(addWebSideBar(const KURL&, const QString&)));
+ connect(m_widget,TQT_SIGNAL(started(KIO::Job *)),
+ this, TQT_SIGNAL(started(KIO::Job*)));
+ connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
+ connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)),
+ m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&)));
KAcceleratorManager::setNoAccel(m_widget);
setWidget(m_widget);
}
@@ -62,14 +62,14 @@ bool KonqSidebar::openURL(const KURL &url) {
else return false;
}
-void KonqSidebar::customEvent(QCustomEvent* ev)
+void KonqSidebar::customEvent(TQCustomEvent* ev)
{
if (KonqFileSelectionEvent::test(ev) ||
KonqFileMouseOverEvent::test(ev) ||
KonqConfigEvent::test(ev))
{
// Forward the event to the widget
- QApplication::sendEvent( m_widget, ev );
+ TQApplication::sendEvent( m_widget, ev );
}
}
@@ -97,15 +97,15 @@ KonqSidebarFactory::~KonqSidebarFactory()
s_about = 0L;
}
-KParts::Part* KonqSidebarFactory::createPartObject( QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name,
- const char * /*classname*/, const QStringList &args )
+KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name,
+ const char * /*classname*/, const TQStringList &args )
{
// Create an instance of our Part
KonqSidebar* obj = new KonqSidebar( parentWidget, widgetName, parent, name, args.contains("universal") );
// See if we are to be read-write or not
-// if (QCString(classname) == "KParts::ReadOnlyPart")
+// if (TQCString(classname) == "KParts::ReadOnlyPart")
// obj->setReadWrite(false);
return obj;
diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h
index 32a5f5679..cb321bf6d 100644
--- a/konqueror/sidebar/konqsidebar.h
+++ b/konqueror/sidebar/konqsidebar.h
@@ -21,7 +21,7 @@
#include <kparts/factory.h>
#include <kparts/event.h>
#include <kparts/browserextension.h>
-#include <qguardedptr.h>
+#include <tqguardedptr.h>
#include "sidebar_widget.h"
#include "konqsidebariface_p.h"
@@ -43,7 +43,7 @@ class KonqSidebarBrowserExtension : public KParts::BrowserExtension
~KonqSidebarBrowserExtension(){;}
protected:
- QGuardedPtr<Sidebar_Widget> widget;
+ TQGuardedPtr<Sidebar_Widget> widget;
// The following slots are needed for konqueror's standard actions
@@ -77,8 +77,8 @@ public:
/**
* Default constructor
*/
- KonqSidebar(QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name,bool universalMode);
+ KonqSidebar(TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name,bool universalMode);
/**
* Destructor
@@ -97,7 +97,7 @@ protected:
KonqSidebarBrowserExtension * m_extension;
virtual bool openFile();
- virtual void customEvent(QCustomEvent* ev);
+ virtual void customEvent(TQCustomEvent* ev);
private:
class Sidebar_Widget *m_widget;
@@ -113,9 +113,9 @@ class KonqSidebarFactory : public KParts::Factory
public:
KonqSidebarFactory();
virtual ~KonqSidebarFactory();
- virtual KParts::Part* createPartObject( QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name,
- const char *classname, const QStringList &args );
+ virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name,
+ const char *classname, const TQStringList &args );
static KInstance* instance();
private:
diff --git a/konqueror/sidebar/konqsidebarplugin.cpp b/konqueror/sidebar/konqsidebarplugin.cpp
index b2b7d9f17..75e762d35 100644
--- a/konqueror/sidebar/konqsidebarplugin.cpp
+++ b/konqueror/sidebar/konqsidebarplugin.cpp
@@ -22,9 +22,9 @@
#include <kdebug.h>
-KonqSidebarPlugin::KonqSidebarPlugin(KInstance *instance,QObject *parent,
- QWidget * /*widgetParent*/, QString &desktopName_, const char* name)
- : QObject(parent,name), desktopName(desktopName_)
+KonqSidebarPlugin::KonqSidebarPlugin(KInstance *instance,TQObject *parent,
+ TQWidget * /*widgetParent*/, TQString &desktopName_, const char* name)
+ : TQObject(parent,name), desktopName(desktopName_)
{
m_parentInstance=instance;
}
diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h
index ad931070f..d3ecf7ce4 100644
--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@@ -18,14 +18,14 @@
*/
#ifndef _konqsidebarplugin_h_
#define _konqsidebarplugin_h_
-#include <qwidget.h>
-#include <qobject.h>
+#include <tqwidget.h>
+#include <tqobject.h>
#include <kurl.h>
-#include <qstring.h>
+#include <tqstring.h>
#include <kparts/part.h>
#include <kparts/browserextension.h>
#include <kio/job.h>
-#include <qguardedptr.h>
+#include <tqguardedptr.h>
#include <kfileitem.h>
class KonqSidebarPluginPrivate;
@@ -34,16 +34,16 @@ class KDE_EXPORT KonqSidebarPlugin : public QObject
{
Q_OBJECT
public:
- KonqSidebarPlugin(KInstance *instance,QObject *parent,QWidget *widgetParent,QString &desktopName_, const char* name=0);
+ KonqSidebarPlugin(KInstance *instance,TQObject *parent,TQWidget *widgetParent,TQString &desktopName_, const char* name=0);
~KonqSidebarPlugin();
- virtual QWidget *getWidget()=0;
- virtual void *provides(const QString &)=0;
+ virtual TQWidget *getWidget()=0;
+ virtual void *provides(const TQString &)=0;
KInstance *parentInstance();
protected:
virtual void handleURL(const KURL &url)=0;
virtual void handlePreview(const KFileItemList & items);
virtual void handlePreviewOnMouseOver(const KFileItem &items); //not used yet, perhaps in KDE 3.1
- QString desktopName;
+ TQString desktopName;
KInstance* m_parentInstance;
private:
@@ -53,8 +53,8 @@ class KDE_EXPORT KonqSidebarPlugin : public QObject
void requestURL(KURL&);
void started(KIO::Job *);
void completed();
- void setIcon(const QString& icon);
- void setCaption(const QString& caption);
+ void setIcon(const TQString& icon);
+ void setCaption(const TQString& caption);
protected:
@@ -67,7 +67,7 @@ class KDE_EXPORT KonqSidebarPlugin : public QObject
void openPreviewOnMouseOver(const KFileItem& item); // not used yet, perhaps KDE 3.1
/*
if your plugin supports a setup dialog, instead (replaces the url menu entry in the popup) (not supported yet)
- void setup(QWidget *parent);
+ void setup(TQWidget *parent);
*/
@@ -79,16 +79,16 @@ class KDE_EXPORT KonqSidebarPlugin : public QObject
void enableAction( const char * name, bool enabled );
- void popupMenu( const QPoint &global, const KFileItemList &items );
- void popupMenu( KXMLGUIClient *client, const QPoint &global, const KFileItemList &items );
- void popupMenu( const QPoint &global, const KURL &url,
- const QString &mimeType, mode_t mode = (mode_t)-1 );
+ void popupMenu( const TQPoint &global, const KFileItemList &items );
+ void popupMenu( KXMLGUIClient *client, const TQPoint &global, const KFileItemList &items );
+ void popupMenu( const TQPoint &global, const KURL &url,
+ const TQString &mimeType, mode_t mode = (mode_t)-1 );
void popupMenu( KXMLGUIClient *client,
- const QPoint &global, const KURL &url,
- const QString &mimeType, mode_t mode = (mode_t)-1 );
+ const TQPoint &global, const KURL &url,
+ const TQString &mimeType, mode_t mode = (mode_t)-1 );
- void showError(QString &); //for later extension
- void showMessage(QString &); //for later extension
+ void showError(TQString &); //for later extension
+ void showMessage(TQString &); //for later extension
*/
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 3b402b25e..b4940e8e5 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -18,13 +18,13 @@
#include <limits.h>
-#include <qdir.h>
-#include <qpopupmenu.h>
-#include <qhbox.h>
-#include <qpushbutton.h>
-#include <qwhatsthis.h>
-#include <qlayout.h>
-#include <qstringlist.h>
+#include <tqdir.h>
+#include <tqpopupmenu.h>
+#include <tqhbox.h>
+#include <tqpushbutton.h>
+#include <tqwhatsthis.h>
+#include <tqlayout.h>
+#include <tqstringlist.h>
#include <klocale.h>
#include <ksimpleconfig.h>
@@ -49,17 +49,17 @@
#include "sidebar_widget.moc"
-addBackEnd::addBackEnd(QWidget *parent, class QPopupMenu *addmenu,
- bool universal, const QString &currentProfile,
+addBackEnd::addBackEnd(TQWidget *parent, class TQPopupMenu *addmenu,
+ bool universal, const TQString &currentProfile,
const char *name)
- : QObject(parent,name),
+ : TQObject(parent,name),
m_parent(parent)
{
m_universal=universal;
m_currentProfile = currentProfile;
menu = addmenu;
- connect(menu,SIGNAL(aboutToShow()),this,SLOT(aboutToShowAddMenu()));
- connect(menu,SIGNAL(activated(int)),this,SLOT(activatedAddMenu(int)));
+ connect(menu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(aboutToShowAddMenu()));
+ connect(menu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activatedAddMenu(int)));
}
void addBackEnd::aboutToShowAddMenu()
@@ -67,7 +67,7 @@ void addBackEnd::aboutToShowAddMenu()
if (!menu)
return;
KStandardDirs *dirs = KGlobal::dirs();
- QStringList list = dirs->findAllResources("data","konqsidebartng/add/*.desktop",true,true);
+ TQStringList list = dirs->findAllResources("data","konqsidebartng/add/*.desktop",true,true);
libNames.setAutoDelete(true);
libNames.resize(0);
libParam.setAutoDelete(true);
@@ -75,7 +75,7 @@ void addBackEnd::aboutToShowAddMenu()
menu->clear();
int i = 0;
- for (QStringList::Iterator it = list.begin(); it != list.end(); ++it, i++ )
+ for (TQStringList::Iterator it = list.begin(); it != list.end(); ++it, i++ )
{
KDesktopFile *confFile;
@@ -98,7 +98,7 @@ void addBackEnd::aboutToShowAddMenu()
continue;
}
}
- QString icon = confFile->readIcon();
+ TQString icon = confFile->readIcon();
if (!icon.isEmpty())
{
menu->insertItem(SmallIcon(icon),
@@ -107,9 +107,9 @@ void addBackEnd::aboutToShowAddMenu()
menu->insertItem(confFile->readEntry("Name"), i);
}
libNames.resize(libNames.size()+1);
- libNames.insert(libNames.count(), new QString(confFile->readEntry("X-KDE-KonqSidebarAddModule")));
+ libNames.insert(libNames.count(), new TQString(confFile->readEntry("X-KDE-KonqSidebarAddModule")));
libParam.resize(libParam.size()+1);
- libParam.insert(libParam.count(), new QString(confFile->readEntry("X-KDE-KonqSidebarAddParam")));
+ libParam.insert(libParam.count(), new TQString(confFile->readEntry("X-KDE-KonqSidebarAddParam")));
delete confFile;
}
menu->insertSeparator();
@@ -122,12 +122,12 @@ void addBackEnd::doRollBack()
if (KMessageBox::warningContinueCancel(m_parent, i18n("<qt>This removes all your entries from the sidebar and adds the system default ones.<BR><B>This procedure is irreversible</B><BR>Do you want to proceed?</qt>"))==KMessageBox::Continue)
{
KStandardDirs *dirs = KGlobal::dirs();
- QString loc=dirs->saveLocation("data","konqsidebartng/" + m_currentProfile + "/",true);
- QDir dir(loc);
- QStringList dirEntries = dir.entryList( QDir::Dirs | QDir::NoSymLinks );
+ TQString loc=dirs->saveLocation("data","konqsidebartng/" + m_currentProfile + "/",true);
+ TQDir dir(loc);
+ TQStringList dirEntries = dir.entryList( TQDir::Dirs | TQDir::NoSymLinks );
dirEntries.remove(".");
dirEntries.remove("..");
- for ( QStringList::Iterator it = dirEntries.begin(); it != dirEntries.end(); ++it ) {
+ for ( TQStringList::Iterator it = dirEntries.begin(); it != dirEntries.end(); ++it ) {
if ((*it)!="add")
KIO::NetAccess::del(KURL( loc+(*it) ), m_parent);
}
@@ -136,10 +136,10 @@ void addBackEnd::doRollBack()
}
-static QString findFileName(const QString* tmpl,bool universal, const QString &profile) {
- QString myFile, filename;
+static TQString findFileName(const TQString* tmpl,bool universal, const TQString &profile) {
+ TQString myFile, filename;
KStandardDirs *dirs = KGlobal::dirs();
- QString tmp = *tmpl;
+ TQString tmp = *tmpl;
if (universal) {
dirs->saveLocation("data", "konqsidebartng/kicker_entries/", true);
@@ -151,14 +151,14 @@ static QString findFileName(const QString* tmpl,bool universal, const QString &p
filename = tmp.arg("");
myFile = locateLocal("data", filename);
- if (QFile::exists(myFile)) {
+ if (TQFile::exists(myFile)) {
for (ulong l = 0; l < ULONG_MAX; l++) {
filename = tmp.arg(l);
myFile = locateLocal("data", filename);
- if (!QFile::exists(myFile)) {
+ if (!TQFile::exists(myFile)) {
break;
} else {
- myFile = QString::null;
+ myFile = TQString::null;
}
}
}
@@ -168,7 +168,7 @@ static QString findFileName(const QString* tmpl,bool universal, const QString &p
void addBackEnd::activatedAddMenu(int id)
{
- kdDebug() << "activatedAddMenu: " << QString("%1").arg(id) << endl;
+ kdDebug() << "activatedAddMenu: " << TQString("%1").arg(id) << endl;
if (((uint)id) == libNames.size())
doRollBack();
if(((uint)id) >= libNames.size())
@@ -177,32 +177,32 @@ void addBackEnd::activatedAddMenu(int id)
KLibLoader *loader = KLibLoader::self();
// try to load the library
- QString libname = *libNames.at(id);
- KLibrary *lib = loader->library(QFile::encodeName(libname));
+ TQString libname = *libNames.at(id);
+ KLibrary *lib = loader->library(TQFile::encodeName(libname));
if (lib)
{
// get the create_ function
- QString factory("add_");
+ TQString factory("add_");
factory = factory+(*libNames.at(id));
- void *add = lib->symbol(QFile::encodeName(factory));
+ void *add = lib->symbol(TQFile::encodeName(factory));
if (add)
{
//call the add function
- bool (*func)(QString*, QString*, QMap<QString,QString> *);
- QMap<QString,QString> map;
- func = (bool (*)(QString*, QString*, QMap<QString,QString> *)) add;
- QString *tmp = new QString("");
+ bool (*func)(TQString*, TQString*, TQMap<TQString,TQString> *);
+ TQMap<TQString,TQString> map;
+ func = (bool (*)(TQString*, TQString*, TQMap<TQString,TQString> *)) add;
+ TQString *tmp = new TQString("");
if (func(tmp,libParam.at(id),&map))
{
- QString myFile = findFileName(tmp,m_universal,m_currentProfile);
+ TQString myFile = findFileName(tmp,m_universal,m_currentProfile);
if (!myFile.isEmpty())
{
kdDebug() <<"trying to save to file: "<<myFile << endl;
KSimpleConfig scf(myFile,false);
scf.setGroup("Desktop Entry");
- for (QMap<QString,QString>::ConstIterator it = map.begin(); it != map.end(); ++it) {
+ for (TQMap<TQString,TQString>::ConstIterator it = map.begin(); it != map.end(); ++it) {
kdDebug() <<"writing:"<<it.key()<<" / "<<it.data()<<endl;
scf.writePathEntry(it.key(), it.data());
}
@@ -228,8 +228,8 @@ void addBackEnd::activatedAddMenu(int id)
/* Sidebar_Widget */
/**************************************************************/
-Sidebar_Widget::Sidebar_Widget(QWidget *parent, KParts::ReadOnlyPart *par, const char *name,bool universalMode, const QString &currentProfile)
- :QWidget(parent,name),m_universalMode(universalMode),m_partParent(par),m_currentProfile(currentProfile)
+Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, const char *name,bool universalMode, const TQString &currentProfile)
+ :TQWidget(parent,name),m_universalMode(universalMode),m_partParent(par),m_currentProfile(currentProfile)
{
m_somethingVisible = false;
m_initial = true;
@@ -251,19 +251,19 @@ Sidebar_Widget::Sidebar_Widget(QWidget *parent, KParts::ReadOnlyPart *par, const
m_buttons.setAutoDelete(true);
m_hasStoredUrl = false;
m_latestViewed = -1;
- setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
+ setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
- QSplitter *splitterWidget = splitter();
+ TQSplitter *splitterWidget = splitter();
if (splitterWidget) {
- splitterWidget->setResizeMode(parent, QSplitter::FollowSizeHint);
+ splitterWidget->setResizeMode(parent, TQSplitter::FollowSizeHint);
splitterWidget->setOpaqueResize( false );
- connect(splitterWidget,SIGNAL(setRubberbandCalled()),SLOT(userMovedSplitter()));
+ connect(splitterWidget,TQT_SIGNAL(setRubberbandCalled()),TQT_SLOT(userMovedSplitter()));
}
m_area = new KDockArea(this);
- m_area->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
+ m_area->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
m_mainDockWidget = m_area->createDockWidget("free", 0);
- m_mainDockWidget->setWidget(new QWidget(m_mainDockWidget));
+ m_mainDockWidget->setWidget(new TQWidget(m_mainDockWidget));
m_area->setMainDockWidget(m_mainDockWidget);
m_area->setMinimumWidth(0);
m_mainDockWidget->setDockSite(KDockWidget::DockTop);
@@ -272,8 +272,8 @@ Sidebar_Widget::Sidebar_Widget(QWidget *parent, KParts::ReadOnlyPart *par, const
m_buttonBar = new KMultiTabBar(KMultiTabBar::Vertical,this);
m_buttonBar->showActiveTabTexts(true);
- m_menu = new QPopupMenu(this, "Sidebar_Widget::Menu");
- QPopupMenu *addMenu = new QPopupMenu(this, "Sidebar_Widget::addPopup");
+ m_menu = new TQPopupMenu(this, "Sidebar_Widget::Menu");
+ TQPopupMenu *addMenu = new TQPopupMenu(this, "Sidebar_Widget::addPopup");
m_menu->insertItem(i18n("Add New"), addMenu, 0);
m_menu->insertItem(i18n("Multiple Views"), 1);
m_menu->insertItem(i18n("Show Tabs Left"), 2);
@@ -281,22 +281,22 @@ Sidebar_Widget::Sidebar_Widget(QWidget *parent, KParts::ReadOnlyPart *par, const
if (!m_universalMode) {
m_menu->insertItem(SmallIconSet("remove"),
i18n("Close Navigation Panel"),
- par, SLOT(deleteLater()));
+ par, TQT_SLOT(deleteLater()));
}
- connect(m_menu, SIGNAL(aboutToShow()),
- this, SLOT(aboutToShowConfigMenu()));
- connect(m_menu, SIGNAL(activated(int)),
- this, SLOT(activatedMenu(int)));
+ connect(m_menu, TQT_SIGNAL(aboutToShow()),
+ this, TQT_SLOT(aboutToShowConfigMenu()));
+ connect(m_menu, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(activatedMenu(int)));
m_buttonPopup = 0;
addBackEnd *ab = new addBackEnd(this, addMenu, universalMode,
currentProfile,
"Sidebar_Widget-addBackEnd");
- connect(ab, SIGNAL(updateNeeded()),
- this, SLOT(updateButtons()));
- connect(ab, SIGNAL(initialCopyNeeded()),
- this, SLOT(finishRollBack()));
+ connect(ab, TQT_SIGNAL(updateNeeded()),
+ this, TQT_SLOT(updateButtons()));
+ connect(ab, TQT_SIGNAL(initialCopyNeeded()),
+ this, TQT_SLOT(finishRollBack()));
initialCopy();
@@ -316,31 +316,31 @@ Sidebar_Widget::Sidebar_Widget(QWidget *parent, KParts::ReadOnlyPart *par, const
m_menu->setItemVisible(2, !m_immutableShowTabsLeft);
m_menu->setItemVisible(3, !m_immutableShowExtraButtons);
- connect(&m_configTimer, SIGNAL(timeout()),
- this, SLOT(saveConfig()));
+ connect(&m_configTimer, TQT_SIGNAL(timeout()),
+ this, TQT_SLOT(saveConfig()));
m_somethingVisible = !m_openViews.isEmpty();
doLayout();
- QTimer::singleShot(0,this,SLOT(createButtons()));
- connect(m_area, SIGNAL(dockWidgetHasUndocked(KDockWidget*)),
- this, SLOT(dockWidgetHasUndocked(KDockWidget*)));
+ TQTimer::singleShot(0,this,TQT_SLOT(createButtons()));
+ connect(m_area, TQT_SIGNAL(dockWidgetHasUndocked(KDockWidget*)),
+ this, TQT_SLOT(dockWidgetHasUndocked(KDockWidget*)));
}
-void Sidebar_Widget::addWebSideBar(const KURL& url, const QString& /*name*/) {
+void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
//kdDebug() << "Web sidebar entry to be added: " << url.url()
// << " [" << name << "]" << endl;
// Look for existing ones with this URL
KStandardDirs *dirs = KGlobal::dirs();
- QString list;
+ TQString list;
dirs->saveLocation("data", m_relPath, true);
list = locateLocal("data", m_relPath);
// Go through list to see which ones exist. Check them for the URL
- QStringList files = QDir(list).entryList("websidebarplugin*.desktop");
- for (QStringList::Iterator it = files.begin(); it != files.end(); ++it){
+ TQStringList files = TQDir(list).entryList("websidebarplugin*.desktop");
+ for (TQStringList::Iterator it = files.begin(); it != files.end(); ++it){
KSimpleConfig scf(list + *it, false);
scf.setGroup("Desktop Entry");
- if (scf.readPathEntry("URL", QString::null) == url.url()) {
+ if (scf.readPathEntry("URL", TQString::null) == url.url()) {
// We already have this one!
KMessageBox::information(this,
i18n("This entry already exists."));
@@ -348,8 +348,8 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const QString& /*name*/) {
}
}
- QString tmpl = "websidebarplugin%1.desktop";
- QString myFile = findFileName(&tmpl,m_universalMode,m_currentProfile);
+ TQString tmpl = "websidebarplugin%1.desktop";
+ TQString myFile = findFileName(&tmpl,m_universalMode,m_currentProfile);
if (!myFile.isEmpty()) {
KSimpleConfig scf(myFile, false);
@@ -362,7 +362,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const QString& /*name*/) {
scf.writeEntry("X-KDE-KonqSidebarModule", "konqsidebar_web");
scf.sync();
- QTimer::singleShot(0,this,SLOT(updateButtons()));
+ TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
}
}
@@ -371,7 +371,7 @@ void Sidebar_Widget::finishRollBack()
{
m_path = KGlobal::dirs()->saveLocation("data",m_relPath,true);
initialCopy();
- QTimer::singleShot(0,this,SLOT(updateButtons()));
+ TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
}
@@ -390,7 +390,7 @@ void Sidebar_Widget::doLayout()
if (m_layout)
delete m_layout;
- m_layout = new QHBoxLayout(this);
+ m_layout = new TQHBoxLayout(this);
if (m_showTabsLeft)
{
m_layout->add(m_buttonBar);
@@ -418,7 +418,7 @@ void Sidebar_Widget::aboutToShowConfigMenu()
void Sidebar_Widget::initialCopy()
{
kdDebug()<<"Initial copy"<<endl;
- QStringList dirtree_dirs;
+ TQStringList dirtree_dirs;
if (m_universalMode)
dirtree_dirs = KGlobal::dirs()->findDirs("data","konqsidebartng/kicker_entries/");
else
@@ -431,8 +431,8 @@ void Sidebar_Widget::initialCopy()
int lVersion=lcfg.readNumEntry("Version",0);
- for (QStringList::const_iterator ddit=dirtree_dirs.begin();ddit!=dirtree_dirs.end();++ddit) {
- QString dirtree_dir=*ddit;
+ for (TQStringList::const_iterator ddit=dirtree_dirs.begin();ddit!=dirtree_dirs.end();++ddit) {
+ TQString dirtree_dir=*ddit;
if (dirtree_dir == m_path) continue;
@@ -446,18 +446,18 @@ void Sidebar_Widget::initialCopy()
if (lVersion >= gversion)
continue;
- QDir dir(m_path);
- QStringList entries = dir.entryList( QDir::Files );
- QStringList dirEntries = dir.entryList( QDir::Dirs | QDir::NoSymLinks );
+ TQDir dir(m_path);
+ TQStringList entries = dir.entryList( TQDir::Files );
+ TQStringList dirEntries = dir.entryList( TQDir::Dirs | TQDir::NoSymLinks );
dirEntries.remove( "." );
dirEntries.remove( ".." );
- QDir globalDir( dirtree_dir );
+ TQDir globalDir( dirtree_dir );
Q_ASSERT( globalDir.isReadable() );
// Only copy the entries that don't exist yet in the local dir
- QStringList globalDirEntries = globalDir.entryList();
- QStringList::ConstIterator eIt = globalDirEntries.begin();
- QStringList::ConstIterator eEnd = globalDirEntries.end();
+ TQStringList globalDirEntries = globalDir.entryList();
+ TQStringList::ConstIterator eIt = globalDirEntries.begin();
+ TQStringList::ConstIterator eEnd = globalDirEntries.end();
for (; eIt != eEnd; ++eIt )
{
//kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl;
@@ -465,12 +465,12 @@ void Sidebar_Widget::initialCopy()
!entries.contains( *eIt ) &&
!dirEntries.contains( *eIt ) )
{ // we don't have that one yet -> copy it.
- QString cp("cp -R -- ");
+ TQString cp("cp -R -- ");
cp += KProcess::quote(dirtree_dir + *eIt);
cp += " ";
cp += KProcess::quote(m_path);
kdDebug() << "SidebarWidget::intialCopy executing " << cp << endl;
- ::system( QFile::encodeName(cp) );
+ ::system( TQFile::encodeName(cp) );
}
}
}
@@ -489,7 +489,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
{
KIconDialog kicd(this);
// kicd.setStrictIconSize(true);
- QString iconname=kicd.selectIcon(KIcon::Small);
+ TQString iconname=kicd.selectIcon(KIcon::Small);
kdDebug()<<"New Icon Name:"<<iconname<<endl;
if (!iconname.isEmpty())
{
@@ -497,7 +497,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
ksc.setGroup("Desktop Entry");
ksc.writeEntry("Icon",iconname);
ksc.sync();
- QTimer::singleShot(0,this,SLOT(updateButtons()));
+ TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
}
break;
}
@@ -515,12 +515,12 @@ void Sidebar_Widget::buttonPopupActivate(int id)
}
else
{
- QString newurl= dlg->selectedURL().prettyURL();
+ TQString newurl= dlg->selectedURL().prettyURL();
//If we are going to set the name by 'set name', we don't set it here.
//ksc.writeEntry("Name",newurl);
ksc.writePathEntry("URL",newurl);
ksc.sync();
- QTimer::singleShot(0,this,SLOT(updateButtons()));
+ TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
}
}
delete dlg;
@@ -529,12 +529,12 @@ void Sidebar_Widget::buttonPopupActivate(int id)
case 3:
{
if (KMessageBox::warningContinueCancel(this,i18n("<qt>Do you really want to remove the <b>%1</b> tab?</qt>").arg(m_currentButton->displayName),
- QString::null,KStdGuiItem::del())==KMessageBox::Continue)
+ TQString::null,KStdGuiItem::del())==KMessageBox::Continue)
{
- QFile f(m_path+m_currentButton->file);
+ TQFile f(m_path+m_currentButton->file);
if (!f.remove())
qDebug("Error, file not deleted");
- QTimer::singleShot(0,this,SLOT(updateButtons()));
+ TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
}
break;
}
@@ -543,7 +543,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
bool ok;
// Pop up the dialog asking the user for name.
- const QString name = KInputDialog::getText(i18n("Set Name"), i18n("Enter the name:"),
+ const TQString name = KInputDialog::getText(i18n("Set Name"), i18n("Enter the name:"),
m_currentButton->displayName, &ok, this);
if(ok)
@@ -554,8 +554,8 @@ void Sidebar_Widget::buttonPopupActivate(int id)
ksc.writeEntry("Name", name, true, false, true /*localized*/ );
ksc.sync();
- // Update the buttons with a QTimer (why?)
- QTimer::singleShot(0,this,SLOT(updateButtons()));
+ // Update the buttons with a TQTimer (why?)
+ TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
}
break;
}
@@ -720,9 +720,9 @@ void Sidebar_Widget::createButtons()
if (!m_path.isEmpty())
{
kdDebug()<<"m_path: "<<m_path<<endl;
- QDir dir(m_path);
- QStringList list=dir.entryList("*.desktop");
- for (QStringList::Iterator it=list.begin(); it!=list.end(); ++it)
+ TQDir dir(m_path);
+ TQStringList list=dir.entryList("*.desktop");
+ for (TQStringList::Iterator it=list.begin(); it!=list.end(); ++it)
{
addButton(*it);
}
@@ -790,7 +790,7 @@ bool Sidebar_Widget::openURL(const class KURL &url)
return ret;
}
-bool Sidebar_Widget::addButton(const QString &desktoppath,int pos)
+bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
{
int lastbtn = m_buttons.count();
m_buttons.resize(m_buttons.size()+1);
@@ -802,11 +802,11 @@ bool Sidebar_Widget::addButton(const QString &desktoppath,int pos)
confFile = new KSimpleConfig(m_path+desktoppath,true);
confFile->setGroup("Desktop Entry");
- QString icon = confFile->readEntry("Icon");
- QString name = confFile->readEntry("Name");
- QString comment = confFile->readEntry("Comment");
- QString url = confFile->readPathEntry("URL",QString::null);
- QString lib = confFile->readEntry("X-KDE-KonqSidebarModule");
+ TQString icon = confFile->readEntry("Icon");
+ TQString name = confFile->readEntry("Name");
+ TQString comment = confFile->readEntry("Comment");
+ TQString url = confFile->readPathEntry("URL",TQString::null);
+ TQString lib = confFile->readEntry("X-KDE-KonqSidebarModule");
delete confFile;
@@ -818,11 +818,11 @@ bool Sidebar_Widget::addButton(const QString &desktoppath,int pos)
/*int id=*/m_buttons.insert(lastbtn, bi);
KMultiTabBarTab *tab = m_buttonBar->tab(lastbtn);
tab->installEventFilter(this);
- connect(tab,SIGNAL(clicked(int)),this,SLOT(showHidePage(int)));
+ connect(tab,TQT_SIGNAL(clicked(int)),this,TQT_SLOT(showHidePage(int)));
// Set Whats This help
// This uses the comments in the .desktop files
- QWhatsThis::add(tab, comment);
+ TQWhatsThis::add(tab, comment);
}
return true;
@@ -830,10 +830,10 @@ bool Sidebar_Widget::addButton(const QString &desktoppath,int pos)
-bool Sidebar_Widget::eventFilter(QObject *obj, QEvent *ev)
+bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
{
- if (ev->type()==QEvent::MouseButtonPress && ((QMouseEvent *)ev)->button()==QMouseEvent::RightButton)
+ if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQMouseEvent::RightButton)
{
KMultiTabBarTab *bt=dynamic_cast<KMultiTabBarTab*>(obj);
if (bt)
@@ -862,14 +862,14 @@ bool Sidebar_Widget::eventFilter(QObject *obj, QEvent *ev)
m_buttonPopup->insertItem(SmallIconSet("editdelete"), i18n("Remove"),3);
m_buttonPopup->insertSeparator();
m_buttonPopup->insertItem(SmallIconSet("configure"), i18n("Configure Navigation Panel"), m_menu, 4);
- connect(m_buttonPopup, SIGNAL(activated(int)),
- this, SLOT(buttonPopupActivate(int)));
+ connect(m_buttonPopup, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(buttonPopupActivate(int)));
}
m_buttonPopup->setItemEnabled(2,!m_currentButton->URL.isEmpty());
m_buttonPopup->changeTitle(50,SmallIcon(m_currentButton->iconName),
m_currentButton->displayName);
if (!m_disableConfig)
- { m_buttonPopup->exec(QCursor::pos()); }
+ { m_buttonPopup->exec(TQCursor::pos()); }
}
return true;
@@ -878,33 +878,33 @@ bool Sidebar_Widget::eventFilter(QObject *obj, QEvent *ev)
return false;
}
-void Sidebar_Widget::mousePressEvent(QMouseEvent *ev)
+void Sidebar_Widget::mousePressEvent(TQMouseEvent *ev)
{
- if (ev->type()==QEvent::MouseButtonPress &&
- ((QMouseEvent *)ev)->button()==QMouseEvent::RightButton &&
+ if (ev->type()==TQEvent::MouseButtonPress &&
+ ((TQMouseEvent *)ev)->button()==TQMouseEvent::RightButton &&
!m_disableConfig)
- { m_menu->exec(QCursor::pos()); }
+ { m_menu->exec(TQCursor::pos()); }
}
-KonqSidebarPlugin *Sidebar_Widget::loadModule(QWidget *par,QString &desktopName,QString lib_name,ButtonInfo* bi)
+KonqSidebarPlugin *Sidebar_Widget::loadModule(TQWidget *par,TQString &desktopName,TQString lib_name,ButtonInfo* bi)
{
KLibLoader *loader = KLibLoader::self();
// try to load the library
- KLibrary *lib = loader->library(QFile::encodeName(lib_name));
+ KLibrary *lib = loader->library(TQFile::encodeName(lib_name));
if (lib)
{
// get the create_ function
- QString factory("create_%1");
- void *create = lib->symbol(QFile::encodeName(factory.arg(lib_name)));
+ TQString factory("create_%1");
+ void *create = lib->symbol(TQFile::encodeName(factory.arg(lib_name)));
if (create)
{
// create the module
- KonqSidebarPlugin* (*func)(KInstance*,QObject *, QWidget*, QString&, const char *);
- func = (KonqSidebarPlugin* (*)(KInstance*,QObject *, QWidget *, QString&, const char *)) create;
- QString fullPath(m_path+desktopName);
+ KonqSidebarPlugin* (*func)(KInstance*,TQObject *, TQWidget*, TQString&, const char *);
+ func = (KonqSidebarPlugin* (*)(KInstance*,TQObject *, TQWidget *, TQString&, const char *)) create;
+ TQString fullPath(m_path+desktopName);
return (KonqSidebarPlugin*)func(getInstance(),bi,par,fullPath,0);
}
} else {
@@ -939,11 +939,11 @@ bool Sidebar_Widget::createView( ButtonInfo *data)
KDockWidget::DockBottom/*|KDockWidget::DockDesktop*/);
data->dock->setDockSite(KDockWidget::DockTop|KDockWidget::DockBottom);
connectModule(data->module);
- connect(this, SIGNAL(fileSelection(const KFileItemList&)),
- data->module, SLOT(openPreview(const KFileItemList&)));
+ connect(this, TQT_SIGNAL(fileSelection(const KFileItemList&)),
+ data->module, TQT_SLOT(openPreview(const KFileItemList&)));
- connect(this, SIGNAL(fileMouseOver(const KFileItem&)),
- data->module, SLOT(openPreviewOnMouseOver(const KFileItem&)));
+ connect(this, TQT_SIGNAL(fileMouseOver(const KFileItem&)),
+ data->module, TQT_SLOT(openPreviewOnMouseOver(const KFileItem&)));
}
delete confFile;
@@ -976,14 +976,14 @@ void Sidebar_Widget::showHidePage(int page)
m_buttonBar->setTab(page,true);
connect(info->module,
- SIGNAL(setIcon(const QString&)),
+ TQT_SIGNAL(setIcon(const TQString&)),
m_buttonBar->tab(page),
- SLOT(setIcon(const QString&)));
+ TQT_SLOT(setIcon(const TQString&)));
connect(info->module,
- SIGNAL(setCaption(const QString&)),
+ TQT_SIGNAL(setCaption(const TQString&)),
m_buttonBar->tab(page),
- SLOT(setText(const QString&)));
+ TQT_SLOT(setText(const TQString&)));
if (m_singleWidgetMode)
{
@@ -1059,10 +1059,10 @@ void Sidebar_Widget::collapseExpandSidebar()
}
}
-QSize Sidebar_Widget::sizeHint() const
+TQSize Sidebar_Widget::sizeHint() const
{
if (m_somethingVisible)
- return QSize(m_savedWidth,200);
+ return TQSize(m_savedWidth,200);
return minimumSizeHint();
}
@@ -1089,17 +1089,17 @@ KInstance *Sidebar_Widget::getInstance()
}
void Sidebar_Widget::submitFormRequest(const char *action,
- const QString& url,
- const QByteArray& formData,
- const QString& /*target*/,
- const QString& contentType,
- const QString& /*boundary*/ )
+ const TQString& url,
+ const TQByteArray& formData,
+ const TQString& /*target*/,
+ const TQString& contentType,
+ const TQString& /*boundary*/ )
{
KParts::URLArgs args;
args.setContentType("Content-Type: " + contentType);
args.postData = formData;
- args.setDoPost(QCString(action).lower() == "post");
+ args.setDoPost(TQCString(action).lower() == "post");
// boundary?
emit getExtension()->openURLRequest(KURL( url ), args);
}
@@ -1127,7 +1127,7 @@ void Sidebar_Widget::enableAction( const char * name, bool enabled )
ButtonInfo *btninfo = static_cast<ButtonInfo*>(sender()->parent());
if (btninfo)
{
- QString n(name);
+ TQString n(name);
if (n == "copy")
btninfo->copy = enabled;
else if (n == "cut")
@@ -1164,82 +1164,82 @@ bool Sidebar_Widget::doEnableActions()
}
-void Sidebar_Widget::popupMenu( const QPoint &global, const KFileItemList &items )
+void Sidebar_Widget::popupMenu( const TQPoint &global, const KFileItemList &items )
{
if (doEnableActions())
getExtension()->popupMenu(global,items);
}
-void Sidebar_Widget::popupMenu( KXMLGUIClient *client, const QPoint &global, const KFileItemList &items )
+void Sidebar_Widget::popupMenu( KXMLGUIClient *client, const TQPoint &global, const KFileItemList &items )
{
if (doEnableActions())
getExtension()->popupMenu(client,global,items);
}
-void Sidebar_Widget::popupMenu( const QPoint &global, const KURL &url,
- const QString &mimeType, mode_t mode)
+void Sidebar_Widget::popupMenu( const TQPoint &global, const KURL &url,
+ const TQString &mimeType, mode_t mode)
{
if (doEnableActions())
getExtension()->popupMenu(global,url,mimeType,mode);
}
void Sidebar_Widget::popupMenu( KXMLGUIClient *client,
- const QPoint &global, const KURL &url,
- const QString &mimeType, mode_t mode )
+ const TQPoint &global, const KURL &url,
+ const TQString &mimeType, mode_t mode )
{
if (doEnableActions())
getExtension()->popupMenu(client,global,url,mimeType,mode);
}
-void Sidebar_Widget::connectModule(QObject *mod)
+void Sidebar_Widget::connectModule(TQObject *mod)
{
if (mod->metaObject()->findSignal("started(KIO::Job*)") != -1) {
- connect(mod,SIGNAL(started(KIO::Job *)),this, SIGNAL(started(KIO::Job*)));
+ connect(mod,TQT_SIGNAL(started(KIO::Job *)),this, TQT_SIGNAL(started(KIO::Job*)));
}
if (mod->metaObject()->findSignal("completed()") != -1) {
- connect(mod,SIGNAL(completed()),this,SIGNAL(completed()));
+ connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
}
- if (mod->metaObject()->findSignal("popupMenu(const QPoint&,const KURL&,const QString&,mode_t)") != -1) {
- connect(mod,SIGNAL(popupMenu( const QPoint &, const KURL &,
- const QString &, mode_t)),this,SLOT(popupMenu( const
- QPoint &, const KURL&, const QString &, mode_t)));
+ if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) {
+ connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &,
+ const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const
+ TQPoint &, const KURL&, const TQString &, mode_t)));
}
- if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const QPoint&,const KURL&,const QString&,mode_t)") != -1) {
- connect(mod,SIGNAL(popupMenu( KXMLGUIClient *, const QPoint &,
- const KURL &,const QString &, mode_t)),this,
- SLOT(popupMenu( KXMLGUIClient *, const QPoint &,
- const KURL &,const QString &, mode_t)));
+ if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) {
+ connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &,
+ const KURL &,const TQString &, mode_t)),this,
+ TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &,
+ const KURL &,const TQString &, mode_t)));
}
- if (mod->metaObject()->findSignal("popupMenu(const QPoint&,const KFileItemList&)") != -1) {
- connect(mod,SIGNAL(popupMenu( const QPoint &, const KFileItemList & )),
- this,SLOT(popupMenu( const QPoint &, const KFileItemList & )));
+ if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) {
+ connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
+ this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & )));
}
if (mod->metaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) {
- connect(mod,SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
- this,SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
+ connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
+ this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
}
- if (mod->metaObject()->findSignal("submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)") != -1) {
+ if (mod->metaObject()->findSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) {
connect(mod,
- SIGNAL(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)),
+ TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
this,
- SLOT(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)));
+ TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
}
if (mod->metaObject()->findSignal("enableAction(const char*,bool)") != -1) {
- connect(mod,SIGNAL(enableAction( const char *, bool)),
- this,SLOT(enableAction(const char *, bool)));
+ connect(mod,TQT_SIGNAL(enableAction( const char *, bool)),
+ this,TQT_SLOT(enableAction(const char *, bool)));
}
if (mod->metaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) {
- connect(mod,SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
- this,SLOT(createNewWindow( const KURL &, const KParts::URLArgs &)));
+ connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
+ this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &)));
}
}
@@ -1260,29 +1260,29 @@ Sidebar_Widget::~Sidebar_Widget()
}
}
-void Sidebar_Widget::customEvent(QCustomEvent* ev)
+void Sidebar_Widget::customEvent(TQCustomEvent* ev)
{
if (KonqFileSelectionEvent::test(ev))
{
emit fileSelection(static_cast<KonqFileSelectionEvent*>(ev)->selection());
} else if (KonqFileMouseOverEvent::test(ev)) {
if (!(static_cast<KonqFileMouseOverEvent*>(ev)->item())) {
- emit fileMouseOver(KFileItem(KURL(),QString::null,KFileItem::Unknown));
+ emit fileMouseOver(KFileItem(KURL(),TQString::null,KFileItem::Unknown));
} else {
emit fileMouseOver(*static_cast<KonqFileMouseOverEvent*>(ev)->item());
}
}
}
-void Sidebar_Widget::resizeEvent(QResizeEvent* ev)
+void Sidebar_Widget::resizeEvent(TQResizeEvent* ev)
{
if (m_somethingVisible && m_userMovedSplitter)
{
int newWidth = width();
- QSplitter *split = splitter();
+ TQSplitter *split = splitter();
if (split && (m_savedWidth != newWidth))
{
- QValueList<int> sizes = split->sizes();
+ TQValueList<int> sizes = split->sizes();
if ((sizes.count() >= 2) && (sizes[1]))
{
m_savedWidth = newWidth;
@@ -1292,16 +1292,16 @@ void Sidebar_Widget::resizeEvent(QResizeEvent* ev)
}
}
m_userMovedSplitter = false;
- QWidget::resizeEvent(ev);
+ TQWidget::resizeEvent(ev);
}
-QSplitter *Sidebar_Widget::splitter() const
+TQSplitter *Sidebar_Widget::splitter() const
{
if (m_universalMode) return 0;
- QObject *p = parent();
+ TQObject *p = parent();
if (!p) return 0;
p = p->parent();
- return static_cast<QSplitter*>(p);
+ return static_cast<TQSplitter*>(p);
}
void Sidebar_Widget::userMovedSplitter()
diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h
index ccaba5224..d30fe3d65 100644
--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@@ -17,10 +17,10 @@
#ifndef _SIDEBAR_WIDGET_
#define _SIDEBAR_WIDGET_
-#include <qptrvector.h>
-#include <qtimer.h>
-#include <qstring.h>
-#include <qguardedptr.h>
+#include <tqptrvector.h>
+#include <tqtimer.h>
+#include <tqstring.h>
+#include <tqguardedptr.h>
#include <kdockwidget.h>
#include <kurl.h>
@@ -36,15 +36,15 @@ class QHBoxLayout;
class QSplitter;
class QStringList;
-class ButtonInfo: public QObject, public KonqSidebarIface
+class ButtonInfo: public TQObject, public KonqSidebarIface
{
Q_OBJECT
public:
- ButtonInfo(const QString& file_, class KonqSidebarIface *part, class KDockWidget *dock_,
- const QString &url_,const QString &lib,
- const QString &dispName_, const QString &iconName_,
- QObject *parent)
- : QObject(parent), file(file_), dock(dock_), URL(url_),
+ ButtonInfo(const TQString& file_, class KonqSidebarIface *part, class KDockWidget *dock_,
+ const TQString &url_,const TQString &lib,
+ const TQString &dispName_, const TQString &iconName_,
+ TQObject *parent)
+ : TQObject(parent), file(file_), dock(dock_), URL(url_),
libName(lib), displayName(dispName_), iconName(iconName_), m_part(part)
{
copy = cut = paste = trash = del = rename =false;
@@ -52,13 +52,13 @@ public:
~ButtonInfo() {}
- QString file;
+ TQString file;
KDockWidget *dock;
KonqSidebarPlugin *module;
- QString URL;
- QString libName;
- QString displayName;
- QString iconName;
+ TQString URL;
+ TQString libName;
+ TQString displayName;
+ TQString iconName;
bool copy;
bool cut;
bool paste;
@@ -74,8 +74,8 @@ class addBackEnd: public QObject
{
Q_OBJECT
public:
- addBackEnd(QWidget *parent,class QPopupMenu *addmenu, bool universal,
- const QString &currentProfile, const char *name=0);
+ addBackEnd(TQWidget *parent,class TQPopupMenu *addmenu, bool universal,
+ const TQString &currentProfile, const char *name=0);
~addBackEnd(){;}
protected slots:
void aboutToShowAddMenu();
@@ -84,13 +84,13 @@ signals:
void updateNeeded();
void initialCopyNeeded();
private:
- QGuardedPtr<class QPopupMenu> menu;
- QPtrVector<QString> libNames;
- QPtrVector<QString> libParam;
+ TQGuardedPtr<class TQPopupMenu> menu;
+ TQPtrVector<TQString> libNames;
+ TQPtrVector<TQString> libParam;
bool m_universal;
- QString m_currentProfile;
+ TQString m_currentProfile;
void doRollBack();
- QWidget *m_parent;
+ TQWidget *m_parent;
};
class KDE_EXPORT Sidebar_Widget: public QWidget
@@ -99,24 +99,24 @@ class KDE_EXPORT Sidebar_Widget: public QWidget
public:
friend class ButtonInfo;
public:
- Sidebar_Widget(QWidget *parent, KParts::ReadOnlyPart *par,
+ Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par,
const char * name,bool universalMode,
- const QString &currentProfile);
+ const TQString &currentProfile);
~Sidebar_Widget();
bool openURL(const class KURL &url);
void stdAction(const char *handlestd);
//virtual KParts::ReadOnlyPart *getPart();
KParts::BrowserExtension *getExtension();
- virtual QSize sizeHint() const;
+ virtual TQSize sizeHint() const;
public slots:
- void addWebSideBar(const KURL& url, const QString& name);
+ void addWebSideBar(const KURL& url, const TQString& name);
protected:
- void customEvent(QCustomEvent* ev);
- void resizeEvent(QResizeEvent* ev);
- virtual bool eventFilter(QObject*,QEvent*);
- virtual void mousePressEvent(QMouseEvent*);
+ void customEvent(TQCustomEvent* ev);
+ void resizeEvent(TQResizeEvent* ev);
+ virtual bool eventFilter(TQObject*,TQEvent*);
+ virtual void mousePressEvent(TQMouseEvent*);
protected slots:
void showHidePage(int value);
@@ -138,8 +138,8 @@ signals:
public:
/* interface KonqSidebar_PluginInterface*/
KInstance *getInstance();
-// virtual void showError(QString &); for later extension
-// virtual void showMessage(QString &); for later extension
+// virtual void showError(TQString &); for later extension
+// virtual void showMessage(TQString &); for later extension
/* end of interface implementation */
@@ -150,30 +150,30 @@ public slots:
* @since 3.2
* ### KDE4 remove me
*/
- void submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&);
+ void submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&);
void createNewWindow( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() );
void createNewWindow( const KURL &url, const KParts::URLArgs &args,
const KParts::WindowArgs &windowArgs, KParts::ReadOnlyPart *&part );
- void popupMenu( const QPoint &global, const KFileItemList &items );
- void popupMenu( KXMLGUIClient *client, const QPoint &global, const KFileItemList &items );
- void popupMenu( const QPoint &global, const KURL &url,
- const QString &mimeType, mode_t mode = (mode_t)-1 );
+ void popupMenu( const TQPoint &global, const KFileItemList &items );
+ void popupMenu( KXMLGUIClient *client, const TQPoint &global, const KFileItemList &items );
+ void popupMenu( const TQPoint &global, const KURL &url,
+ const TQString &mimeType, mode_t mode = (mode_t)-1 );
void popupMenu( KXMLGUIClient *client,
- const QPoint &global, const KURL &url,
- const QString &mimeType, mode_t mode = (mode_t)-1 );
+ const TQPoint &global, const KURL &url,
+ const TQString &mimeType, mode_t mode = (mode_t)-1 );
void enableAction( const char * name, bool enabled );
void userMovedSplitter();
private:
- QSplitter *splitter() const;
- bool addButton(const QString &desktoppath,int pos=-1);
+ TQSplitter *splitter() const;
+ bool addButton(const TQString &desktoppath,int pos=-1);
bool createView(ButtonInfo *data);
- KonqSidebarPlugin *loadModule(QWidget *par,QString &desktopName,QString lib_name,ButtonInfo *bi);
+ KonqSidebarPlugin *loadModule(TQWidget *par,TQString &desktopName,TQString lib_name,ButtonInfo *bi);
void readConfig();
void initialCopy();
void doLayout();
- void connectModule(QObject *mod);
+ void connectModule(TQObject *mod);
void collapseExpandSidebar();
bool doEnableActions();
bool m_universalMode;
@@ -184,15 +184,15 @@ private:
KDockWidget *m_mainDockWidget;
KMultiTabBar *m_buttonBar;
- QPtrVector<ButtonInfo> m_buttons;
- QHBoxLayout *m_layout;
+ TQPtrVector<ButtonInfo> m_buttons;
+ TQHBoxLayout *m_layout;
KPopupMenu *m_buttonPopup;
- QPopupMenu *m_menu;
- QGuardedPtr<ButtonInfo> m_activeModule;
- QGuardedPtr<ButtonInfo> m_currentButton;
+ TQPopupMenu *m_menu;
+ TQGuardedPtr<ButtonInfo> m_activeModule;
+ TQGuardedPtr<ButtonInfo> m_currentButton;
KConfig *m_config;
- QTimer m_configTimer;
+ TQTimer m_configTimer;
KURL m_storedUrl;
int m_savedWidth;
@@ -212,11 +212,11 @@ private:
bool m_noUpdate;
bool m_initial;
- QString m_path;
- QString m_relPath;
- QString m_currentProfile;
- QStringList m_visibleViews; // The views that are actually open
- QStringList m_openViews; // The views that should be opened
+ TQString m_path;
+ TQString m_relPath;
+ TQString m_currentProfile;
+ TQStringList m_visibleViews; // The views that are actually open
+ TQStringList m_openViews; // The views that should be opened
signals:
void panelHasBeenExpanded(bool);
diff --git a/konqueror/sidebar/test/konqsidebartest.cpp b/konqueror/sidebar/test/konqsidebartest.cpp
index 56dfff2fe..a790ee7e1 100644
--- a/konqueror/sidebar/test/konqsidebartest.cpp
+++ b/konqueror/sidebar/test/konqsidebartest.cpp
@@ -19,7 +19,7 @@
extern "C"
{
- KDE_EXPORT void* create_konq_sidebartest(KInstance *instance,QObject *par,QWidget *widp,QString &desktopname,const char *name)
+ KDE_EXPORT void* create_konq_sidebartest(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
{
return new SidebarTest(instance,par,widp,desktopname,name);
}
diff --git a/konqueror/sidebar/test/konqsidebartest.h b/konqueror/sidebar/test/konqsidebartest.h
index 0c304e949..5c36080fd 100644
--- a/konqueror/sidebar/test/konqsidebartest.h
+++ b/konqueror/sidebar/test/konqsidebartest.h
@@ -17,23 +17,23 @@
#ifndef _konq_sidebar_test_h_
#define _konq_sidebar_test_h_
#include <konqsidebarplugin.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
class SidebarTest : public KonqSidebarPlugin
{
Q_OBJECT
public:
- SidebarTest(KInstance *inst,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name=0):
+ SidebarTest(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0):
KonqSidebarPlugin(inst,parent,widgetParent,desktopName_,name)
{
- widget=new QLabel("Init Value",widgetParent);
+ widget=new TQLabel("Init Value",widgetParent);
}
~SidebarTest(){;}
- virtual QWidget *getWidget(){return widget;}
- virtual void *provides(const QString &) {return 0;}
+ virtual TQWidget *getWidget(){return widget;}
+ virtual void *provides(const TQString &) {return 0;}
protected:
- QLabel *widget;
+ TQLabel *widget;
virtual void handleURL(const KURL &url)
{
widget->setText(url.url());
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_item.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_item.cpp
index c0fae56cc..0bfe4ea67 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_item.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_item.cpp
@@ -33,7 +33,7 @@ KonqSidebarBookmarkItem::KonqSidebarBookmarkItem( KonqSidebarTreeItem *parentIte
setPixmap( 0, SmallIcon(bk.icon()) );
}
-QDragObject * KonqSidebarBookmarkItem::dragObject( QWidget * parent, bool )
+TQDragObject * KonqSidebarBookmarkItem::dragObject( TQWidget * parent, bool )
{
KBookmarkDrag * drag = KBookmarkDrag::newDrag( m_bk, parent );
// TODO honour bool move ?
@@ -60,7 +60,7 @@ KURL KonqSidebarBookmarkItem::externalURL() const
return m_bk.isGroup() ? KURL() : m_bk.url();
}
-QString KonqSidebarBookmarkItem::toolTipText() const
+TQString KonqSidebarBookmarkItem::toolTipText() const
{
return m_bk.url().prettyURL();
}
@@ -70,9 +70,9 @@ void KonqSidebarBookmarkItem::itemSelected()
tree()->enableActions( false, false, false, false, false, false );
}
-QString KonqSidebarBookmarkItem::key( int /*column*/, bool /*ascending*/ ) const
+TQString KonqSidebarBookmarkItem::key( int /*column*/, bool /*ascending*/ ) const
{
- return QString::number(m_key).rightJustify( 5, '0' );
+ return TQString::number(m_key).rightJustify( 5, '0' );
}
KBookmark &KonqSidebarBookmarkItem::bookmark()
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_item.h b/konqueror/sidebar/trees/bookmark_module/bookmark_item.h
index 5ffe953e8..0cffd52ea 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_item.h
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_item.h
@@ -34,7 +34,7 @@ public:
virtual ~KonqSidebarBookmarkItem() {}
// Create a drag object from this item.
- virtual QDragObject * dragObject( QWidget * parent, bool move = false );
+ virtual TQDragObject * dragObject( TQWidget * parent, bool move = false );
virtual void middleButtonClicked();
virtual void rightButtonPressed();
@@ -45,12 +45,12 @@ public:
virtual KURL externalURL() const;
// overwrite this if you want a tooltip shown on your item
- virtual QString toolTipText() const;
+ virtual TQString toolTipText() const;
// Called when this item is selected
virtual void itemSelected();
- virtual QString key( int column, bool /*ascending*/ ) const;
+ virtual TQString key( int column, bool /*ascending*/ ) const;
virtual KBookmark &bookmark();
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index a931ac526..81b32923f 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -16,9 +16,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <qclipboard.h>
-#include <qcursor.h>
-#include <qpopupmenu.h>
+#include <tqclipboard.h>
+#include <tqcursor.h>
+#include <tqpopupmenu.h>
#include <kaction.h>
#include <kactioncollection.h>
@@ -37,47 +37,47 @@
#include <kdebug.h>
KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTree )
- : QObject( 0L ), KonqSidebarTreeModule( parentTree ),
+ : TQObject( 0L ), KonqSidebarTreeModule( parentTree ),
m_topLevelItem( 0L ), m_ignoreOpenChange(true)
{
// formats handled by KBookmarkDrag:
- QStringList formats;
+ TQStringList formats;
formats << "text/uri-list" << "application/x-xbel" << "text/plain";
tree()->setDropFormats(formats);
- connect(tree(), SIGNAL(moved(QListViewItem*,QListViewItem*,QListViewItem*)),
- this, SLOT(slotMoved(QListViewItem*,QListViewItem*,QListViewItem*)));
- connect(tree(), SIGNAL(dropped(KListView*,QDropEvent*,QListViewItem*,QListViewItem*)),
- this, SLOT(slotDropped(KListView*,QDropEvent*,QListViewItem*,QListViewItem*)));
+ connect(tree(), TQT_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)),
+ this, TQT_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*)));
+ connect(tree(), TQT_SIGNAL(dropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)),
+ this, TQT_SLOT(slotDropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)));
- connect(tree(), SIGNAL(expanded(QListViewItem*)),
- this, SLOT(slotOpenChange(QListViewItem*)));
- connect(tree(), SIGNAL(collapsed(QListViewItem*)),
- this, SLOT(slotOpenChange(QListViewItem*)));
+ connect(tree(), TQT_SIGNAL(expanded(TQListViewItem*)),
+ this, TQT_SLOT(slotOpenChange(TQListViewItem*)));
+ connect(tree(), TQT_SIGNAL(collapsed(TQListViewItem*)),
+ this, TQT_SLOT(slotOpenChange(TQListViewItem*)));
m_collection = new KActionCollection( this, "bookmark actions" );
(void) new KAction( i18n("&Create New Folder"), "folder_new", 0, this,
- SLOT( slotCreateFolder() ), m_collection, "create_folder");
+ TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
(void) new KAction( i18n("Delete Folder"), "editdelete", 0, this,
- SLOT( slotDelete() ), m_collection, "delete_folder");
+ TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
(void) new KAction( i18n("Delete Bookmark"), "editdelete", 0, this,
- SLOT( slotDelete() ), m_collection, "delete_bookmark");
+ TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark");
(void) new KAction( i18n("Properties"), "edit", 0, this,
- SLOT( slotProperties() ), m_collection, "item_properties");
+ TQT_SLOT( slotProperties() ), m_collection, "item_properties");
(void) new KAction( i18n("Open in New Window"), "window_new", 0, this,
- SLOT( slotOpenNewWindow() ), m_collection, "open_window");
+ TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
(void) new KAction( i18n("Open in New Tab"), "tab_new", 0, this,
- SLOT( slotOpenTab() ), m_collection, "open_tab");
+ TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
(void) new KAction( i18n("Open Folder in Tabs"), "tab_new", 0, this,
- SLOT( slotOpenTab() ), m_collection, "folder_open_tabs");
+ TQT_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs");
(void) new KAction( i18n("Copy Link Address"), "editcopy", 0, this,
- SLOT( slotCopyLocation() ), m_collection, "copy_location");
+ TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
- KStdAction::editBookmarks( KonqBookmarkManager::self(), SLOT( slotEditBookmarks() ),
+ KStdAction::editBookmarks( KonqBookmarkManager::self(), TQT_SLOT( slotEditBookmarks() ),
m_collection, "edit_bookmarks" );
- connect( KonqBookmarkManager::self(), SIGNAL(changed(const QString &, const QString &) ),
- SLOT( slotBookmarksChanged(const QString &) ) );
+ connect( KonqBookmarkManager::self(), TQT_SIGNAL(changed(const TQString &, const TQString &) ),
+ TQT_SLOT( slotBookmarksChanged(const TQString &) ) );
}
KonqSidebarBookmarkModule::~KonqSidebarBookmarkModule()
@@ -94,9 +94,9 @@ void KonqSidebarBookmarkModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * i
m_ignoreOpenChange = false;
}
-bool KonqSidebarBookmarkModule::handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const QPoint& )
+bool KonqSidebarBookmarkModule::handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const TQPoint& )
{
- QPopupMenu *menu = new QPopupMenu;
+ TQPopupMenu *menu = new QPopupMenu;
if (tree()->tabSupport()) {
m_collection->action("folder_open_tabs")->plug(menu);
@@ -107,7 +107,7 @@ bool KonqSidebarBookmarkModule::handleTopLevelContextMenu( KonqSidebarTreeTopLev
menu->insertSeparator();
m_collection->action("edit_bookmarks")->plug(menu);
- menu->exec( QCursor::pos() );
+ menu->exec( TQCursor::pos() );
delete menu;
return true;
@@ -120,7 +120,7 @@ void KonqSidebarBookmarkModule::showPopupMenu()
return;
bool tabSupported = tree()->tabSupport();
- QPopupMenu *menu = new QPopupMenu;
+ TQPopupMenu *menu = new QPopupMenu;
if (bi->bookmark().isGroup()) {
if (tabSupported) {
@@ -141,11 +141,11 @@ void KonqSidebarBookmarkModule::showPopupMenu()
menu->insertSeparator();
m_collection->action("item_properties")->plug(menu);
- menu->exec( QCursor::pos() );
+ menu->exec( TQCursor::pos() );
delete menu;
}
-void KonqSidebarBookmarkModule::slotMoved(QListViewItem *i, QListViewItem*, QListViewItem *after)
+void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQListViewItem *after)
{
KonqSidebarBookmarkItem *item = dynamic_cast<KonqSidebarBookmarkItem*>( i );
if (!item)
@@ -159,7 +159,7 @@ void KonqSidebarBookmarkModule::slotMoved(QListViewItem *i, QListViewItem*, QLis
KBookmarkGroup oldParentGroup = bookmark.parentGroup();
KBookmarkGroup parentGroup;
- // try to get the parent group (assume that the QListViewItem has been reparented by KListView)...
+ // try to get the parent group (assume that the TQListViewItem has been reparented by KListView)...
// if anything goes wrong, use the root.
if (item->parent()) {
bool error = false;
@@ -191,20 +191,20 @@ void KonqSidebarBookmarkModule::slotMoved(QListViewItem *i, QListViewItem*, QLis
// inform others about the changed groups. quite expensive, so do
// our best to update them in only one emitChanged call.
- QString oldAddress = oldParentGroup.address();
- QString newAddress = parentGroup.address();
+ TQString oldAddress = oldParentGroup.address();
+ TQString newAddress = parentGroup.address();
if (oldAddress == newAddress) {
KonqBookmarkManager::self()->emitChanged( parentGroup );
} else {
int i = 0;
while (true) {
- QChar c1 = oldAddress[i];
- QChar c2 = newAddress[i];
- if (c1 == QChar::null) {
+ TQChar c1 = oldAddress[i];
+ TQChar c2 = newAddress[i];
+ if (c1 == TQChar::null) {
// oldParentGroup is probably parent of parentGroup.
KonqBookmarkManager::self()->emitChanged( oldParentGroup );
break;
- } else if (c2 == QChar::null) {
+ } else if (c2 == TQChar::null) {
// parentGroup is probably parent of oldParentGroup.
KonqBookmarkManager::self()->emitChanged( parentGroup );
break;
@@ -223,7 +223,7 @@ void KonqSidebarBookmarkModule::slotMoved(QListViewItem *i, QListViewItem*, QLis
}
}
-void KonqSidebarBookmarkModule::slotDropped(KListView *, QDropEvent *e, QListViewItem *parent, QListViewItem *after)
+void KonqSidebarBookmarkModule::slotDropped(KListView *, TQDropEvent *e, TQListViewItem *parent, TQListViewItem *after)
{
if (!KBookmarkDrag::canDecode(e))
return;
@@ -257,10 +257,10 @@ void KonqSidebarBookmarkModule::slotDropped(KListView *, QDropEvent *e, QListVie
parentGroup = KonqBookmarkManager::self()->root();
}
- QValueList<KBookmark> bookmarks = KBookmarkDrag::decode(e);
+ TQValueList<KBookmark> bookmarks = KBookmarkDrag::decode(e);
// copy
- QValueList<KBookmark>::iterator it = bookmarks.begin();
+ TQValueList<KBookmark>::iterator it = bookmarks.begin();
for (;it != bookmarks.end(); ++it) {
// insert new item.
parentGroup.moveItem(*it, afterBookmark);
@@ -320,21 +320,21 @@ void KonqSidebarBookmarkModule::slotDelete()
KonqBookmarkManager::self()->emitChanged( parentBookmark );
}
-void makeTextNodeMod(KBookmark bk, const QString &m_nodename, const QString &m_newText) {
- QDomNode subnode = bk.internalElement().namedItem(m_nodename);
+void makeTextNodeMod(KBookmark bk, const TQString &m_nodename, const TQString &m_newText) {
+ TQDomNode subnode = bk.internalElement().namedItem(m_nodename);
if (subnode.isNull()) {
subnode = bk.internalElement().ownerDocument().createElement(m_nodename);
bk.internalElement().appendChild(subnode);
}
if (subnode.firstChild().isNull()) {
- QDomText domtext = subnode.ownerDocument().createTextNode("");
+ TQDomText domtext = subnode.ownerDocument().createTextNode("");
subnode.appendChild(domtext);
}
- QDomText domtext = subnode.firstChild().toText();
+ TQDomText domtext = subnode.firstChild().toText();
- QString m_oldText = domtext.data();
+ TQString m_oldText = domtext.data();
domtext.setData(m_newText);
}
@@ -348,7 +348,7 @@ void KonqSidebarBookmarkModule::slotProperties(KonqSidebarBookmarkItem *bi)
KBookmark bookmark = bi->bookmark();
- QString folder = bookmark.isGroup() ? QString::null : bookmark.url().pathOrURL();
+ TQString folder = bookmark.isGroup() ? TQString::null : bookmark.url().pathOrURL();
BookmarkEditDialog dlg( bookmark.fullText(), folder, 0, 0,
i18n("Bookmark Properties") );
if ( dlg.exec() != KDialogBase::Accepted )
@@ -394,11 +394,11 @@ void KonqSidebarBookmarkModule::slotOpenTab()
bookmark = group.first();
while (!bookmark.isNull()) {
if (!bookmark.isGroup() && !bookmark.isSeparator())
- ref.call( "newTab(QString)", bookmark.url().url() );
+ ref.call( "newTab(TQString)", bookmark.url().url() );
bookmark = group.next(bookmark);
}
} else {
- ref.call( "newTab(QString)", bookmark.url().url() );
+ ref.call( "newTab(TQString)", bookmark.url().url() );
}
}
@@ -419,7 +419,7 @@ void KonqSidebarBookmarkModule::slotCopyLocation()
}
}
-void KonqSidebarBookmarkModule::slotOpenChange(QListViewItem* i)
+void KonqSidebarBookmarkModule::slotOpenChange(TQListViewItem* i)
{
if (m_ignoreOpenChange)
return;
@@ -438,7 +438,7 @@ void KonqSidebarBookmarkModule::slotOpenChange(QListViewItem* i)
m_folderOpenState[bookmark.address()] = open;
}
-void KonqSidebarBookmarkModule::slotBookmarksChanged( const QString & groupAddress )
+void KonqSidebarBookmarkModule::slotBookmarksChanged( const TQString & groupAddress )
{
m_ignoreOpenChange = true;
@@ -450,9 +450,9 @@ void KonqSidebarBookmarkModule::slotBookmarksChanged( const QString & groupAddre
if (!group.isNull() && item)
{
// Delete all children of item
- QListViewItem * child = item->firstChild();
+ TQListViewItem * child = item->firstChild();
while( child ) {
- QListViewItem * next = child->nextSibling();
+ TQListViewItem * next = child->nextSibling();
delete child;
child = next;
}
@@ -483,7 +483,7 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo
KBookmarkGroup grp = bk.toGroup();
fillGroup( item, grp );
- QString address(grp.address());
+ TQString address(grp.address());
if (m_folderOpenState.contains(address))
item->setOpen(m_folderOpenState[address]);
else
@@ -497,12 +497,12 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo
}
// Borrowed from KEditBookmarks
-KonqSidebarBookmarkItem * KonqSidebarBookmarkModule::findByAddress( const QString & address ) const
+KonqSidebarBookmarkItem * KonqSidebarBookmarkModule::findByAddress( const TQString & address ) const
{
- QListViewItem * item = m_topLevelItem;
+ TQListViewItem * item = m_topLevelItem;
// The address is something like /5/10/2
- QStringList addresses = QStringList::split('/',address);
- for ( QStringList::Iterator it = addresses.begin() ; it != addresses.end() ; ++it )
+ TQStringList addresses = TQStringList::split('/',address);
+ for ( TQStringList::Iterator it = addresses.begin() ; it != addresses.end() ; ++it )
{
uint number = (*it).toUInt();
item = item->firstChild();
@@ -514,8 +514,8 @@ KonqSidebarBookmarkItem * KonqSidebarBookmarkModule::findByAddress( const QStrin
}
// Borrowed&modified from KBookmarkMenu...
-BookmarkEditDialog::BookmarkEditDialog(const QString& title, const QString& url,
- QWidget * parent, const char * name, const QString& caption )
+BookmarkEditDialog::BookmarkEditDialog(const TQString& title, const TQString& url,
+ TQWidget * parent, const char * name, const TQString& caption )
: KDialogBase(parent, name, true, caption,
(Ok|Cancel),
Ok, false, KGuiItem()),
@@ -523,20 +523,20 @@ BookmarkEditDialog::BookmarkEditDialog(const QString& title, const QString& url,
{
setButtonOK( i18n( "&Update" ) );
- QWidget *main = new QWidget( this );
+ TQWidget *main = new TQWidget( this );
setMainWidget( main );
bool folder = url.isNull();
- QGridLayout *grid = new QGridLayout( main, 2, folder?1:2, spacingHint() );
+ TQGridLayout *grid = new TQGridLayout( main, 2, folder?1:2, spacingHint() );
- QLabel *nameLabel = new QLabel(i18n("Name:"), main, "title label");
+ TQLabel *nameLabel = new TQLabel(i18n("Name:"), main, "title label");
grid->addWidget(nameLabel, 0, 0);
m_title = new KLineEdit(main, "title edit");
m_title->setText(title);
nameLabel->setBuddy(m_title);
grid->addWidget(m_title, 0, 1);
if(!folder) {
- QLabel *locationLabel = new QLabel(i18n("Location:"), main, "location label");
+ TQLabel *locationLabel = new TQLabel(i18n("Location:"), main, "location label");
grid->addWidget(locationLabel, 1, 0);
m_location = new KLineEdit(main, "location edit");
m_location->setText(url);
@@ -556,20 +556,20 @@ void BookmarkEditDialog::slotCancel()
reject();
}
-QString BookmarkEditDialog::finalUrl() const
+TQString BookmarkEditDialog::finalUrl() const
{
if (m_location!=0)
return m_location->text();
else
- return QString::null;
+ return TQString::null;
}
-QString BookmarkEditDialog::finalTitle() const
+TQString BookmarkEditDialog::finalTitle() const
{
if (m_title!=0)
return m_title->text();
else
- return QString::null;
+ return TQString::null;
}
extern "C"
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h
index b38cdb540..738bd7566 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h
@@ -19,8 +19,8 @@
#ifndef bookmark_module_h
#define bookmark_module_h
-#include <qmap.h>
-#include <qobject.h>
+#include <tqmap.h>
+#include <tqobject.h>
#include <konq_sidebartreemodule.h>
#include <kbookmark.h>
#include <kdialogbase.h>
@@ -32,7 +32,7 @@ class KLineEdit;
/**
* This module displays bookmarks in the tree
*/
-class KonqSidebarBookmarkModule : public QObject, public KonqSidebarTreeModule
+class KonqSidebarBookmarkModule : public TQObject, public KonqSidebarTreeModule
{
Q_OBJECT
public:
@@ -41,15 +41,15 @@ public:
// Handle this new toplevel item [can only be called once currently]
virtual void addTopLevelItem( KonqSidebarTreeTopLevelItem * item );
- virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const QPoint& );
+ virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const TQPoint& );
void showPopupMenu();
protected slots:
- void slotBookmarksChanged( const QString & );
- void slotMoved(QListViewItem*,QListViewItem*,QListViewItem*);
- void slotDropped(KListView*,QDropEvent*,QListViewItem*,QListViewItem*);
+ void slotBookmarksChanged( const TQString & );
+ void slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*);
+ void slotDropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*);
void slotCreateFolder();
void slotDelete();
void slotProperties(KonqSidebarBookmarkItem *bi = 0);
@@ -60,10 +60,10 @@ protected slots:
protected:
void fillListView();
void fillGroup( KonqSidebarTreeItem * parentItem, KBookmarkGroup group );
- KonqSidebarBookmarkItem * findByAddress( const QString & address ) const;
+ KonqSidebarBookmarkItem * findByAddress( const TQString & address ) const;
private slots:
- void slotOpenChange(QListViewItem*);
+ void slotOpenChange(TQListViewItem*);
private:
KonqSidebarTreeTopLevelItem * m_topLevelItem;
@@ -72,7 +72,7 @@ private:
KActionCollection *m_collection;
bool m_ignoreOpenChange;
- QMap<QString, bool> m_folderOpenState;
+ TQMap<TQString, bool> m_folderOpenState;
};
class BookmarkEditDialog : public KDialogBase
@@ -80,12 +80,12 @@ class BookmarkEditDialog : public KDialogBase
Q_OBJECT
public:
- BookmarkEditDialog( const QString& title, const QString& url,
- QWidget * = 0, const char * = 0,
- const QString& caption = i18n( "Add Bookmark" ) );
+ BookmarkEditDialog( const TQString& title, const TQString& url,
+ TQWidget * = 0, const char * = 0,
+ const TQString& caption = i18n( "Add Bookmark" ) );
- QString finalUrl() const;
- QString finalTitle() const;
+ TQString finalUrl() const;
+ TQString finalTitle() const;
protected slots:
void slotOk();
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
index 7f7ee8849..811867b14 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -25,13 +25,13 @@
#include <kdebug.h>
#include <kglobalsettings.h>
#include <kuserprofile.h>
-#include <qapplication.h>
-#include <qclipboard.h>
+#include <tqapplication.h>
+#include <tqclipboard.h>
#include <kio/paste.h>
-#include <qfile.h>
-#include <qpainter.h>
+#include <tqfile.h>
+#include <tqpainter.h>
#include <kiconloader.h>
-#include <qcursor.h>
+#include <tqcursor.h>
#define MYMODULE static_cast<KonqSidebarDirTreeModule*>(module())
@@ -64,7 +64,7 @@ void KonqSidebarDirTreeItem::reset()
KURL url = m_fileItem->url();
if ( url.isLocalFile() )
{
- QCString path( QFile::encodeName(url.path()));
+ TQCString path( TQFile::encodeName(url.path()));
struct stat buff;
if ( ::stat( path.data(), &buff ) != -1 )
{
@@ -108,15 +108,15 @@ bool KonqSidebarDirTreeItem::hasStandardIcon()
return m_fileItem->iconName() == "folder";
}
-void KonqSidebarDirTreeItem::paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment )
+void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
{
if (m_fileItem->isLink())
{
- QFont f( _painter->font() );
+ TQFont f( _painter->font() );
f.setItalic( TRUE );
_painter->setFont( f );
}
- QListViewItem::paintCell( _painter, _cg, _column, _width, _alignment );
+ TQListViewItem::paintCell( _painter, _cg, _column, _width, _alignment );
}
KURL KonqSidebarDirTreeItem::externalURL() const
@@ -124,27 +124,27 @@ KURL KonqSidebarDirTreeItem::externalURL() const
return m_fileItem->url();
}
-QString KonqSidebarDirTreeItem::externalMimeType() const
+TQString KonqSidebarDirTreeItem::externalMimeType() const
{
if (m_fileItem->isMimeTypeKnown())
return m_fileItem->mimetype();
else
- return QString::null;
+ return TQString::null;
}
-bool KonqSidebarDirTreeItem::acceptsDrops( const QStrList & formats )
+bool KonqSidebarDirTreeItem::acceptsDrops( const TQStrList & formats )
{
if ( formats.contains("text/uri-list") )
return m_fileItem->acceptsDrops();
return false;
}
-void KonqSidebarDirTreeItem::drop( QDropEvent * ev )
+void KonqSidebarDirTreeItem::drop( TQDropEvent * ev )
{
KonqOperations::doDrop( m_fileItem, externalURL(), ev, tree() );
}
-QDragObject * KonqSidebarDirTreeItem::dragObject( QWidget * parent, bool move )
+TQDragObject * KonqSidebarDirTreeItem::dragObject( TQWidget * parent, bool move )
{
KURL::List lst;
lst.append( m_fileItem->url() );
@@ -162,7 +162,7 @@ void KonqSidebarDirTreeItem::itemSelected()
if ( m_fileItem->url().directory(false) == KGlobalSettings::trashPath() )
bInTrash = true;
- QMimeSource *data = QApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::clipboard()->data();
bool paste = ( data->encodedData( data->format() ).size() != 0 );
tree()->enableActions( true, true, paste, true && !bInTrash, true, true );
@@ -190,14 +190,14 @@ void KonqSidebarDirTreeItem::rightButtonPressed()
{
KFileItemList lstItems;
lstItems.append( m_fileItem );
- emit tree()->popupMenu( QCursor::pos(), lstItems );
+ emit tree()->popupMenu( TQCursor::pos(), lstItems );
}
void KonqSidebarDirTreeItem::paste()
{
// move or not move ?
bool move = false;
- QMimeSource *data = QApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::clipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1201) << "move (from clipboard data) = " << move << endl;
@@ -229,7 +229,7 @@ void KonqSidebarDirTreeItem::delOperation( int method )
KonqOperations::del(tree(), method, lst);
}
-QString KonqSidebarDirTreeItem::toolTipText() const
+TQString KonqSidebarDirTreeItem::toolTipText() const
{
return m_fileItem->url().pathOrURL();
}
@@ -239,7 +239,7 @@ void KonqSidebarDirTreeItem::rename()
tree()->rename( this, 0 );
}
-void KonqSidebarDirTreeItem::rename( const QString & name )
+void KonqSidebarDirTreeItem::rename( const TQString & name )
{
KonqOperations::rename( tree(), m_fileItem->url(), name );
}
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
index fe98595e6..f8025d230 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
@@ -21,7 +21,7 @@
#include "konq_sidebartreeitem.h"
#include <kurl.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
class QDropEvent;
class KFileItem;
@@ -36,11 +36,11 @@ public:
virtual void setOpen( bool open );
- virtual void paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment );
+ virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment );
- virtual bool acceptsDrops( const QStrList & formats );
- virtual void drop( QDropEvent * ev );
- virtual QDragObject * dragObject( QWidget * parent, bool move = false );
+ virtual bool acceptsDrops( const TQStrList & formats );
+ virtual void drop( TQDropEvent * ev );
+ virtual TQDragObject * dragObject( TQWidget * parent, bool move = false );
virtual void middleButtonClicked();
virtual void rightButtonPressed();
@@ -50,12 +50,12 @@ public:
virtual void del();
virtual void shred();
virtual void rename(); // start a rename operation
- void rename( const QString & name ); // do the actual renaming
+ void rename( const TQString & name ); // do the actual renaming
// The URL to open when this link is clicked
virtual KURL externalURL() const;
- virtual QString externalMimeType() const;
- virtual QString toolTipText() const;
+ virtual TQString externalMimeType() const;
+ virtual TQString toolTipText() const;
virtual void itemSelected();
@@ -63,7 +63,7 @@ public:
bool hasStandardIcon();
- QString id;
+ TQString id;
private:
void delOperation( int method );
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index 725927362..ac26b1285 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -53,8 +53,8 @@ KonqSidebarDirTreeModule::~KonqSidebarDirTreeModule()
// KDirLister may still emit canceled while being deleted.
if (m_dirLister)
{
- disconnect( m_dirLister, SIGNAL( canceled( const KURL & ) ),
- this, SLOT( slotListingStopped( const KURL & ) ) );
+ disconnect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ),
+ this, TQT_SLOT( slotListingStopped( const KURL & ) ) );
delete m_dirLister;
}
}
@@ -87,12 +87,12 @@ void KonqSidebarDirTreeModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it
{
targetURL = cfg.readURL();
// some services might want to make their URL configurable in kcontrol
- QString configured = cfg.readEntry("X-KDE-ConfiguredURL");
+ TQString configured = cfg.readEntry("X-KDE-ConfiguredURL");
if (!configured.isEmpty()) {
- QStringList list = QStringList::split(':', configured);
+ TQStringList list = TQStringList::split(':', configured);
KConfig config(list[0]);
if (list[1] != "noGroup") config.setGroup(list[1]);
- QString conf_url = config.readEntry(list[2]);
+ TQString conf_url = config.readEntry(list[2]);
if (!conf_url.isEmpty()) {
targetURL = conf_url;
}
@@ -101,7 +101,7 @@ void KonqSidebarDirTreeModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it
else if ( cfg.hasDeviceType() )
{
// Determine the mountpoint
- QString mp = cfg.readEntry("MountPoint");
+ TQString mp = cfg.readEntry("MountPoint");
if ( mp.isEmpty() )
return;
@@ -133,7 +133,7 @@ void KonqSidebarDirTreeModule::openTopLevelItem( KonqSidebarTreeTopLevelItem * i
void KonqSidebarDirTreeModule::addSubDir( KonqSidebarTreeItem *item )
{
- QString id = item->externalURL().url(-1);
+ TQString id = item->externalURL().url(-1);
kdDebug(1201) << this << " KonqSidebarDirTreeModule::addSubDir " << id << endl;
m_dictSubDirs.insert(id, item );
@@ -144,9 +144,9 @@ void KonqSidebarDirTreeModule::addSubDir( KonqSidebarTreeItem *item )
// Remove <key, item> from dict, taking into account that there maybe
// other items with the same key.
-static void remove(QDict<KonqSidebarTreeItem> &dict, const QString &key, KonqSidebarTreeItem *item)
+static void remove(TQDict<KonqSidebarTreeItem> &dict, const TQString &key, KonqSidebarTreeItem *item)
{
- QPtrList<KonqSidebarTreeItem> *otherItems = 0;
+ TQPtrList<KonqSidebarTreeItem> *otherItems = 0;
while(true) {
KonqSidebarTreeItem *takeItem = dict.take(key);
if (!takeItem || (takeItem == item))
@@ -164,7 +164,7 @@ static void remove(QDict<KonqSidebarTreeItem> &dict, const QString &key, KonqSid
}
// Not the item we are looking for
if (!otherItems)
- otherItems = new QPtrList<KonqSidebarTreeItem>();
+ otherItems = new TQPtrList<KonqSidebarTreeItem>();
otherItems->prepend(takeItem);
}
@@ -173,7 +173,7 @@ static void remove(QDict<KonqSidebarTreeItem> &dict, const QString &key, KonqSid
// Looks up key in dict and returns it in item, if there are multiple items
// with the same key, additional items are returned in itemList which should
// be deleted by the caller.
-static void lookupItems(QDict<KonqSidebarTreeItem> &dict, const QString &key, KonqSidebarTreeItem *&item, QPtrList<KonqSidebarTreeItem> *&itemList)
+static void lookupItems(TQDict<KonqSidebarTreeItem> &dict, const TQString &key, KonqSidebarTreeItem *&item, TQPtrList<KonqSidebarTreeItem> *&itemList)
{
itemList = 0;
item = dict.take(key);
@@ -196,7 +196,7 @@ static void lookupItems(QDict<KonqSidebarTreeItem> &dict, const QString &key, Ko
return;
}
if (!itemList)
- itemList = new QPtrList<KonqSidebarTreeItem>();
+ itemList = new TQPtrList<KonqSidebarTreeItem>();
itemList->prepend(takeItem);
}
@@ -204,9 +204,9 @@ static void lookupItems(QDict<KonqSidebarTreeItem> &dict, const QString &key, Ko
// Remove <key, item> from dict, taking into account that there maybe
// other items with the same key.
-static void remove(QPtrDict<KonqSidebarTreeItem> &dict, void *key, KonqSidebarTreeItem *item)
+static void remove(TQPtrDict<KonqSidebarTreeItem> &dict, void *key, KonqSidebarTreeItem *item)
{
- QPtrList<KonqSidebarTreeItem> *otherItems = 0;
+ TQPtrList<KonqSidebarTreeItem> *otherItems = 0;
while(true) {
KonqSidebarTreeItem *takeItem = dict.take(key);
if (!takeItem || (takeItem == item))
@@ -224,7 +224,7 @@ static void remove(QPtrDict<KonqSidebarTreeItem> &dict, void *key, KonqSidebarTr
}
// Not the item we are looking for
if (!otherItems)
- otherItems = new QPtrList<KonqSidebarTreeItem>();
+ otherItems = new TQPtrList<KonqSidebarTreeItem>();
otherItems->prepend(takeItem);
}
@@ -233,7 +233,7 @@ static void remove(QPtrDict<KonqSidebarTreeItem> &dict, void *key, KonqSidebarTr
// Looks up key in dict and returns it in item, if there are multiple items
// with the same key, additional items are returned in itemList which should
// be deleted by the caller.
-static void lookupItems(QPtrDict<KonqSidebarTreeItem> &dict, void *key, KonqSidebarTreeItem *&item, QPtrList<KonqSidebarTreeItem> *&itemList)
+static void lookupItems(TQPtrDict<KonqSidebarTreeItem> &dict, void *key, KonqSidebarTreeItem *&item, TQPtrList<KonqSidebarTreeItem> *&itemList)
{
itemList = 0;
item = dict.take(key);
@@ -256,7 +256,7 @@ static void lookupItems(QPtrDict<KonqSidebarTreeItem> &dict, void *key, KonqSide
return;
}
if (!itemList)
- itemList = new QPtrList<KonqSidebarTreeItem>();
+ itemList = new TQPtrList<KonqSidebarTreeItem>();
itemList->prepend(takeItem);
}
@@ -280,7 +280,7 @@ void KonqSidebarDirTreeModule::removeSubDir( KonqSidebarTreeItem *item, bool chi
if ( !childrenOnly )
{
- QString id = item->externalURL().url(-1);
+ TQString id = item->externalURL().url(-1);
remove(m_dictSubDirs, id, item);
while (!(item->alias.isEmpty()))
{
@@ -303,22 +303,22 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item )
{
m_dirLister = new KDirLister( true );
//m_dirLister->setDirOnlyMode( true );
-// QStringList mimetypes;
-// mimetypes<<QString("inode/directory");
+// TQStringList mimetypes;
+// mimetypes<<TQString("inode/directory");
// m_dirLister->setMimeFilter(mimetypes);
- connect( m_dirLister, SIGNAL( newItems( const KFileItemList & ) ),
- this, SLOT( slotNewItems( const KFileItemList & ) ) );
- connect( m_dirLister, SIGNAL( refreshItems( const KFileItemList & ) ),
- this, SLOT( slotRefreshItems( const KFileItemList & ) ) );
- connect( m_dirLister, SIGNAL( deleteItem( KFileItem * ) ),
- this, SLOT( slotDeleteItem( KFileItem * ) ) );
- connect( m_dirLister, SIGNAL( completed( const KURL & ) ),
- this, SLOT( slotListingStopped( const KURL & ) ) );
- connect( m_dirLister, SIGNAL( canceled( const KURL & ) ),
- this, SLOT( slotListingStopped( const KURL & ) ) );
- connect( m_dirLister, SIGNAL( redirection( const KURL &, const KURL & ) ),
- this, SLOT( slotRedirection( const KURL &, const KURL & ) ) );
+ connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ),
+ this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) );
+ connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ),
+ this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) );
+ connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
+ this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
+ connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ),
+ this, TQT_SLOT( slotListingStopped( const KURL & ) ) );
+ connect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ),
+ this, TQT_SLOT( slotListingStopped( const KURL & ) ) );
+ connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ),
+ this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) );
}
@@ -326,7 +326,7 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item )
static_cast<KonqSidebarDirTreeItem *>(item)->hasStandardIcon() )
{
int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
- QPixmap pix = DesktopIcon( "folder_open", size );
+ TQPixmap pix = DesktopIcon( "folder_open", size );
m_pTree->startAnimation( item, "kde", 6, &pix );
}
else
@@ -338,10 +338,10 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item )
void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item )
{
// This causes a reparsing, but gets rid of the trailing slash
- QString strUrl = item->externalURL().url(-1);
+ TQString strUrl = item->externalURL().url(-1);
KURL url( strUrl );
- QPtrList<KonqSidebarTreeItem> *itemList;
+ TQPtrList<KonqSidebarTreeItem> *itemList;
KonqSidebarTreeItem * openItem;
lookupItems(m_dictSubDirs, strUrl, openItem, itemList);
@@ -407,13 +407,13 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries )
dir.setFileName( "" );
kdDebug(1201) << this << " KonqSidebarDirTreeModule::slotNewItems dir=" << dir.url(-1) << endl;
- QPtrList<KonqSidebarTreeItem> *parentItemList;
+ TQPtrList<KonqSidebarTreeItem> *parentItemList;
KonqSidebarTreeItem * parentItem;
lookupItems(m_dictSubDirs, dir.url(-1), parentItem, parentItemList);
if ( !parentItem ) // hack for dnssd://domain/type/service listed in dnssd:/type/ dir
{
- dir.setHost( QString::null );
+ dir.setHost( TQString::null );
lookupItems( m_dictSubDirs, dir.url(-1), parentItem, parentItemList );
}
@@ -428,7 +428,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries )
do
{
kdDebug()<<"Parent Item URL:"<<parentItem->externalURL()<<endl;
- QPtrListIterator<KFileItem> kit ( entries );
+ TQPtrListIterator<KFileItem> kit ( entries );
for( ; kit.current(); ++kit )
{
KFileItem * fileItem = *kit;
@@ -458,13 +458,13 @@ void KonqSidebarDirTreeModule::slotRefreshItems( const KFileItemList &entries )
{
int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
- QPtrListIterator<KFileItem> kit ( entries );
+ TQPtrListIterator<KFileItem> kit ( entries );
kdDebug(1201) << "KonqSidebarDirTreeModule::slotRefreshItems " << entries.count() << " entries. First: " << kit.current()->url().url() << endl;
for( ; kit.current(); ++kit )
{
KFileItem *fileItem = kit.current();
- QPtrList<KonqSidebarTreeItem> *itemList;
+ TQPtrList<KonqSidebarTreeItem> *itemList;
KonqSidebarTreeItem * item;
lookupItems(m_ptrdictSubDirs, fileItem, item, itemList);
@@ -517,7 +517,7 @@ void KonqSidebarDirTreeModule::slotDeleteItem( KFileItem *fileItem )
kdDebug(1201) << "KonqSidebarDirTreeModule::slotDeleteItem( " << fileItem->url().url(-1) << " )" << endl;
// All items are in m_ptrdictSubDirs, so look it up fast
- QPtrList<KonqSidebarTreeItem> *itemList;
+ TQPtrList<KonqSidebarTreeItem> *itemList;
KonqSidebarTreeItem * item;
lookupItems(m_ptrdictSubDirs, fileItem, item, itemList);
while(item)
@@ -534,10 +534,10 @@ void KonqSidebarDirTreeModule::slotRedirection( const KURL & oldUrl, const KURL
{
kdDebug(1201) << "******************************KonqSidebarDirTreeModule::slotRedirection(" << newUrl.prettyURL() << ")" << endl;
- QString oldUrlStr = oldUrl.url(-1);
- QString newUrlStr = newUrl.url(-1);
+ TQString oldUrlStr = oldUrl.url(-1);
+ TQString newUrlStr = newUrl.url(-1);
- QPtrList<KonqSidebarTreeItem> *itemList;
+ TQPtrList<KonqSidebarTreeItem> *itemList;
KonqSidebarTreeItem * item;
lookupItems(m_dictSubDirs, oldUrlStr, item, itemList);
@@ -565,7 +565,7 @@ void KonqSidebarDirTreeModule::slotListingStopped( const KURL & url )
{
kdDebug(1201) << "KonqSidebarDirTree::slotListingStopped " << url.url(-1) << endl;
- QPtrList<KonqSidebarTreeItem> *itemList;
+ TQPtrList<KonqSidebarTreeItem> *itemList;
KonqSidebarTreeItem * item;
lookupItems(m_dictSubDirs, url.url(-1), item, itemList);
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
index dc46d3b9e..af915aa46 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
@@ -21,9 +21,9 @@
#include <konq_sidebartreemodule.h>
#include <kfileitem.h>
-#include <qpixmap.h>
-#include <qdict.h>
-#include <qptrdict.h>
+#include <tqpixmap.h>
+#include <tqdict.h>
+#include <tqptrdict.h>
class KDirLister;
class KonqSidebarTree;
@@ -31,7 +31,7 @@ class KonqSidebarTreeItem;
class KonqSidebarDirTreeItem;
class KonqPropsView;
-class KonqSidebarDirTreeModule : public QObject, public KonqSidebarTreeModule
+class KonqSidebarDirTreeModule : public TQObject, public KonqSidebarTreeModule
{
Q_OBJECT
public:
@@ -64,10 +64,10 @@ private:
// URL -> item
// Each KonqSidebarDirTreeItem is indexed on item->id() and
// all item->alias'es
- QDict<KonqSidebarTreeItem> m_dictSubDirs;
+ TQDict<KonqSidebarTreeItem> m_dictSubDirs;
// KFileItem -> item
- QPtrDict<KonqSidebarTreeItem> m_ptrdictSubDirs;
+ TQPtrDict<KonqSidebarTreeItem> m_ptrdictSubDirs;
KDirLister * m_dirLister;
diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp
index bfda3152c..981be03bb 100644
--- a/konqueror/sidebar/trees/history_module/history_item.cpp
+++ b/konqueror/sidebar/trees/history_module/history_item.cpp
@@ -19,7 +19,7 @@
#include <kbookmarkdrag.h>
#include <kprotocolinfo.h>
#include <konq_faviconmgr.h>
-#include <qpainter.h>
+#include <tqpainter.h>
#include <assert.h>
@@ -53,12 +53,12 @@ void KonqSidebarHistoryItem::update( const KonqHistoryEntry *entry )
if (!entry)
return;
- QString title( entry->title );
+ TQString title( entry->title );
if ( !title.stripWhiteSpace().isEmpty() &&
title != entry->url.url() )
setText( 0, title );
else {
- QString path( entry->url.path() );
+ TQString path( entry->url.path() );
if ( path.isEmpty() )
path += '/';
setText( 0, path );
@@ -66,10 +66,10 @@ void KonqSidebarHistoryItem::update( const KonqHistoryEntry *entry )
KonqSidebarHistoryGroupItem *group = MYGROUP;
assert(group);
- QString path = entry->url.path();
+ TQString path = entry->url.path();
if ( group->hasFavIcon() && (path.isNull() || path == "/") )
{
- const QPixmap *pm = group->pixmap(0);
+ const TQPixmap *pm = group->pixmap(0);
if (pm)
setPixmap( 0, *pm );
}
@@ -91,9 +91,9 @@ void KonqSidebarHistoryItem::rightButtonPressed()
MYMODULE->showPopupMenu();
}
-QDragObject * KonqSidebarHistoryItem::dragObject( QWidget * parent, bool /*move*/ )
+TQDragObject * KonqSidebarHistoryItem::dragObject( TQWidget * parent, bool /*move*/ )
{
- QString icon = KonqFavIconMgr::iconForURL( m_entry->url.url() );
+ TQString icon = KonqFavIconMgr::iconForURL( m_entry->url.url() );
KBookmark bookmark = KBookmark::standaloneBookmark( m_entry->title,
m_entry->url, icon );
KBookmarkDrag *drag = KBookmarkDrag::newDrag( bookmark, parent );
@@ -101,35 +101,35 @@ QDragObject * KonqSidebarHistoryItem::dragObject( QWidget * parent, bool /*move*
}
// new items go on top
-QString KonqSidebarHistoryItem::key( int column, bool ascending ) const
+TQString KonqSidebarHistoryItem::key( int column, bool ascending ) const
{
if ( MYMODULE->sortsByName() )
return KonqSidebarTreeItem::key( column, ascending );
- QString tmp;
+ TQString tmp;
tmp.sprintf( "%08x", m_entry->lastVisited.secsTo(MYMODULE->currentTime()));
return tmp;
}
-QString KonqSidebarHistoryItem::toolTipText() const
+TQString KonqSidebarHistoryItem::toolTipText() const
{
if ( s_settings->m_detailedTips ) {
// this weird ordering of %4, %1, %2, %3 is due to the reason, that some
// urls seem to contain %N, which would get substituted in the next
// .arg() calls. So to fix this, we first substitute the last items
// and then put in the url.
- QString tip = i18n("<qt><center><b>%4</b></center><hr>Last visited: %1<br>First visited: %2<br>Number of times visited: %3</qt>");
+ TQString tip = i18n("<qt><center><b>%4</b></center><hr>Last visited: %1<br>First visited: %2<br>Number of times visited: %3</qt>");
return tip.arg( KGlobal::locale()->formatDateTime( m_entry->lastVisited ) ).arg( KGlobal::locale()->formatDateTime( m_entry->firstVisited ) ).arg( m_entry->numberOfTimesVisited ).arg( m_entry->url.url() );
}
return m_entry->url.url();
}
-void KonqSidebarHistoryItem::paintCell( QPainter *p, const QColorGroup & cg,
+void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg,
int column, int width, int alignment )
{
- QDateTime dt;
- QDateTime current = QDateTime::currentDateTime();
+ TQDateTime dt;
+ TQDateTime current = TQDateTime::currentDateTime();
if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS )
dt = current.addDays( - s_settings->m_valueYoungerThan );
@@ -164,7 +164,7 @@ KonqSidebarHistoryGroupItem::KonqSidebarHistoryGroupItem( const KURL& url,
{
}
-void KonqSidebarHistoryGroupItem::setFavIcon( const QPixmap& pix )
+void KonqSidebarHistoryGroupItem::setFavIcon( const TQPixmap& pix )
{
setPixmap( 0, pix );
m_hasFavIcon = true;
@@ -187,7 +187,7 @@ void KonqSidebarHistoryGroupItem::remove()
KonqSidebarHistoryItem * KonqSidebarHistoryGroupItem::findChild(const KonqHistoryEntry *entry) const
{
- QListViewItem *child = firstChild();
+ TQListViewItem *child = firstChild();
KonqSidebarHistoryItem *item = 0L;
while ( child ) {
@@ -220,12 +220,12 @@ void KonqSidebarHistoryGroupItem::setOpen( bool open )
}
// new items go on top
-QString KonqSidebarHistoryGroupItem::key( int column, bool ascending ) const
+TQString KonqSidebarHistoryGroupItem::key( int column, bool ascending ) const
{
if ( !m_lastVisited.isValid() || MYMODULE->sortsByName() )
return KonqSidebarTreeItem::key( column, ascending );
- QString tmp;
+ TQString tmp;
tmp.sprintf( "%08x", m_lastVisited.secsTo( MYMODULE->currentTime() ));
return tmp;
}
@@ -236,10 +236,10 @@ void KonqSidebarHistoryGroupItem::itemUpdated( KonqSidebarHistoryItem *item )
m_lastVisited = item->lastVisited();
}
-QDragObject * KonqSidebarHistoryGroupItem::dragObject( QWidget *parent, bool /*move*/)
+TQDragObject * KonqSidebarHistoryGroupItem::dragObject( TQWidget *parent, bool /*move*/)
{
- QString icon = KonqFavIconMgr::iconForURL( m_url.url() );
- KBookmark bookmark = KBookmark::standaloneBookmark( QString::null, m_url,
+ TQString icon = KonqFavIconMgr::iconForURL( m_url.url() );
+ KBookmark bookmark = KBookmark::standaloneBookmark( TQString::null, m_url,
icon );
KBookmarkDrag *drag = KBookmarkDrag::newDrag( bookmark, parent );
return drag;
diff --git a/konqueror/sidebar/trees/history_module/history_item.h b/konqueror/sidebar/trees/history_module/history_item.h
index a7c77a677..fb7786e60 100644
--- a/konqueror/sidebar/trees/history_module/history_item.h
+++ b/konqueror/sidebar/trees/history_module/history_item.h
@@ -43,23 +43,23 @@ public:
// The URL to open when this link is clicked
virtual KURL externalURL() const { return m_entry->url; }
const KURL& url() const { return m_entry->url; } // a faster one
- virtual QString toolTipText() const;
+ virtual TQString toolTipText() const;
- QString host() const { return m_entry->url.host(); }
- QString path() const { return m_entry->url.path(); }
+ TQString host() const { return m_entry->url.host(); }
+ TQString path() const { return m_entry->url.path(); }
- const QDateTime& lastVisited() const { return m_entry->lastVisited; }
+ const TQDateTime& lastVisited() const { return m_entry->lastVisited; }
void update( const KonqHistoryEntry *entry );
const KonqHistoryEntry *entry() const { return m_entry; }
- virtual QDragObject * dragObject( QWidget * parent, bool move = false );
+ virtual TQDragObject * dragObject( TQWidget * parent, bool move = false );
- virtual QString key( int column, bool ascending ) const;
+ virtual TQString key( int column, bool ascending ) const;
static void setSettings( KonqSidebarHistorySettings *s ) { s_settings = s; }
- virtual void paintCell( QPainter *, const QColorGroup & cg, int column,
+ virtual void paintCell( TQPainter *, const TQColorGroup & cg, int column,
int width, int alignment );
private:
@@ -85,25 +85,25 @@ public:
virtual void setOpen( bool open );
- virtual QString key( int column, bool ascending ) const;
+ virtual TQString key( int column, bool ascending ) const;
void itemUpdated( KonqSidebarHistoryItem *item );
bool hasFavIcon() const { return m_hasFavIcon; }
- void setFavIcon( const QPixmap& pix );
+ void setFavIcon( const TQPixmap& pix );
- virtual QDragObject * dragObject( QWidget *, bool );
+ virtual TQDragObject * dragObject( TQWidget *, bool );
virtual void itemSelected();
// we don't support the following of KonqSidebarTreeItem
- bool acceptsDrops( const QStrList& ) { return false; }
- virtual void drop( QDropEvent * ) {}
+ bool acceptsDrops( const TQStrList& ) { return false; }
+ virtual void drop( TQDropEvent * ) {}
virtual KURL externalURL() const { return KURL(); }
private:
bool m_hasFavIcon;
const KURL m_url;
- QDateTime m_lastVisited;
+ TQDateTime m_lastVisited;
};
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 832abd74e..2f80c26c0 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qapplication.h>
-#include <qpopupmenu.h>
+#include <tqapplication.h>
+#include <tqpopupmenu.h>
#include <kapplication.h>
#include <kaction.h>
@@ -39,7 +39,7 @@ static KStaticDeleter<KonqSidebarHistorySettings> sd;
KonqSidebarHistorySettings * KonqSidebarHistoryModule::s_settings = 0L;
KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree, const char *name )
- : QObject( 0L, name ), KonqSidebarTreeModule( parentTree ),
+ : TQObject( 0L, name ), KonqSidebarTreeModule( parentTree ),
m_dict( 349 ),
m_topLevelItem( 0L ),
m_dlg( 0L ),
@@ -51,10 +51,10 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
s_settings->readSettings( true );
}
- connect( s_settings, SIGNAL( settingsChanged() ), SLOT( slotSettingsChanged() ));
+ connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() ));
m_dict.setAutoDelete( true );
- m_currentTime = QDateTime::currentDateTime();
+ m_currentTime = TQDateTime::currentDateTime();
KConfig *kc = KGlobal::config();
KConfigGroupSaver cs( kc, "HistorySettings" );
@@ -63,35 +63,35 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
KonqHistoryManager *manager = KonqHistoryManager::kself();
- connect( manager, SIGNAL( loadingFinished() ), SLOT( slotCreateItems() ));
- connect( manager, SIGNAL( cleared() ), SLOT( clear() ));
+ connect( manager, TQT_SIGNAL( loadingFinished() ), TQT_SLOT( slotCreateItems() ));
+ connect( manager, TQT_SIGNAL( cleared() ), TQT_SLOT( clear() ));
- connect( manager, SIGNAL( entryAdded( const KonqHistoryEntry * ) ),
- SLOT( slotEntryAdded( const KonqHistoryEntry * ) ));
- connect( manager, SIGNAL( entryRemoved( const KonqHistoryEntry *) ),
- SLOT( slotEntryRemoved( const KonqHistoryEntry *) ));
+ connect( manager, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * ) ),
+ TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * ) ));
+ connect( manager, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry *) ),
+ TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry *) ));
- connect( parentTree, SIGNAL( expanded( QListViewItem * )),
- SLOT( slotItemExpanded( QListViewItem * )));
+ connect( parentTree, TQT_SIGNAL( expanded( TQListViewItem * )),
+ TQT_SLOT( slotItemExpanded( TQListViewItem * )));
m_collection = new KActionCollection( this, "history actions" );
(void) new KAction( i18n("New &Window"), "window_new", 0, this,
- SLOT( slotNewWindow() ), m_collection, "open_new");
+ TQT_SLOT( slotNewWindow() ), m_collection, "open_new");
(void) new KAction( i18n("&Remove Entry"), "editdelete", 0, this,
- SLOT( slotRemoveEntry() ), m_collection, "remove");
+ TQT_SLOT( slotRemoveEntry() ), m_collection, "remove");
(void) new KAction( i18n("C&lear History"), "history_clear", 0, this,
- SLOT( slotClearHistory() ), m_collection, "clear");
+ TQT_SLOT( slotClearHistory() ), m_collection, "clear");
(void) new KAction( i18n("&Preferences..."), "configure", 0, this,
- SLOT( slotPreferences()), m_collection, "preferences");
+ TQT_SLOT( slotPreferences()), m_collection, "preferences");
KRadioAction *sort;
sort = new KRadioAction( i18n("By &Name"), 0, this,
- SLOT( slotSortByName() ), m_collection, "byName");
+ TQT_SLOT( slotSortByName() ), m_collection, "byName");
sort->setExclusiveGroup("SortGroup");
sort->setChecked( m_sortsByName );
sort = new KRadioAction( i18n("By &Date"), 0, this,
- SLOT( slotSortByDate() ), m_collection, "byDate");
+ TQT_SLOT( slotSortByDate() ), m_collection, "byDate");
sort->setExclusiveGroup("SortGroup");
sort->setChecked( !m_sortsByName );
@@ -104,7 +104,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
KonqSidebarHistoryModule::~KonqSidebarHistoryModule()
{
HistoryItemIterator it( m_dict );
- QStringList openGroups;
+ TQStringList openGroups;
while ( it.current() ) {
if ( it.current()->isOpen() )
openGroups.append( it.currentKey() );
@@ -125,14 +125,14 @@ void KonqSidebarHistoryModule::slotSettingsChanged()
void KonqSidebarHistoryModule::slotCreateItems()
{
- QApplication::setOverrideCursor( KCursor::waitCursor() );
+ TQApplication::setOverrideCursor( KCursor::waitCursor() );
clear();
KonqSidebarHistoryItem *item;
KonqHistoryEntry *entry;
KonqHistoryList entries( KonqHistoryManager::kself()->entries() );
KonqHistoryIterator it( entries );
- m_currentTime = QDateTime::currentDateTime();
+ m_currentTime = TQDateTime::currentDateTime();
// the group item and the item of the serverroot '/' get a fav-icon
// if available. All others get the protocol icon.
@@ -145,8 +145,8 @@ void KonqSidebarHistoryModule::slotCreateItems()
KConfig *kc = KGlobal::config();
KConfigGroupSaver cs( kc, "HistorySettings" );
- QStringList openGroups = kc->readListEntry("OpenGroups");
- QStringList::Iterator it2 = openGroups.begin();
+ TQStringList openGroups = kc->readListEntry("OpenGroups");
+ TQStringList::Iterator it2 = openGroups.begin();
KonqSidebarHistoryGroupItem *group;
while ( it2 != openGroups.end() ) {
group = m_dict.find( *it2 );
@@ -156,7 +156,7 @@ void KonqSidebarHistoryModule::slotCreateItems()
++it2;
}
- QApplication::restoreOverrideCursor();
+ TQApplication::restoreOverrideCursor();
m_initialized = true;
}
@@ -171,7 +171,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry )
if ( !m_initialized )
return;
- m_currentTime = QDateTime::currentDateTime();
+ m_currentTime = TQDateTime::currentDateTime();
KonqSidebarHistoryGroupItem *group = getGroupItem( entry->url );
KonqSidebarHistoryItem *item = group->findChild( entry );
if ( !item )
@@ -179,7 +179,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry )
else
item->update( entry );
- // QListView scrolls when calling sort(), so we have to hack around that
+ // TQListView scrolls when calling sort(), so we have to hack around that
// (we don't want no scrolling every time an entry is added)
KonqSidebarTree *t = tree();
t->lockScrolling( true );
@@ -194,7 +194,7 @@ void KonqSidebarHistoryModule::slotEntryRemoved( const KonqHistoryEntry *entry )
if ( !m_initialized )
return;
- QString groupKey = groupForURL( entry->url );
+ TQString groupKey = groupForURL( entry->url );
KonqSidebarHistoryGroupItem *group = m_dict.find( groupKey );
if ( !group )
return;
@@ -211,7 +211,7 @@ void KonqSidebarHistoryModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it
}
bool KonqSidebarHistoryModule::handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *,
- const QPoint& pos )
+ const TQPoint& pos )
{
showPopupMenu( ModuleContextMenu, pos );
return true;
@@ -219,16 +219,16 @@ bool KonqSidebarHistoryModule::handleTopLevelContextMenu( KonqSidebarTreeTopLeve
void KonqSidebarHistoryModule::showPopupMenu()
{
- showPopupMenu( EntryContextMenu | ModuleContextMenu, QCursor::pos() );
+ showPopupMenu( EntryContextMenu | ModuleContextMenu, TQCursor::pos() );
}
-void KonqSidebarHistoryModule::showPopupMenu( int which, const QPoint& pos )
+void KonqSidebarHistoryModule::showPopupMenu( int which, const TQPoint& pos )
{
- QPopupMenu *sortMenu = new QPopupMenu;
+ TQPopupMenu *sortMenu = new QPopupMenu;
m_collection->action("byName")->plug( sortMenu );
m_collection->action("byDate")->plug( sortMenu );
- QPopupMenu *menu = new QPopupMenu;
+ TQPopupMenu *menu = new QPopupMenu;
if ( which & EntryContextMenu )
{
@@ -252,7 +252,7 @@ void KonqSidebarHistoryModule::slotNewWindow()
{
kdDebug(1201)<<"void KonqSidebarHistoryModule::slotNewWindow()"<<endl;
- QListViewItem *item = tree()->selectedItem();
+ TQListViewItem *item = tree()->selectedItem();
KonqSidebarHistoryItem *hi = dynamic_cast<KonqSidebarHistoryItem*>( item );
if ( hi )
{
@@ -263,7 +263,7 @@ void KonqSidebarHistoryModule::slotNewWindow()
void KonqSidebarHistoryModule::slotRemoveEntry()
{
- QListViewItem *item = tree()->selectedItem();
+ TQListViewItem *item = tree()->selectedItem();
KonqSidebarHistoryItem *hi = dynamic_cast<KonqSidebarHistoryItem*>( item );
if ( hi ) // remove a single entry
KonqHistoryManager::kself()->emitRemoveFromHistory( hi->externalURL());
@@ -303,7 +303,7 @@ void KonqSidebarHistoryModule::sortingChanged()
kc->sync();
}
-void KonqSidebarHistoryModule::slotItemExpanded( QListViewItem *item )
+void KonqSidebarHistoryModule::slotItemExpanded( TQListViewItem *item )
{
if ( item == m_topLevelItem && !m_initialized )
slotCreateItems();
@@ -323,12 +323,12 @@ void KonqSidebarHistoryModule::groupOpened( KonqSidebarHistoryGroupItem *item, b
KonqSidebarHistoryGroupItem * KonqSidebarHistoryModule::getGroupItem( const KURL& url )
{
- const QString& groupKey = groupForURL( url );
+ const TQString& groupKey = groupForURL( url );
KonqSidebarHistoryGroupItem *group = m_dict.find( groupKey );
if ( !group ) {
group = new KonqSidebarHistoryGroupItem( url, m_topLevelItem );
- QString icon = KonqFavIconMgr::iconForURL( url.url() );
+ TQString icon = KonqFavIconMgr::iconForURL( url.url() );
if ( icon.isEmpty() )
group->setPixmap( 0, m_folderClosed );
else
diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h
index 30295fc3f..752ff57fd 100644
--- a/konqueror/sidebar/trees/history_module/history_module.h
+++ b/konqueror/sidebar/trees/history_module/history_module.h
@@ -19,10 +19,10 @@
#ifndef HISTORY_MODULE_H
#define HISTORY_MODULE_H
-#include <qdatetime.h>
-#include <qobject.h>
-#include <qdict.h>
-#include <qpixmap.h>
+#include <tqdatetime.h>
+#include <tqobject.h>
+#include <tqdict.h>
+#include <tqpixmap.h>
#include <kglobal.h>
#include <klocale.h>
@@ -36,7 +36,7 @@ class KonqSidebarHistorySettings;
class KonqSidebarTree;
class KonqSidebarTreeItem;
-class KonqSidebarHistoryModule : public QObject, public KonqSidebarTreeModule
+class KonqSidebarHistoryModule : public TQObject, public KonqSidebarTreeModule
{
Q_OBJECT
@@ -50,18 +50,18 @@ public:
virtual ~KonqSidebarHistoryModule();
virtual void addTopLevelItem( KonqSidebarTreeTopLevelItem * item );
- virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *item, const QPoint& pos );
+ virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *item, const TQPoint& pos );
- void showPopupMenu( int which, const QPoint& pos );
+ void showPopupMenu( int which, const TQPoint& pos );
// called by the items
void showPopupMenu();
void groupOpened( KonqSidebarHistoryGroupItem *item, bool open );
- const QDateTime& currentTime() const { return m_currentTime; }
+ const TQDateTime& currentTime() const { return m_currentTime; }
bool sortsByName() const { return m_sortsByName; }
- static QString groupForURL( const KURL& url ) {
- static const QString& misc = KGlobal::staticQString(i18n("Miscellaneous"));
+ static TQString groupForURL( const KURL& url ) {
+ static const TQString& misc = KGlobal::staticQString(i18n("Miscellaneous"));
return url.host().isEmpty() ? misc : url.host();
}
@@ -78,7 +78,7 @@ private slots:
void slotPreferences();
void slotSettingsChanged();
- void slotItemExpanded( QListViewItem * );
+ void slotItemExpanded( TQListViewItem * );
void slotSortByName();
void slotSortByDate();
@@ -89,19 +89,19 @@ private:
KonqSidebarHistoryGroupItem *getGroupItem( const KURL& url );
void sortingChanged();
- typedef QDictIterator<KonqSidebarHistoryGroupItem> HistoryItemIterator;
- QDict<KonqSidebarHistoryGroupItem> m_dict;
+ typedef TQDictIterator<KonqSidebarHistoryGroupItem> HistoryItemIterator;
+ TQDict<KonqSidebarHistoryGroupItem> m_dict;
KonqSidebarTreeTopLevelItem * m_topLevelItem;
KActionCollection *m_collection;
KDialogBase *m_dlg;
- QPixmap m_folderClosed;
- QPixmap m_folderOpen;
+ TQPixmap m_folderClosed;
+ TQPixmap m_folderOpen;
bool m_initialized;
bool m_sortsByName;
- QDateTime m_currentTime; // used for sorting the items by date
+ TQDateTime m_currentTime; // used for sorting the items by date
static KonqSidebarHistorySettings *s_settings;
};
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index ed8bc7756..6871415a0 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -6,22 +6,22 @@
#include "history_settings.h"
-KonqSidebarHistorySettings::KonqSidebarHistorySettings( QObject *parent, const char *name )
- : QObject( parent, name ),
+KonqSidebarHistorySettings::KonqSidebarHistorySettings( TQObject *parent, const char *name )
+ : TQObject( parent, name ),
DCOPObject( "KonqSidebarHistorySettings" )
{
m_fontOlderThan.setItalic( true ); // default
}
KonqSidebarHistorySettings::KonqSidebarHistorySettings()
- : QObject(),
+ : TQObject(),
DCOPObject( "KonqSidebarHistorySettings" )
{
m_fontOlderThan.setItalic( true ); // default
}
KonqSidebarHistorySettings::KonqSidebarHistorySettings( const KonqSidebarHistorySettings& s )
- : QObject(),
+ : TQObject(),
DCOPObject( "KonqSidebarHistorySettings" )
{
m_valueYoungerThan = s.m_valueYoungerThan;
@@ -43,7 +43,7 @@ KonqSidebarHistorySettings::~KonqSidebarHistorySettings()
void KonqSidebarHistorySettings::readSettings(bool global)
{
KConfig *config;
- QString oldgroup;
+ TQString oldgroup;
if (global) {
config = KGlobal::config();
@@ -56,9 +56,9 @@ void KonqSidebarHistorySettings::readSettings(bool global)
m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 );
m_valueOlderThan = config->readNumEntry("Value olderThan", 2 );
- QString minutes = QString::fromLatin1("minutes");
- QString days = QString::fromLatin1("days");
- QString metric = config->readEntry("Metric youngerThan", days );
+ TQString minutes = TQString::fromLatin1("minutes");
+ TQString days = TQString::fromLatin1("days");
+ TQString metric = config->readEntry("Metric youngerThan", days );
m_metricYoungerThan = (metric == days) ? DAYS : MINUTES;
metric = config->readEntry("Metric olderThan", days );
m_metricOlderThan = (metric == days) ? DAYS : MINUTES;
@@ -83,8 +83,8 @@ void KonqSidebarHistorySettings::applySettings()
config->writeEntry("Value youngerThan", m_valueYoungerThan );
config->writeEntry("Value olderThan", m_valueOlderThan );
- QString minutes = QString::fromLatin1("minutes");
- QString days = QString::fromLatin1("days");
+ TQString minutes = TQString::fromLatin1("minutes");
+ TQString days = TQString::fromLatin1("days");
config->writeEntry("Metric youngerThan", m_metricYoungerThan == DAYS ?
days : minutes );
config->writeEntry("Metric olderThan", m_metricOlderThan == DAYS ?
@@ -99,7 +99,7 @@ void KonqSidebarHistorySettings::applySettings()
// notify konqueror instances about the new configuration
kapp->dcopClient()->send( "konqueror*", "KonqSidebarHistorySettings",
- "notifySettingsChanged()", QByteArray() );
+ "notifySettingsChanged()", TQByteArray() );
}
void KonqSidebarHistorySettings::notifySettingsChanged()
diff --git a/konqueror/sidebar/trees/history_module/history_settings.h b/konqueror/sidebar/trees/history_module/history_settings.h
index 21bcd01db..7b7d75006 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.h
+++ b/konqueror/sidebar/trees/history_module/history_settings.h
@@ -20,12 +20,12 @@
#ifndef HISTORY_SETTINGS_H
#define HISTORY_SETTINGS_H
-#include <qfont.h>
-#include <qobject.h>
+#include <tqfont.h>
+#include <tqobject.h>
#include <dcopobject.h>
-class KonqSidebarHistorySettings : public QObject, public DCOPObject
+class KonqSidebarHistorySettings : public TQObject, public DCOPObject
{
K_DCOP
Q_OBJECT
@@ -33,7 +33,7 @@ class KonqSidebarHistorySettings : public QObject, public DCOPObject
public:
enum { MINUTES, DAYS };
- KonqSidebarHistorySettings( QObject *parent, const char *name );
+ KonqSidebarHistorySettings( TQObject *parent, const char *name );
virtual ~KonqSidebarHistorySettings();
void readSettings(bool global);
@@ -47,8 +47,8 @@ public:
bool m_detailedTips;
- QFont m_fontYoungerThan;
- QFont m_fontOlderThan;
+ TQFont m_fontYoungerThan;
+ TQFont m_fontOlderThan;
signals:
void settingsChanged();
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index e4b31b232..ccedf65d9 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -20,11 +20,11 @@
* along with this program; if not, write to the Free Software
*/
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
#include <dcopclient.h>
#include <dcopref.h>
@@ -45,10 +45,10 @@
#include "kcmhistory.h"
#include "history_settings.h"
-typedef KGenericFactory<HistorySidebarConfig, QWidget > KCMHistoryFactory;
+typedef KGenericFactory<HistorySidebarConfig, TQWidget > KCMHistoryFactory;
K_EXPORT_COMPONENT_FACTORY (kcm_history, KCMHistoryFactory("kcmhistory") )
-HistorySidebarConfig::HistorySidebarConfig( QWidget *parent, const char* name, const QStringList & )
+HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name, const TQStringList & )
: KCModule (KCMHistoryFactory::instance(), parent, name)
{
KGlobal::locale()->insertCatalogue("konqueror");
@@ -56,7 +56,7 @@ HistorySidebarConfig::HistorySidebarConfig( QWidget *parent, const char* name, c
m_settings = new KonqSidebarHistorySettings( 0, "history settings" );
m_settings->readSettings( false );
- QVBoxLayout *topLayout = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
dialog = new KonqSidebarHistoryDlg(this);
dialog->spinEntries->setRange( 0, INT_MAX, 1, false );
@@ -75,33 +75,33 @@ HistorySidebarConfig::HistorySidebarConfig( QWidget *parent, const char* name, c
dialog->comboOlder->insertItem( i18n("Days"),
KonqSidebarHistorySettings::DAYS );
- connect( dialog->cbExpire, SIGNAL( toggled( bool )),
- dialog->spinExpire, SLOT( setEnabled( bool )));
- connect( dialog->spinExpire, SIGNAL( valueChanged( int )),
- this, SLOT( slotExpireChanged( int )));
-
- connect( dialog->spinNewer, SIGNAL( valueChanged( int )),
- SLOT( slotNewerChanged( int )));
- connect( dialog->spinOlder, SIGNAL( valueChanged( int )),
- SLOT( slotOlderChanged( int )));
-
- connect( dialog->btnFontNewer, SIGNAL( clicked() ),
- SLOT( slotGetFontNewer() ));
- connect( dialog->btnFontOlder, SIGNAL( clicked() ),
- SLOT( slotGetFontOlder() ));
- connect( dialog->btnClearHistory, SIGNAL( clicked() ),
- SLOT( slotClearHistory() ));
-
- connect( dialog->cbDetailedTips, SIGNAL( toggled( bool )),
- SLOT( configChanged() ));
- connect( dialog->cbExpire, SIGNAL( toggled( bool )),
- SLOT( configChanged() ));
- connect( dialog->spinEntries, SIGNAL( valueChanged( int )),
- SLOT( configChanged() ));
- connect( dialog->comboNewer, SIGNAL( activated( int )),
- SLOT( configChanged() ));
- connect( dialog->comboOlder, SIGNAL( activated( int )),
- SLOT( configChanged() ));
+ connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )),
+ dialog->spinExpire, TQT_SLOT( setEnabled( bool )));
+ connect( dialog->spinExpire, TQT_SIGNAL( valueChanged( int )),
+ this, TQT_SLOT( slotExpireChanged( int )));
+
+ connect( dialog->spinNewer, TQT_SIGNAL( valueChanged( int )),
+ TQT_SLOT( slotNewerChanged( int )));
+ connect( dialog->spinOlder, TQT_SIGNAL( valueChanged( int )),
+ TQT_SLOT( slotOlderChanged( int )));
+
+ connect( dialog->btnFontNewer, TQT_SIGNAL( clicked() ),
+ TQT_SLOT( slotGetFontNewer() ));
+ connect( dialog->btnFontOlder, TQT_SIGNAL( clicked() ),
+ TQT_SLOT( slotGetFontOlder() ));
+ connect( dialog->btnClearHistory, TQT_SIGNAL( clicked() ),
+ TQT_SLOT( slotClearHistory() ));
+
+ connect( dialog->cbDetailedTips, TQT_SIGNAL( toggled( bool )),
+ TQT_SLOT( configChanged() ));
+ connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )),
+ TQT_SLOT( configChanged() ));
+ connect( dialog->spinEntries, TQT_SIGNAL( valueChanged( int )),
+ TQT_SLOT( configChanged() ));
+ connect( dialog->comboNewer, TQT_SIGNAL( activated( int )),
+ TQT_SLOT( configChanged() ));
+ connect( dialog->comboOlder, TQT_SIGNAL( activated( int )),
+ TQT_SLOT( configChanged() ));
dialog->show();
topLayout->add(dialog);
@@ -152,17 +152,17 @@ void HistorySidebarConfig::save()
config.writeEntry( "Maximum of History entries", count );
config.writeEntry( "Maximum age of History entries", age );
- QByteArray dataAge;
- QDataStream streamAge( dataAge, IO_WriteOnly );
+ TQByteArray dataAge;
+ TQDataStream streamAge( dataAge, IO_WriteOnly );
streamAge << age << "foo";
kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
- "notifyMaxAge(Q_UINT32, QCString)", dataAge );
+ "notifyMaxAge(Q_UINT32, TQCString)", dataAge );
- QByteArray dataCount;
- QDataStream streamCount( dataCount, IO_WriteOnly );
+ TQByteArray dataCount;
+ TQDataStream streamCount( dataCount, IO_WriteOnly );
streamCount << count << "foo";
kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
- "notifyMaxCount(Q_UINT32, QCString)", dataCount );
+ "notifyMaxCount(Q_UINT32, TQCString)", dataCount );
m_settings->m_valueYoungerThan = dialog->spinNewer->value();
m_settings->m_valueOlderThan = dialog->spinOlder->value();
@@ -194,14 +194,14 @@ void HistorySidebarConfig::defaults()
dialog->cbDetailedTips->setChecked( true );
- m_fontNewer = QFont();
+ m_fontNewer = TQFont();
m_fontNewer.setItalic( true );
- m_fontOlder = QFont();
+ m_fontOlder = TQFont();
emit changed(true);
}
-QString HistorySidebarConfig::quickHelp() const
+TQString HistorySidebarConfig::quickHelp() const
{
return i18n("<h1>History Sidebar</h1>"
" You can configure the history sidebar here.");
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.h b/konqueror/sidebar/trees/history_module/kcmhistory.h
index 5eaaf3a64..0e354af65 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.h
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.h
@@ -32,13 +32,13 @@ class HistorySidebarConfig : public KCModule
Q_OBJECT
public:
- HistorySidebarConfig( QWidget *parent=0, const char* name=0, const QStringList &list=QStringList() );
+ HistorySidebarConfig( TQWidget *parent=0, const char* name=0, const TQStringList &list=TQStringList() );
void load();
void save();
void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
private slots:
void configChanged();
@@ -53,8 +53,8 @@ private slots:
void slotClearHistory();
private:
- QFont m_fontNewer;
- QFont m_fontOlder;
+ TQFont m_fontNewer;
+ TQFont m_fontOlder;
KonqSidebarHistoryDlg* dialog;
KonqSidebarHistorySettings *m_settings;
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index e30e21ac9..8117d5223 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -20,12 +20,12 @@
#include "konq_sidebartreemodule.h"
-#include <qclipboard.h>
-#include <qcursor.h>
-#include <qdir.h>
-#include <qheader.h>
-#include <qpopupmenu.h>
-#include <qtimer.h>
+#include <tqclipboard.h>
+#include <tqcursor.h>
+#include <tqdir.h>
+#include <tqheader.h>
+#include <tqpopupmenu.h>
+#include <tqtimer.h>
#include <dcopclient.h>
#include <dcopref.h>
@@ -53,18 +53,18 @@
static const int autoOpenTimeout = 750;
-getModule KonqSidebarTree::getPluginFactory(QString name)
+getModule KonqSidebarTree::getPluginFactory(TQString name)
{
if (!pluginFactories.contains(name))
{
KLibLoader *loader = KLibLoader::self();
- QString libName = pluginInfo[name];
- KLibrary *lib = loader->library(QFile::encodeName(libName));
+ TQString libName = pluginInfo[name];
+ KLibrary *lib = loader->library(TQFile::encodeName(libName));
if (lib)
{
// get the create_ function
- QString factory = "create_" + libName;
- void *create = lib->symbol(QFile::encodeName(factory));
+ TQString factory = "create_" + libName;
+ void *create = lib->symbol(TQFile::encodeName(factory));
if (create)
{
getModule func = (getModule)create;
@@ -88,15 +88,15 @@ void KonqSidebarTree::loadModuleFactories()
pluginFactories.clear();
pluginInfo.clear();
KStandardDirs *dirs=KGlobal::dirs();
- QStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
+ TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
- for (QStringList::ConstIterator it=list.begin();it!=list.end();++it)
+ for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it)
{
KSimpleConfig ksc(*it);
ksc.setGroup("Desktop Entry");
- QString name = ksc.readEntry("X-KDE-TreeModule");
- QString libName = ksc.readEntry("X-KDE-TreeModule-Lib");
+ TQString name = ksc.readEntry("X-KDE-TreeModule");
+ TQString libName = ksc.readEntry("X-KDE-TreeModule-Lib");
if ((name.isEmpty()) || (libName.isEmpty()))
{kdWarning()<<"Bad Configuration file for a dirtree module "<<*it<<endl; continue;}
@@ -110,11 +110,11 @@ class KonqSidebarTree_Internal
{
public:
DropAcceptType m_dropMode;
- QStringList m_dropFormats;
+ TQStringList m_dropFormats;
};
-KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, QWidget *parentWidget, int virt, const QString& path )
+KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path )
: KListView( parentWidget ),
m_currentTopLevelItem( 0 ),
m_toolTip( this ),
@@ -130,46 +130,46 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, QWidget *parentWidge
viewport()->setAcceptDrops( true );
m_lstModules.setAutoDelete( true );
- setSelectionMode( QListView::Single );
+ setSelectionMode( TQListView::Single );
setDragEnabled(true);
m_part = parent;
- m_animationTimer = new QTimer( this );
- connect( m_animationTimer, SIGNAL( timeout() ),
- this, SLOT( slotAnimation() ) );
+ m_animationTimer = new TQTimer( this );
+ connect( m_animationTimer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( slotAnimation() ) );
m_currentBeforeDropItem = 0;
m_dropItem = 0;
m_bOpeningFirstChild=false;
- addColumn( QString::null );
+ addColumn( TQString::null );
header()->hide();
setTreeStepSize(15);
- m_autoOpenTimer = new QTimer( this );
- connect( m_autoOpenTimer, SIGNAL( timeout() ),
- this, SLOT( slotAutoOpenFolder() ) );
+ m_autoOpenTimer = new TQTimer( this );
+ connect( m_autoOpenTimer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( slotAutoOpenFolder() ) );
- connect( this, SIGNAL( doubleClicked( QListViewItem * ) ),
- this, SLOT( slotDoubleClicked( QListViewItem * ) ) );
- connect( this, SIGNAL( mouseButtonPressed(int, QListViewItem*, const QPoint&, int)),
- this, SLOT( slotMouseButtonPressed(int, QListViewItem*, const QPoint&, int)) );
- connect( this, SIGNAL( mouseButtonClicked( int, QListViewItem*, const QPoint&, int ) ),
- this, SLOT( slotMouseButtonClicked( int, QListViewItem*, const QPoint&, int ) ) );
- connect( this, SIGNAL( returnPressed( QListViewItem * ) ),
- this, SLOT( slotDoubleClicked( QListViewItem * ) ) );
- connect( this, SIGNAL( selectionChanged() ),
- this, SLOT( slotSelectionChanged() ) );
+ connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
+ this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
+ connect( this, TQT_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
+ this, TQT_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) );
+ connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ),
+ this, TQT_SLOT( slotMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) );
+ connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
+ this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
+ connect( this, TQT_SIGNAL( selectionChanged() ),
+ this, TQT_SLOT( slotSelectionChanged() ) );
- connect( this, SIGNAL(itemRenamed(QListViewItem*, const QString &, int)),
- this, SLOT(slotItemRenamed(QListViewItem*, const QString &, int)));
+ connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)),
+ this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int)));
/* assert( m_part->getInterfaces()->getInstance()->dirs );
- QString dirtreeDir = m_part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); */
+ TQString dirtreeDir = m_part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); */
// assert( KGlobal::dirs() );
-// QString dirtreeDir = part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" );
+// TQString dirtreeDir = part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" );
if (virt==VIRT_Folder)
{
@@ -190,7 +190,7 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, QWidget *parentWidge
m_bOpeningFirstChild = false;
}
- setFrameStyle( QFrame::ToolBarPanel | QFrame::Raised );
+ setFrameStyle( TQFrame::ToolBarPanel | TQFrame::Raised );
}
KonqSidebarTree::~KonqSidebarTree()
@@ -210,7 +210,7 @@ void KonqSidebarTree::itemDestructed( KonqSidebarTreeItem *item )
}
}
-void KonqSidebarTree::setDropFormats(const QStringList &formats)
+void KonqSidebarTree::setDropFormats(const TQStringList &formats)
{
d->m_dropFormats = formats;
}
@@ -244,7 +244,7 @@ void KonqSidebarTree::followURL( const KURL &url )
}
kdDebug(1201) << "KonqDirTree::followURL: " << url.url() << endl;
- QPtrListIterator<KonqSidebarTreeTopLevelItem> topItem ( m_topLevelItems );
+ TQPtrListIterator<KonqSidebarTreeTopLevelItem> topItem ( m_topLevelItems );
for (; topItem.current(); ++topItem )
{
if ( topItem.current()->externalURL().isParentOf( url ) )
@@ -256,7 +256,7 @@ void KonqSidebarTree::followURL( const KURL &url )
kdDebug(1201) << "KonqDirTree::followURL: Not found" << endl;
}
-void KonqSidebarTree::contentsDragEnterEvent( QDragEnterEvent *ev )
+void KonqSidebarTree::contentsDragEnterEvent( TQDragEnterEvent *ev )
{
m_dropItem = 0;
m_currentBeforeDropItem = selectedItem();
@@ -267,9 +267,9 @@ void KonqSidebarTree::contentsDragEnterEvent( QDragEnterEvent *ev )
m_lstDropFormats.append( ev->format( i ) );
}
-void KonqSidebarTree::contentsDragMoveEvent( QDragMoveEvent *e )
+void KonqSidebarTree::contentsDragMoveEvent( TQDragMoveEvent *e )
{
- QListViewItem *item = itemAt( contentsToViewport( e->pos() ) );
+ TQListViewItem *item = itemAt( contentsToViewport( e->pos() ) );
// Accept drops on the background, if URLs
if ( !item && m_lstDropFormats.contains("text/uri-list") )
@@ -308,7 +308,7 @@ void KonqSidebarTree::contentsDragMoveEvent( QDragMoveEvent *e )
}
}
-void KonqSidebarTree::contentsDragLeaveEvent( QDragLeaveEvent *ev )
+void KonqSidebarTree::contentsDragLeaveEvent( TQDragLeaveEvent *ev )
{
// Restore the current item to what it was before the dragging (#17070)
if ( m_currentBeforeDropItem )
@@ -324,7 +324,7 @@ void KonqSidebarTree::contentsDragLeaveEvent( QDragLeaveEvent *ev )
}
}
-void KonqSidebarTree::contentsDropEvent( QDropEvent *ev )
+void KonqSidebarTree::contentsDropEvent( TQDropEvent *ev )
{
if (d->m_dropMode == SidebarTreeMode) {
m_autoOpenTimer->stop();
@@ -352,23 +352,23 @@ void KonqSidebarTree::contentsDropEvent( QDropEvent *ev )
}
}
-static QString findUniqueFilename(const QString &path, QString filename)
+static TQString findUniqueFilename(const TQString &path, TQString filename)
{
if (filename.endsWith(".desktop"))
filename.truncate(filename.length()-8);
- QString name = filename;
+ TQString name = filename;
int n = 2;
- while(QFile::exists(path + filename + ".desktop"))
+ while(TQFile::exists(path + filename + ".desktop"))
{
- filename = QString("%2_%1").arg(n++).arg(name);
+ filename = TQString("%2_%1").arg(n++).arg(name);
}
return path+filename+".desktop";
}
void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url)
{
- QString path;
+ TQString path;
if (item)
path = item->path();
else
@@ -378,23 +378,23 @@ void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url
if (url.isLocalFile() && url.fileName().endsWith(".desktop"))
{
- QString filename = findUniqueFilename(path, url.fileName());
+ TQString filename = findUniqueFilename(path, url.fileName());
destUrl.setPath(filename);
KIO::NetAccess::copy(url, destUrl, this);
}
else
{
- QString name = url.host();
+ TQString name = url.host();
if (name.isEmpty())
name = url.fileName();
- QString filename = findUniqueFilename(path, name);
+ TQString filename = findUniqueFilename(path, name);
destUrl.setPath(filename);
KDesktopFile cfg(filename);
cfg.writeEntry("Encoding", "UTF-8");
cfg.writeEntry("Type","Link");
cfg.writeEntry("URL", url.url());
- QString icon = "folder";
+ TQString icon = "folder";
if (!url.isLocalFile())
icon = KMimeType::favIconForURL(url);
if (icon.isEmpty())
@@ -413,7 +413,7 @@ void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url
item->setOpen(true);
}
-bool KonqSidebarTree::acceptDrag(QDropEvent* e) const
+bool KonqSidebarTree::acceptDrag(TQDropEvent* e) const
{
// for KListViewMode...
for( int i = 0; e->format( i ); i++ )
@@ -422,31 +422,31 @@ bool KonqSidebarTree::acceptDrag(QDropEvent* e) const
return false;
}
-QDragObject* KonqSidebarTree::dragObject()
+TQDragObject* KonqSidebarTree::dragObject()
{
KonqSidebarTreeItem* item = static_cast<KonqSidebarTreeItem *>( selectedItem() );
if ( !item )
return 0;
- QDragObject* drag = item->dragObject( viewport(), false );
+ TQDragObject* drag = item->dragObject( viewport(), false );
if ( !drag )
return 0;
- const QPixmap *pix = item->pixmap(0);
+ const TQPixmap *pix = item->pixmap(0);
if ( pix && drag->pixmap().isNull() )
drag->setPixmap( *pix );
return drag;
}
-void KonqSidebarTree::leaveEvent( QEvent *e )
+void KonqSidebarTree::leaveEvent( TQEvent *e )
{
KListView::leaveEvent( e );
-// emitStatusBarText( QString::null );
+// emitStatusBarText( TQString::null );
}
-void KonqSidebarTree::slotDoubleClicked( QListViewItem *item )
+void KonqSidebarTree::slotDoubleClicked( TQListViewItem *item )
{
//kdDebug(1201) << "KonqSidebarTree::slotDoubleClicked " << item << endl;
if ( !item )
@@ -459,7 +459,7 @@ void KonqSidebarTree::slotDoubleClicked( QListViewItem *item )
item->setOpen( !item->isOpen() );
}
-void KonqSidebarTree::slotExecuted( QListViewItem *item )
+void KonqSidebarTree::slotExecuted( TQListViewItem *item )
{
kdDebug(1201) << "KonqSidebarTree::slotExecuted " << item << endl;
if ( !item )
@@ -479,7 +479,7 @@ void KonqSidebarTree::slotExecuted( QListViewItem *item )
openURLRequest( externalURL, args );
}
-void KonqSidebarTree::slotMouseButtonPressed( int _button, QListViewItem* _item, const QPoint&, int col )
+void KonqSidebarTree::slotMouseButtonPressed( int _button, TQListViewItem* _item, const TQPoint&, int col )
{
KonqSidebarTreeItem * item = static_cast<KonqSidebarTreeItem*>( _item );
if (_button == RightButton)
@@ -492,7 +492,7 @@ void KonqSidebarTree::slotMouseButtonPressed( int _button, QListViewItem* _item,
}
}
-void KonqSidebarTree::slotMouseButtonClicked(int _button, QListViewItem* _item, const QPoint&, int col)
+void KonqSidebarTree::slotMouseButtonClicked(int _button, TQListViewItem* _item, const TQPoint&, int col)
{
KonqSidebarTreeItem * item = static_cast<KonqSidebarTreeItem*>(_item);
if(_item && col < 2)
@@ -554,7 +554,7 @@ void KonqSidebarTree::FilesAdded( const KURL & dir )
kdDebug(1201) << "KonqSidebarTree::FilesAdded " << dir.url() << endl;
if ( m_dirtreeDir.dir.isParentOf( dir ) )
// We use a timer in case of DCOP re-entrance..
- QTimer::singleShot( 0, this, SLOT( rescanConfiguration() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) );
}
void KonqSidebarTree::FilesRemoved( const KURL::List & urls )
@@ -565,7 +565,7 @@ void KonqSidebarTree::FilesRemoved( const KURL::List & urls )
//kdDebug(1201) << "KonqSidebarTree::FilesRemoved " << (*it).prettyURL() << endl;
if ( m_dirtreeDir.dir.isParentOf( *it ) )
{
- QTimer::singleShot( 0, this, SLOT( rescanConfiguration() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) );
kdDebug(1201) << "KonqSidebarTree::FilesRemoved done" << endl;
return;
}
@@ -579,17 +579,17 @@ void KonqSidebarTree::FilesChanged( const KURL::List & urls )
FilesRemoved( urls );
}
-void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const QString &path, bool isRoot )
+void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path, bool isRoot )
{
- QDir dir( path );
+ TQDir dir( path );
if ( !dir.isReadable() )
return;
kdDebug(1201) << "scanDir " << path << endl;
- QStringList entries = dir.entryList( QDir::Files );
- QStringList dirEntries = dir.entryList( QDir::Dirs | QDir::NoSymLinks );
+ TQStringList entries = dir.entryList( TQDir::Files );
+ TQStringList dirEntries = dir.entryList( TQDir::Dirs | TQDir::NoSymLinks );
dirEntries.remove( "." );
dirEntries.remove( ".." );
@@ -606,7 +606,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const QString &path,
// Version 5 includes the audiocd browser
// Version 6 includes the printmanager and lan browser
const int currentVersion = 6;
- QString key = QString::fromLatin1("X-KDE-DirTreeVersionNumber");
+ TQString key = TQString::fromLatin1("X-KDE-DirTreeVersionNumber");
KSimpleConfig versionCfg( path + "/.directory" );
int versionNumber = versionCfg.readNumEntry( key, 1 );
kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl;
@@ -620,64 +620,64 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const QString &path,
if (copyConfig)
{
// We will copy over the configuration for the dirtree, from the global directory
- QStringList dirtree_dirs = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/");
+ TQStringList dirtree_dirs = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/");
-// QString dirtree_dir = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/").last(); // most global
+// TQString dirtree_dir = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/").last(); // most global
// kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir=" << dirtree_dir << endl;
/*
// debug code
- QStringList blah = m_part->getInterfaces->getInstance()->dirs()->dirs()->findDirs( "data", "konqueror/dirtree" );
- QStringList::ConstIterator eIt = blah.begin();
- QStringList::ConstIterator eEnd = blah.end();
+ TQStringList blah = m_part->getInterfaces->getInstance()->dirs()->dirs()->findDirs( "data", "konqueror/dirtree" );
+ TQStringList::ConstIterator eIt = blah.begin();
+ TQStringList::ConstIterator eEnd = blah.end();
for (; eIt != eEnd; ++eIt )
kdDebug(1201) << "KonqSidebarTree::scanDir findDirs got me " << *eIt << endl;
// end debug code
*/
- for (QStringList::const_iterator ddit=dirtree_dirs.begin();ddit!=dirtree_dirs.end();++ddit) {
- QString dirtree_dir=*ddit;
+ for (TQStringList::const_iterator ddit=dirtree_dirs.begin();ddit!=dirtree_dirs.end();++ddit) {
+ TQString dirtree_dir=*ddit;
if (dirtree_dir==path) continue;
// if ( !dirtree_dir.isEmpty() && dirtree_dir != path )
{
- QDir globalDir( dirtree_dir );
+ TQDir globalDir( dirtree_dir );
Q_ASSERT( globalDir.isReadable() );
// Only copy the entries that don't exist yet in the local dir
- QStringList globalDirEntries = globalDir.entryList();
- QStringList::ConstIterator eIt = globalDirEntries.begin();
- QStringList::ConstIterator eEnd = globalDirEntries.end();
+ TQStringList globalDirEntries = globalDir.entryList();
+ TQStringList::ConstIterator eIt = globalDirEntries.begin();
+ TQStringList::ConstIterator eEnd = globalDirEntries.end();
for (; eIt != eEnd; ++eIt )
{
//kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl;
if ( *eIt != "." && *eIt != ".."
&& !entries.contains( *eIt ) && !dirEntries.contains( *eIt ) )
{ // we don't have that one yet -> copy it.
- QString cp("cp -R -- ");
+ TQString cp("cp -R -- ");
cp += KProcess::quote(dirtree_dir + *eIt);
cp += " ";
cp += KProcess::quote(path);
kdDebug(1201) << "KonqSidebarTree::scanDir executing " << cp << endl;
- ::system( QFile::encodeName(cp) );
+ ::system( TQFile::encodeName(cp) );
}
}
}
}
- // hack to make QDir refresh the lists
+ // hack to make TQDir refresh the lists
dir.setPath(path);
- entries = dir.entryList( QDir::Files );
- dirEntries = dir.entryList( QDir::Dirs );
+ entries = dir.entryList( TQDir::Files );
+ dirEntries = dir.entryList( TQDir::Dirs );
dirEntries.remove( "." );
dirEntries.remove( ".." );
}
}
- QStringList::ConstIterator eIt = entries.begin();
- QStringList::ConstIterator eEnd = entries.end();
+ TQStringList::ConstIterator eIt = entries.begin();
+ TQStringList::ConstIterator eEnd = entries.end();
for (; eIt != eEnd; ++eIt )
{
- QString filePath = QString( *eIt ).prepend( path );
+ TQString filePath = TQString( *eIt ).prepend( path );
KURL u;
u.setPath( filePath );
if ( KMimeType::findByURL( u, 0, true )->name() == "application/x-desktop" )
@@ -689,7 +689,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const QString &path,
for (; eIt != eEnd; eIt++ )
{
- QString newPath = QString( path ).append( *eIt ).append( '/' );
+ TQString newPath = TQString( path ).append( *eIt ).append( '/' );
if ( newPath == KGlobalSettings::autostartPath() )
continue;
@@ -698,18 +698,18 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const QString &path,
}
}
-void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const QString &path )
+void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const TQString &path )
{
- QDir dir( path );
- QString name = dir.dirName();
- QString icon = "folder";
+ TQDir dir( path );
+ TQString name = dir.dirName();
+ TQString icon = "folder";
bool open = false;
kdDebug(1201) << "Scanning " << path << endl;
- QString dotDirectoryFile = QString( path ).append( "/.directory" );
+ TQString dotDirectoryFile = TQString( path ).append( "/.directory" );
- if ( QFile::exists( dotDirectoryFile ) )
+ if ( TQFile::exists( dotDirectoryFile ) )
{
kdDebug(1201) << "Reading the .directory" << endl;
KSimpleConfig cfg( dotDirectoryFile, true );
@@ -745,15 +745,15 @@ void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const QStr
item->setExpandable( false );
}
-void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const QString &filename )
+void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const TQString &filename )
{
KDesktopFile cfg( filename, true );
cfg.setDollarExpansion(true);
- QFileInfo inf( filename );
+ TQFileInfo inf( filename );
- QString path = filename;
- QString name = KIO::decodeFileName( inf.fileName() );
+ TQString path = filename;
+ TQString name = KIO::decodeFileName( inf.fileName() );
if ( name.length() > 8 && name.right( 8 ) == ".desktop" )
name.truncate( name.length() - 8 );
if ( name.length() > 7 && name.right( 7 ) == ".kdelnk" )
@@ -764,8 +764,8 @@ void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const QStr
// Here's where we need to create the right module...
// ### TODO: make this KTrader/KLibrary based.
- QString moduleName = cfg.readEntry( "X-KDE-TreeModule" );
- QString showHidden=cfg.readEntry("X-KDE-TreeModule-ShowHidden");
+ TQString moduleName = cfg.readEntry( "X-KDE-TreeModule" );
+ TQString showHidden=cfg.readEntry("X-KDE-TreeModule-ShowHidden");
if (moduleName.isEmpty()) moduleName="Directory";
kdDebug(1201) << "##### Loading module: " << moduleName << " file: " << filename << endl;
@@ -806,7 +806,7 @@ void KonqSidebarTree::slotAnimation()
for (; it != end; ++it )
{
uint & iconNumber = it.data().iconNumber;
- QString icon = QString::fromLatin1( it.data().iconBaseName ).append( QString::number( iconNumber ) );
+ TQString icon = TQString::fromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) );
it.key()->setPixmap( 0, SmallIcon( icon));
iconNumber++;
@@ -816,9 +816,9 @@ void KonqSidebarTree::slotAnimation()
}
-void KonqSidebarTree::startAnimation( KonqSidebarTreeItem * item, const char * iconBaseName, uint iconCount, const QPixmap * originalPixmap )
+void KonqSidebarTree::startAnimation( KonqSidebarTreeItem * item, const char * iconBaseName, uint iconCount, const TQPixmap * originalPixmap )
{
- const QPixmap *pix = originalPixmap ? originalPixmap : item->pixmap(0);
+ const TQPixmap *pix = originalPixmap ? originalPixmap : item->pixmap(0);
if (pix)
{
m_mapCurrentOpeningFolders.insert( item, AnimationInfo( iconBaseName, iconCount, *pix ) );
@@ -851,7 +851,7 @@ void KonqSidebarTree::setContentsPos( int x, int y )
KListView::setContentsPos( x, y );
}
-void KonqSidebarTree::slotItemRenamed(QListViewItem* item, const QString &name, int col)
+void KonqSidebarTree::slotItemRenamed(TQListViewItem* item, const TQString &name, int col)
{
Q_ASSERT(col==0);
if (col != 0) return;
@@ -881,7 +881,7 @@ bool KonqSidebarTree::tabSupport()
QCStringList funcs;
reply.get(funcs, "QCStringList");
for (QCStringList::ConstIterator it = funcs.begin(); it != funcs.end(); ++it) {
- if ((*it) == "void newTab(QString url)") {
+ if ((*it) == "void newTab(TQString url)") {
return true;
break;
}
@@ -901,24 +901,24 @@ void KonqSidebarTree::showToplevelContextMenu()
{
m_collection = new KActionCollection( this, "bookmark actions" );
(void) new KAction( i18n("&Create New Folder..."), "folder_new", 0, this,
- SLOT( slotCreateFolder() ), m_collection, "create_folder");
+ TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
(void) new KAction( i18n("Delete Folder"), "editdelete", 0, this,
- SLOT( slotDelete() ), m_collection, "delete_folder");
+ TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
(void) new KAction( i18n("Rename"), 0, this,
- SLOT( slotRename() ), m_collection, "rename");
+ TQT_SLOT( slotRename() ), m_collection, "rename");
(void) new KAction( i18n("Delete Link"), "editdelete", 0, this,
- SLOT( slotDelete() ), m_collection, "delete_link");
+ TQT_SLOT( slotDelete() ), m_collection, "delete_link");
(void) new KAction( i18n("Properties"), "edit", 0, this,
- SLOT( slotProperties() ), m_collection, "item_properties");
+ TQT_SLOT( slotProperties() ), m_collection, "item_properties");
(void) new KAction( i18n("Open in New Window"), "window_new", 0, this,
- SLOT( slotOpenNewWindow() ), m_collection, "open_window");
+ TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
(void) new KAction( i18n("Open in New Tab"), "tab_new", 0, this,
- SLOT( slotOpenTab() ), m_collection, "open_tab");
+ TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
(void) new KAction( i18n("Copy Link Address"), "editcopy", 0, this,
- SLOT( slotCopyLocation() ), m_collection, "copy_location");
+ TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
}
- QPopupMenu *menu = new QPopupMenu;
+ TQPopupMenu *menu = new QPopupMenu;
if (item) {
if (item->isTopLevelGroup()) {
@@ -943,7 +943,7 @@ void KonqSidebarTree::showToplevelContextMenu()
m_currentTopLevelItem = item;
- menu->exec( QCursor::pos() );
+ menu->exec( TQCursor::pos() );
delete menu;
m_currentTopLevelItem = 0;
@@ -951,8 +951,8 @@ void KonqSidebarTree::showToplevelContextMenu()
void KonqSidebarTree::slotCreateFolder()
{
- QString path;
- QString name = i18n("New Folder");
+ TQString path;
+ TQString name = i18n("New Folder");
while(true)
{
@@ -971,7 +971,7 @@ void KonqSidebarTree::slotCreateFolder()
path = path + name;
- if (!QFile::exists(path))
+ if (!TQFile::exists(path))
break;
name = name + "-2";
@@ -1017,7 +1017,7 @@ void KonqSidebarTree::slotOpenTab()
{
if (!m_currentTopLevelItem) return;
DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name());
- ref.call( "newTab(QString)", m_currentTopLevelItem->externalURL().url() );
+ ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() );
}
void KonqSidebarTree::slotCopyLocation()
@@ -1032,11 +1032,11 @@ void KonqSidebarTree::slotCopyLocation()
///////////////////////////////////////////////////////////////////
-void KonqSidebarTreeToolTip::maybeTip( const QPoint &point )
+void KonqSidebarTreeToolTip::maybeTip( const TQPoint &point )
{
- QListViewItem *item = m_view->itemAt( point );
+ TQListViewItem *item = m_view->itemAt( point );
if ( item ) {
- QString text = static_cast<KonqSidebarTreeItem*>( item )->toolTipText();
+ TQString text = static_cast<KonqSidebarTreeItem*>( item )->toolTipText();
if ( !text.isEmpty() )
tip ( m_view->itemRect( item ), text );
}
diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h
index cc2035466..b536355ba 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.h
+++ b/konqueror/sidebar/trees/konq_sidebartree.h
@@ -24,10 +24,10 @@
#include "konq_sidebartreetoplevelitem.h"
#include "konqsidebar_tree.h"
#include <kdirnotify.h>
-#include <qmap.h>
-#include <qpoint.h>
-#include <qstrlist.h>
-#include <qtooltip.h>
+#include <tqmap.h>
+#include <tqpoint.h>
+#include <tqstrlist.h>
+#include <tqtooltip.h>
class KonqSidebarTreeModule;
class KonqSidebarTreeItem;
@@ -46,20 +46,20 @@ typedef struct DirTreeConfigData_
{
KURL dir;
int type;
- QString relDir;
+ TQString relDir;
} DirTreeConfigData;
class KonqSidebarTreeToolTip : public QToolTip
{
public:
- KonqSidebarTreeToolTip( QListView *view ) : QToolTip( view->viewport() ), m_view( view ) {}
+ KonqSidebarTreeToolTip( TQListView *view ) : TQToolTip( view->viewport() ), m_view( view ) {}
protected:
- virtual void maybeTip( const QPoint & );
+ virtual void maybeTip( const TQPoint & );
private:
- QListView *m_view;
+ TQListView *m_view;
};
typedef enum {
@@ -77,7 +77,7 @@ class KonqSidebarTree : public KListView, public KDirNotify
{
Q_OBJECT
public:
- KonqSidebarTree( KonqSidebar_Tree *parent, QWidget *parentWidget, int virt, const QString& path );
+ KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path );
virtual ~KonqSidebarTree();
void followURL( const KURL &url );
@@ -87,7 +87,7 @@ public:
*/
KonqSidebarTreeItem * currentItem() const;
- void startAnimation( KonqSidebarTreeItem * item, const char * iconBaseName = "kde", uint iconCount = 6, const QPixmap * originalPixmap = 0L );
+ void startAnimation( KonqSidebarTreeItem * item, const char * iconBaseName = "kde", uint iconCount = 6, const TQPixmap * originalPixmap = 0L );
void stopAnimation( KonqSidebarTreeItem * item );
// Reimplemented from KDirNotify
@@ -106,7 +106,7 @@ public:
void itemDestructed( KonqSidebarTreeItem *item );
- void setDropFormats( const QStringList &formats ); // used in KListView mode
+ void setDropFormats( const TQStringList &formats ); // used in KListView mode
// Show context menu for toplevel items
void showToplevelContextMenu();
@@ -121,21 +121,21 @@ public slots:
virtual void setContentsPos( int x, int y );
protected:
- virtual void contentsDragEnterEvent( QDragEnterEvent *e );
- virtual void contentsDragMoveEvent( QDragMoveEvent *e );
- virtual void contentsDragLeaveEvent( QDragLeaveEvent *e );
- virtual void contentsDropEvent( QDropEvent *ev );
- virtual bool acceptDrag(QDropEvent* e) const; // used in KListView mode
+ virtual void contentsDragEnterEvent( TQDragEnterEvent *e );
+ virtual void contentsDragMoveEvent( TQDragMoveEvent *e );
+ virtual void contentsDragLeaveEvent( TQDragLeaveEvent *e );
+ virtual void contentsDropEvent( TQDropEvent *ev );
+ virtual bool acceptDrag(TQDropEvent* e) const; // used in KListView mode
- virtual void leaveEvent( QEvent * );
+ virtual void leaveEvent( TQEvent * );
- virtual QDragObject* dragObject();
+ virtual TQDragObject* dragObject();
private slots:
- void slotDoubleClicked( QListViewItem *item );
- void slotExecuted( QListViewItem *item );
- void slotMouseButtonPressed(int _button, QListViewItem* _item, const QPoint&, int col);
- void slotMouseButtonClicked(int _button, QListViewItem* _item, const QPoint&, int col);
+ void slotDoubleClicked( TQListViewItem *item );
+ void slotExecuted( TQListViewItem *item );
+ void slotMouseButtonPressed(int _button, TQListViewItem* _item, const TQPoint&, int col);
+ void slotMouseButtonClicked(int _button, TQListViewItem* _item, const TQPoint&, int col);
void slotSelectionChanged();
void slotAnimation();
@@ -144,7 +144,7 @@ private slots:
void rescanConfiguration();
- void slotItemRenamed(QListViewItem*, const QString &, int);
+ void slotItemRenamed(TQListViewItem*, const TQString &, int);
void slotCreateFolder();
void slotDelete();
@@ -156,41 +156,41 @@ private slots:
private:
void clearTree();
- void scanDir( KonqSidebarTreeItem *parent, const QString &path, bool isRoot = false );
- void loadTopLevelGroup( KonqSidebarTreeItem *parent, const QString &path );
- void loadTopLevelItem( KonqSidebarTreeItem *parent, const QString &filename );
+ void scanDir( KonqSidebarTreeItem *parent, const TQString &path, bool isRoot = false );
+ void loadTopLevelGroup( KonqSidebarTreeItem *parent, const TQString &path );
+ void loadTopLevelItem( KonqSidebarTreeItem *parent, const TQString &filename );
void loadModuleFactories();
private:
- QPtrList<KonqSidebarTreeTopLevelItem> m_topLevelItems;
+ TQPtrList<KonqSidebarTreeTopLevelItem> m_topLevelItems;
KonqSidebarTreeTopLevelItem *m_currentTopLevelItem;
- QPtrList<KonqSidebarTreeModule> m_lstModules;
+ TQPtrList<KonqSidebarTreeModule> m_lstModules;
KonqSidebarPlugin *m_part;
struct AnimationInfo
{
- AnimationInfo( const char * _iconBaseName, uint _iconCount, const QPixmap & _originalPixmap )
+ AnimationInfo( const char * _iconBaseName, uint _iconCount, const TQPixmap & _originalPixmap )
: iconBaseName(_iconBaseName), iconCount(_iconCount), iconNumber(1), originalPixmap(_originalPixmap) {}
AnimationInfo() : iconCount(0) {}
- QCString iconBaseName;
+ TQCString iconBaseName;
uint iconCount;
uint iconNumber;
- QPixmap originalPixmap;
+ TQPixmap originalPixmap;
};
- typedef QMap<KonqSidebarTreeItem *, AnimationInfo> MapCurrentOpeningFolders;
+ typedef TQMap<KonqSidebarTreeItem *, AnimationInfo> MapCurrentOpeningFolders;
MapCurrentOpeningFolders m_mapCurrentOpeningFolders;
- QTimer *m_animationTimer;
+ TQTimer *m_animationTimer;
- QListViewItem *m_currentBeforeDropItem; // The item that was current before the drag-enter event happened
- QListViewItem *m_dropItem; // The item we are moving the mouse over (during a drag)
- QStrList m_lstDropFormats;
+ TQListViewItem *m_currentBeforeDropItem; // The item that was current before the drag-enter event happened
+ TQListViewItem *m_dropItem; // The item we are moving the mouse over (during a drag)
+ TQStrList m_lstDropFormats;
- QTimer *m_autoOpenTimer;
+ TQTimer *m_autoOpenTimer;
// The base URL for our configuration directory
//KURL m_dirtreeDir;
@@ -199,10 +199,10 @@ private:
KonqSidebarTreeToolTip m_toolTip;
bool m_scrollingLocked;
- getModule getPluginFactory(QString name);
+ getModule getPluginFactory(TQString name);
- QMap<QString, QString> pluginInfo;
- QMap<QString, getModule> pluginFactories;
+ TQMap<TQString, TQString> pluginInfo;
+ TQMap<TQString, getModule> pluginFactories;
bool m_bOpeningFirstChild;
KActionCollection *m_collection;
@@ -216,9 +216,9 @@ signals:
#define signals protected
void openURLRequest( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() );
void createNewWindow( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() );
- void popupMenu( const QPoint &global, const KURL &url,
- const QString &mimeType, mode_t mode = (mode_t)-1 );
- void popupMenu( const QPoint &global, const KFileItemList &items );
+ void popupMenu( const TQPoint &global, const KURL &url,
+ const TQString &mimeType, mode_t mode = (mode_t)-1 );
+ void popupMenu( const TQPoint &global, const KFileItemList &items );
void enableAction( const char * name, bool enabled );
};
diff --git a/konqueror/sidebar/trees/konq_sidebartreeitem.cpp b/konqueror/sidebar/trees/konq_sidebartreeitem.cpp
index daa0ae777..cc3f83950 100644
--- a/konqueror/sidebar/trees/konq_sidebartreeitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreeitem.cpp
@@ -22,13 +22,13 @@
//#include "konq_sidebartreepart.h"
KonqSidebarTreeItem::KonqSidebarTreeItem( KonqSidebarTreeItem *parentItem, KonqSidebarTreeTopLevelItem *topLevelItem )
- : QListViewItem( parentItem )
+ : TQListViewItem( parentItem )
{
initItem( topLevelItem );
}
KonqSidebarTreeItem::KonqSidebarTreeItem( KonqSidebarTree *parent, KonqSidebarTreeTopLevelItem *topLevelItem )
- : QListViewItem( parent )
+ : TQListViewItem( parent )
{
initItem( topLevelItem );
}
diff --git a/konqueror/sidebar/trees/konq_sidebartreeitem.h b/konqueror/sidebar/trees/konq_sidebartreeitem.h
index ef6f73931..0cb7a7d12 100644
--- a/konqueror/sidebar/trees/konq_sidebartreeitem.h
+++ b/konqueror/sidebar/trees/konq_sidebartreeitem.h
@@ -20,8 +20,8 @@
#ifndef konq_treeitem_h
#define konq_treeitem_h
-#include <qlistview.h>
-#include <qstringlist.h>
+#include <tqlistview.h>
+#include <tqstringlist.h>
#include <kurl.h>
class QPainter;
@@ -48,14 +48,14 @@ public:
virtual ~KonqSidebarTreeItem();
// Whether the item accepts a drop consisting in those @p formats
- virtual bool acceptsDrops( const QStrList & ) { return false; }
+ virtual bool acceptsDrops( const TQStrList & ) { return false; }
// Handle a drop on this item. If you didn't want it, you shouln't
// have return true in acceptsDrops :)
- virtual void drop( QDropEvent * ) {}
+ virtual void drop( TQDropEvent * ) {}
// Create a drag object from this item.
- virtual QDragObject * dragObject( QWidget * parent, bool move = false ) = 0;
+ virtual TQDragObject * dragObject( TQWidget * parent, bool move = false ) = 0;
virtual void middleButtonClicked();
virtual void rightButtonPressed() = 0;
@@ -65,17 +65,17 @@ public:
virtual void del() {}
virtual void shred() {}
virtual void rename() {}
- virtual void rename( const QString& ) {}
+ virtual void rename( const TQString& ) {}
// The URL to open when this link is clicked
virtual KURL externalURL() const = 0;
// The mimetype to use when this link is clicked
- // If unknown, return QString::null, konq will determine the mimetype itself
- virtual QString externalMimeType() const { return QString::null; }
+ // If unknown, return TQString::null, konq will determine the mimetype itself
+ virtual TQString externalMimeType() const { return TQString::null; }
// overwrite this if you want a tooltip shown on your item
- virtual QString toolTipText() const { return QString::null; }
+ virtual TQString toolTipText() const { return TQString::null; }
// Called when this item is selected
// Reimplement, and call tree()->part()->extension()->enableActions(...)
@@ -100,10 +100,10 @@ public:
// returns the tree inside which this item is
KonqSidebarTree *tree() const;
- virtual QString key( int column, bool ) const { return text( column ).lower(); }
+ virtual TQString key( int column, bool ) const { return text( column ).lower(); }
// List of alternative names (URLs) this entry is known under
- QStringList alias;
+ TQStringList alias;
protected:
// Create an item at the toplevel - only for toplevel items -> protected
KonqSidebarTreeItem( KonqSidebarTree *parent, KonqSidebarTreeTopLevelItem *topLevelItem );
diff --git a/konqueror/sidebar/trees/konq_sidebartreemodule.h b/konqueror/sidebar/trees/konq_sidebartreemodule.h
index 9f9863311..80d3ea062 100644
--- a/konqueror/sidebar/trees/konq_sidebartreemodule.h
+++ b/konqueror/sidebar/trees/konq_sidebartreemodule.h
@@ -19,7 +19,7 @@
#ifndef konq_treemodule_h
#define konq_treemodule_h
-#include <qobject.h>
+#include <tqobject.h>
#include "konq_sidebartree.h"
class QDragObject;
class KonqSidebarTreeItem;
@@ -53,7 +53,7 @@ public:
bool showHidden() { return m_showHidden;}
virtual void setShowHidden(bool showhidden) {m_showHidden=showhidden;}
- virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const QPoint& ) { return false; }
+ virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const TQPoint& ) { return false; }
protected:
KonqSidebarTree * m_pTree;
diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
index d71959c1e..4ce6fe445 100644
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
@@ -25,14 +25,14 @@
#include <kprotocolinfo.h>
#include <kurldrag.h>
#include <kmimetype.h>
-#include <qapplication.h>
-#include <qclipboard.h>
-#include <qcursor.h>
+#include <tqapplication.h>
+#include <tqclipboard.h>
+#include <tqcursor.h>
#include <konq_drag.h>
void KonqSidebarTreeTopLevelItem::init()
{
- QString desktopFile = m_path;
+ TQString desktopFile = m_path;
if ( isTopLevelGroup() )
desktopFile += "/.directory";
KSimpleConfig cfg( desktopFile, true );
@@ -50,18 +50,18 @@ void KonqSidebarTreeTopLevelItem::setOpen( bool open )
void KonqSidebarTreeTopLevelItem::itemSelected()
{
kdDebug() << "KonqSidebarTreeTopLevelItem::itemSelected" << endl;
- QMimeSource *data = QApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::clipboard()->data();
bool paste = m_bTopLevelGroup && data->provides("text/uri-list");
tree()->enableActions( true, true, paste, true, true, true /*rename*/ );
}
-bool KonqSidebarTreeTopLevelItem::acceptsDrops( const QStrList & formats )
+bool KonqSidebarTreeTopLevelItem::acceptsDrops( const TQStrList & formats )
{
return formats.contains("text/uri-list") &&
( m_bTopLevelGroup || !externalURL().isEmpty() );
}
-void KonqSidebarTreeTopLevelItem::drop( QDropEvent * ev )
+void KonqSidebarTreeTopLevelItem::drop( TQDropEvent * ev )
{
if ( m_bTopLevelGroup )
{
@@ -85,7 +85,7 @@ void KonqSidebarTreeTopLevelItem::drop( QDropEvent * ev )
}
}
-QDragObject * KonqSidebarTreeTopLevelItem::dragObject( QWidget * parent, bool move )
+TQDragObject * KonqSidebarTreeTopLevelItem::dragObject( TQWidget * parent, bool move )
{
// 100% duplicated from KonqDirTreeItem::dragObject :(
KURL::List lst;
@@ -95,10 +95,10 @@ QDragObject * KonqSidebarTreeTopLevelItem::dragObject( QWidget * parent, bool mo
KonqDrag * drag = KonqDrag::newDrag( lst, false, parent );
- const QPixmap * pix = pixmap(0);
+ const TQPixmap * pix = pixmap(0);
if (pix)
{
- QPoint hotspot( pix->width() / 2, pix->height() / 2 );
+ TQPoint hotspot( pix->width() / 2, pix->height() / 2 );
drag->setPixmap( *pix, hotspot );
}
drag->setMoveSelection( move );
@@ -121,7 +121,7 @@ void KonqSidebarTreeTopLevelItem::rightButtonPressed()
// i.e. the filename instead of the Name field). There's the Rename item for that.
// Only missing thing is changing the URL of a link. Hmm...
- if ( !module() || !module()->handleTopLevelContextMenu( this, QCursor::pos() ) )
+ if ( !module() || !module()->handleTopLevelContextMenu( this, TQCursor::pos() ) )
{
tree()->showToplevelContextMenu();
}
@@ -157,7 +157,7 @@ void KonqSidebarTreeTopLevelItem::paste()
{
// move or not move ?
bool move = false;
- QMimeSource *data = QApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::clipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1201) << "move (from clipboard data) = " << move << endl;
@@ -177,7 +177,7 @@ void KonqSidebarTreeTopLevelItem::rename()
tree()->rename( this, 0 );
}
-void KonqSidebarTreeTopLevelItem::rename( const QString & name )
+void KonqSidebarTreeTopLevelItem::rename( const TQString & name )
{
KURL url;
url.setPath( m_path );
@@ -186,7 +186,7 @@ void KonqSidebarTreeTopLevelItem::rename( const QString & name )
// of the .directory or desktop file
//KonqOperations::rename( tree(), url, name );
- QString desktopFile = m_path;
+ TQString desktopFile = m_path;
if ( isTopLevelGroup() )
desktopFile += "/.directory";
KSimpleConfig cfg( desktopFile );
@@ -201,7 +201,7 @@ void KonqSidebarTreeTopLevelItem::rename( const QString & name )
allDirNotify.FilesChanged( lst );
}
-QString KonqSidebarTreeTopLevelItem::toolTipText() const
+TQString KonqSidebarTreeTopLevelItem::toolTipText() const
{
return m_comment;
}
diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.h b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.h
index fc67e274e..6e20e7e03 100644
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.h
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.h
@@ -38,7 +38,7 @@ public:
* @param module the module handling this toplevel item
* @param path the path to the desktop file that was the reason for creating this item
*/
- KonqSidebarTreeTopLevelItem( KonqSidebarTree *parent, KonqSidebarTreeModule * module, const QString & path )
+ KonqSidebarTreeTopLevelItem( KonqSidebarTree *parent, KonqSidebarTreeModule * module, const TQString & path )
: KonqSidebarTreeItem(parent, 0L), m_module(module), m_path(path), m_bTopLevelGroup(false) { init(); }
/**
@@ -46,14 +46,14 @@ public:
* @param module the module handling this toplevel item
* @param path the path to the desktop file that was the reason for creating this item
*/
- KonqSidebarTreeTopLevelItem( KonqSidebarTreeItem *parentItem, KonqSidebarTreeModule * module, const QString & path )
+ KonqSidebarTreeTopLevelItem( KonqSidebarTreeItem *parentItem, KonqSidebarTreeModule * module, const TQString & path )
: KonqSidebarTreeItem( parentItem, 0L), m_module(module), m_path(path), m_bTopLevelGroup(false) { init(); }
void init();
- virtual bool acceptsDrops( const QStrList & formats );
- virtual void drop( QDropEvent * ev );
- virtual QDragObject * dragObject( QWidget * parent, bool move = false );
+ virtual bool acceptsDrops( const TQStrList & formats );
+ virtual void drop( TQDropEvent * ev );
+ virtual TQDragObject * dragObject( TQWidget * parent, bool move = false );
virtual void middleButtonClicked();
virtual void rightButtonPressed();
@@ -62,7 +62,7 @@ public:
virtual void del();
virtual void shred();
virtual void rename(); // start a rename operation
- virtual void rename( const QString & name ); // do the actual renaming
+ virtual void rename( const TQString & name ); // do the actual renaming
virtual void setOpen( bool open );
@@ -71,7 +71,7 @@ public:
virtual KURL externalURL() const { return m_externalURL; }
- virtual QString toolTipText() const;
+ virtual TQString toolTipText() const;
virtual void itemSelected();
@@ -87,13 +87,13 @@ public:
KonqSidebarTreeModule *module() const { return m_module; }
// The path to the desktop file responsible for this toplevel item
- QString path() const { return m_path; }
+ TQString path() const { return m_path; }
protected:
void delOperation( int method );
KonqSidebarTreeModule *m_module;
- QString m_path;
- QString m_comment;
+ TQString m_path;
+ TQString m_comment;
KURL m_externalURL;
bool m_bTopLevelGroup;
};
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 9b53f195d..219063026 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -8,12 +8,12 @@
#include <kiconloader.h>
#include <klistviewsearchline.h>
-#include <qclipboard.h>
-#include <qdragobject.h>
-#include <qtoolbutton.h>
-#include <qvbox.h>
+#include <tqclipboard.h>
+#include <tqdragobject.h>
+#include <tqtoolbutton.h>
+#include <tqvbox.h>
-KonqSidebar_Tree::KonqSidebar_Tree(KInstance *instance,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name):
+KonqSidebar_Tree::KonqSidebar_Tree(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name):
KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name)
{
KSimpleConfig ksc(desktopName_);
@@ -21,48 +21,48 @@ KonqSidebar_Tree::KonqSidebar_Tree(KInstance *instance,QObject *parent,QWidget *
int virt= ( (ksc.readEntry("X-KDE-TreeModule","")=="Virtual") ?VIRT_Folder:VIRT_Link);
if (virt==1) desktopName_=ksc.readEntry("X-KDE-RelURL","");
- widget = new QVBox(widgetParent);
+ widget = new TQVBox(widgetParent);
if (ksc.readBoolEntry("X-KDE-SearchableTreeModule",false)) {
- QHBox* searchline = new QHBox(widget);
+ TQHBox* searchline = new TQHBox(widget);
searchline->setSpacing(KDialog::spacingHint());
tree=new KonqSidebarTree(this,widget,virt,desktopName_);
- QToolButton *clearSearch = new QToolButton(searchline);
+ TQToolButton *clearSearch = new TQToolButton(searchline);
clearSearch->setTextLabel(i18n("Clear Search"), true);
- clearSearch->setIconSet(SmallIconSet(QApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
- QLabel* slbl = new QLabel(i18n("Se&arch:"), searchline);
+ clearSearch->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
+ TQLabel* slbl = new TQLabel(i18n("Se&arch:"), searchline);
KListViewSearchLine* listViewSearch = new KListViewSearchLine(searchline,tree);
slbl->setBuddy(listViewSearch);
- connect(clearSearch, SIGNAL(pressed()), listViewSearch, SLOT(clear()));
+ connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear()));
}
else
tree=new KonqSidebarTree(this,widget,virt,desktopName_);
- connect(tree, SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)),
- this,SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)));
+ connect(tree, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)),
+ this,TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)));
- connect(tree,SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
- this,SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)));
+ connect(tree,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
+ this,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)));
- connect(tree,SIGNAL(popupMenu( const QPoint &, const KURL &, const QString &, mode_t )),
- this,SIGNAL(popupMenu( const QPoint &, const KURL &, const QString &, mode_t )));
+ connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )),
+ this,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )));
- connect(tree,SIGNAL(popupMenu( const QPoint &, const KFileItemList & )),
- this,SIGNAL(popupMenu( const QPoint &, const KFileItemList & )));
+ connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
+ this,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )));
- connect(tree,SIGNAL(enableAction( const char *, bool )),
- this,SIGNAL(enableAction( const char *, bool)));
+ connect(tree,TQT_SIGNAL(enableAction( const char *, bool )),
+ this,TQT_SIGNAL(enableAction( const char *, bool)));
}
KonqSidebar_Tree::~KonqSidebar_Tree(){;}
-void* KonqSidebar_Tree::provides(const QString &) {return 0;}
+void* KonqSidebar_Tree::provides(const TQString &) {return 0;}
-//void KonqSidebar_Tree::emitStatusBarText (const QString &) {;}
+//void KonqSidebar_Tree::emitStatusBarText (const TQString &) {;}
-QWidget *KonqSidebar_Tree::getWidget(){return widget;}
+TQWidget *KonqSidebar_Tree::getWidget(){return widget;}
void KonqSidebar_Tree::handleURL(const KURL &url)
{
@@ -73,16 +73,16 @@ void KonqSidebar_Tree::handleURL(const KURL &url)
void KonqSidebar_Tree::cut()
{
- QDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L, true );
+ TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L, true );
if (drag)
- QApplication::clipboard()->setData( drag );
+ TQApplication::clipboard()->setData( drag );
}
void KonqSidebar_Tree::copy()
{
- QDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L );
+ TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L );
if (drag)
- QApplication::clipboard()->setData( drag );
+ TQApplication::clipboard()->setData( drag );
}
void KonqSidebar_Tree::paste()
@@ -123,7 +123,7 @@ void KonqSidebar_Tree::rename()
extern "C"
{
- KDE_EXPORT void* create_konqsidebar_tree(KInstance *inst,QObject *par,QWidget *widp,QString &desktopname,const char *name)
+ KDE_EXPORT void* create_konqsidebar_tree(KInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
{
return new KonqSidebar_Tree(inst,par,widp,desktopname,name);
}
@@ -131,19 +131,19 @@ extern "C"
extern "C"
{
- KDE_EXPORT bool add_konqsidebar_tree(QString* fn, QString*, QMap<QString,QString> *map)
+ KDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap<TQString,TQString> *map)
{
KStandardDirs *dirs=KGlobal::dirs();
- QStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
- QStringList names;
- for (QStringList::ConstIterator it=list.begin();it!=list.end();++it)
+ TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
+ TQStringList names;
+ for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it)
{
KSimpleConfig sc(*it);
sc.setGroup("Desktop Entry");
names<<sc.readEntry("Name");
}
- QString item = KInputDialog::getItem( i18n( "Select Type" ),
+ TQString item = KInputDialog::getItem( i18n( "Select Type" ),
i18n( "Select type:" ), names );
if (!item.isEmpty())
{
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h
index 968a59585..9b95897ff 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.h
+++ b/konqueror/sidebar/trees/konqsidebar_tree.h
@@ -1,16 +1,16 @@
#ifndef _konq_sidebar_test_h_
#define _konq_sidebar_test_h_
#include <konqsidebarplugin.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
#include <kparts/part.h>
#include <kparts/factory.h>
#include <kparts/browserextension.h>
#include <kdialogbase.h>
-#include <qcombobox.h>
-#include <qstringlist.h>
+#include <tqcombobox.h>
+#include <tqstringlist.h>
#include <klocale.h>
-#include <qlineedit.h>
+#include <tqlineedit.h>
class KonqSidebarTree;
class QVBox;
@@ -18,13 +18,13 @@ class KonqSidebar_Tree: public KonqSidebarPlugin
{
Q_OBJECT
public:
- KonqSidebar_Tree(KInstance *instance,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name=0);
+ KonqSidebar_Tree(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0);
~KonqSidebar_Tree();
- virtual void *provides(const QString &);
-// void emitStatusBarText (const QString &);
- virtual QWidget *getWidget();
+ virtual void *provides(const TQString &);
+// void emitStatusBarText (const TQString &);
+ virtual TQWidget *getWidget();
protected:
- class QVBox *widget;
+ class TQVBox *widget;
class KonqSidebarTree *tree;
virtual void handleURL(const KURL &url);
protected slots:
@@ -38,9 +38,9 @@ class KonqSidebar_Tree: public KonqSidebarPlugin
signals:
void openURLRequest( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() );
void createNewWindow( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() );
- void popupMenu( const QPoint &global, const KURL &url,
- const QString &mimeType, mode_t mode = (mode_t)-1 );
- void popupMenu( const QPoint &global, const KFileItemList &items );
+ void popupMenu( const TQPoint &global, const KURL &url,
+ const TQString &mimeType, mode_t mode = (mode_t)-1 );
+ void popupMenu( const TQPoint &global, const KFileItemList &items );
void enableAction( const char * name, bool enabled );
};
diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp
index ab77c40a0..2c8de18f8 100644
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@@ -17,10 +17,10 @@
*/
#include "web_module.h"
-#include <qfileinfo.h>
-#include <qhbox.h>
-#include <qspinbox.h>
-#include <qtimer.h>
+#include <tqfileinfo.h>
+#include <tqhbox.h>
+#include <tqspinbox.h>
+#include <tqtimer.h>
#include <dom/html_inline.h>
#include <kdebug.h>
@@ -32,34 +32,34 @@
#include <kstandarddirs.h>
-KonqSideBarWebModule::KonqSideBarWebModule(KInstance *instance, QObject *parent, QWidget *widgetParent, QString &desktopName, const char* name)
+KonqSideBarWebModule::KonqSideBarWebModule(KInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name)
: KonqSidebarPlugin(instance, parent, widgetParent, desktopName, name)
{
_htmlPart = new KHTMLSideBar(universalMode());
- connect(_htmlPart, SIGNAL(reload()), this, SLOT(reload()));
- connect(_htmlPart, SIGNAL(completed()), this, SLOT(pageLoaded()));
+ connect(_htmlPart, TQT_SIGNAL(reload()), this, TQT_SLOT(reload()));
+ connect(_htmlPart, TQT_SIGNAL(completed()), this, TQT_SLOT(pageLoaded()));
connect(_htmlPart,
- SIGNAL(setWindowCaption(const QString&)),
+ TQT_SIGNAL(setWindowCaption(const TQString&)),
this,
- SLOT(setTitle(const QString&)));
+ TQT_SLOT(setTitle(const TQString&)));
connect(_htmlPart,
- SIGNAL(openURLRequest(const QString&, KParts::URLArgs)),
+ TQT_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)),
this,
- SLOT(urlClicked(const QString&, KParts::URLArgs)));
+ TQT_SLOT(urlClicked(const TQString&, KParts::URLArgs)));
connect(_htmlPart->browserExtension(),
- SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
+ TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
this,
- SLOT(formClicked(const KURL&, const KParts::URLArgs&)));
+ TQT_SLOT(formClicked(const KURL&, const KParts::URLArgs&)));
connect(_htmlPart,
- SIGNAL(setAutoReload()), this, SLOT( setAutoReload() ));
+ TQT_SIGNAL(setAutoReload()), this, TQT_SLOT( setAutoReload() ));
connect(_htmlPart,
- SIGNAL(openURLNewWindow(const QString&, KParts::URLArgs)),
+ TQT_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)),
this,
- SLOT(urlNewWindow(const QString&, KParts::URLArgs)));
+ TQT_SLOT(urlNewWindow(const TQString&, KParts::URLArgs)));
connect(_htmlPart,
- SIGNAL(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)),
+ TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
this,
- SIGNAL(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)));
+ TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
_desktopName = desktopName;
@@ -69,7 +69,7 @@ KonqSideBarWebModule::KonqSideBarWebModule(KInstance *instance, QObject *parent,
_url = ksc.readPathEntry("URL");
_htmlPart->openURL(_url );
// Must load this delayed
- QTimer::singleShot(0, this, SLOT(loadFavicon()));
+ TQTimer::singleShot(0, this, TQT_SLOT(loadFavicon()));
}
@@ -79,18 +79,18 @@ KonqSideBarWebModule::~KonqSideBarWebModule() {
}
-QWidget *KonqSideBarWebModule::getWidget() {
+TQWidget *KonqSideBarWebModule::getWidget() {
return _htmlPart->widget();
}
void KonqSideBarWebModule::setAutoReload(){
KDialogBase dlg(0, "", true, i18n("Set Refresh Timeout (0 disables)"),
KDialogBase::Ok|KDialogBase::Cancel);
- QHBox *hbox = dlg.makeHBoxMainWidget();
+ TQHBox *hbox = dlg.makeHBoxMainWidget();
- QSpinBox *mins = new QSpinBox( 0, 120, 1, hbox );
+ TQSpinBox *mins = new TQSpinBox( 0, 120, 1, hbox );
mins->setSuffix( i18n(" min") );
- QSpinBox *secs = new QSpinBox( 0, 59, 1, hbox );
+ TQSpinBox *secs = new TQSpinBox( 0, 59, 1, hbox );
secs->setSuffix( i18n(" sec") );
if( reloadTimeout > 0 ) {
@@ -99,7 +99,7 @@ void KonqSideBarWebModule::setAutoReload(){
mins->setValue( ( seconds - secs->value() ) / 60 );
}
- if( dlg.exec() == QDialog::Accepted ) {
+ if( dlg.exec() == TQDialog::Accepted ) {
int msec = ( mins->value() * 60 + secs->value() ) * 1000;
reloadTimeout = msec;
KSimpleConfig ksc(_desktopName);
@@ -109,7 +109,7 @@ void KonqSideBarWebModule::setAutoReload(){
}
}
-void *KonqSideBarWebModule::provides(const QString &) {
+void *KonqSideBarWebModule::provides(const TQString &) {
return 0L;
}
@@ -118,13 +118,13 @@ void KonqSideBarWebModule::handleURL(const KURL &) {
}
-void KonqSideBarWebModule::urlNewWindow(const QString& url, KParts::URLArgs args)
+void KonqSideBarWebModule::urlNewWindow(const TQString& url, KParts::URLArgs args)
{
emit createNewWindow(KURL(url), args);
}
-void KonqSideBarWebModule::urlClicked(const QString& url, KParts::URLArgs args)
+void KonqSideBarWebModule::urlClicked(const TQString& url, KParts::URLArgs args)
{
emit openURLRequest(KURL(url), args);
}
@@ -138,7 +138,7 @@ void KonqSideBarWebModule::formClicked(const KURL& url, const KParts::URLArgs& a
void KonqSideBarWebModule::loadFavicon() {
- QString icon = KonqPixmapProvider::iconForURL(_url.url());
+ TQString icon = KonqPixmapProvider::iconForURL(_url.url());
if (icon.isEmpty()) {
KonqFavIconMgr::downloadHostIcon(_url);
icon = KonqPixmapProvider::iconForURL(_url.url());
@@ -161,7 +161,7 @@ void KonqSideBarWebModule::reload() {
}
-void KonqSideBarWebModule::setTitle(const QString& title) {
+void KonqSideBarWebModule::setTitle(const TQString& title) {
if (!title.isEmpty()) {
emit setCaption(title);
@@ -176,27 +176,27 @@ void KonqSideBarWebModule::setTitle(const QString& title) {
void KonqSideBarWebModule::pageLoaded() {
if( reloadTimeout > 0 ) {
- QTimer::singleShot( reloadTimeout, this, SLOT( reload() ) );
+ TQTimer::singleShot( reloadTimeout, this, TQT_SLOT( reload() ) );
}
}
extern "C" {
- KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(KInstance *instance, QObject *parent, QWidget *widget, QString &desktopName, const char *name) {
+ KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(KInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) {
return new KonqSideBarWebModule(instance, parent, widget, desktopName, name);
}
}
extern "C" {
- KDE_EXPORT bool add_konqsidebar_web(QString* fn, QString* param, QMap<QString,QString> *map) {
+ KDE_EXPORT bool add_konqsidebar_web(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) {
Q_UNUSED(param);
KGlobal::dirs()->addResourceType("websidebardata", KStandardDirs::kde_default("data") + "konqsidebartng/websidebar");
KURL url;
url.setProtocol("file");
- QStringList paths = KGlobal::dirs()->resourceDirs("websidebardata");
- for (QStringList::Iterator i = paths.begin(); i != paths.end(); ++i) {
- if (QFileInfo(*i + "websidebar.html").exists()) {
+ TQStringList paths = KGlobal::dirs()->resourceDirs("websidebardata");
+ for (TQStringList::Iterator i = paths.begin(); i != paths.end(); ++i) {
+ if (TQFileInfo(*i + "websidebar.html").exists()) {
url.setPath(*i + "websidebar.html");
break;
}
diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h
index 58650b309..eb10414a9 100644
--- a/konqueror/sidebar/web_module/web_module.h
+++ b/konqueror/sidebar/web_module/web_module.h
@@ -25,7 +25,7 @@
#include <klocale.h>
#include <konqsidebarplugin.h>
#include <kpopupmenu.h>
-#include <qobject.h>
+#include <tqobject.h>
// A wrapper for KHTMLPart to make it behave the way we want it to.
@@ -41,9 +41,9 @@ class KHTMLSideBar : public KHTMLPart
setFormNotification(KHTMLPart::Only);
connect(this,
- SIGNAL(formSubmitNotification(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)),
+ TQT_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
this,
- SLOT(formProxy(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&))
+ TQT_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))
);
@@ -51,36 +51,36 @@ class KHTMLSideBar : public KHTMLPart
"link context menu");
if (!universal) {
_linkMenu->insertItem(i18n("&Open Link"),
- this, SLOT(loadPage()));
+ this, TQT_SLOT(loadPage()));
_linkMenu->insertItem(i18n("Open in New &Window"),
- this, SLOT(loadNewWindow()));
+ this, TQT_SLOT(loadNewWindow()));
} else {
_linkMenu->insertItem(i18n("Open in New &Window"),
- this, SLOT(loadPage()));
+ this, TQT_SLOT(loadPage()));
}
_menu = new KPopupMenu(widget(), "context menu");
_menu->insertItem(SmallIcon("reload"), i18n("&Reload"),
- this, SIGNAL(reload()));
- _menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"), this, SIGNAL(setAutoReload()));
+ this, TQT_SIGNAL(reload()));
+ _menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"), this, TQT_SIGNAL(setAutoReload()));
connect(this,
- SIGNAL(popupMenu(const QString&,const QPoint&)),
+ TQT_SIGNAL(popupMenu(const TQString&,const TQPoint&)),
this,
- SLOT(showMenu(const QString&, const QPoint&)));
+ TQT_SLOT(showMenu(const TQString&, const TQPoint&)));
}
virtual ~KHTMLSideBar() {}
signals:
- void submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&);
- void openURLRequest(const QString& url, KParts::URLArgs args);
- void openURLNewWindow(const QString& url, KParts::URLArgs args);
+ void submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&);
+ void openURLRequest(const TQString& url, KParts::URLArgs args);
+ void openURLNewWindow(const TQString& url, KParts::URLArgs args);
void reload();
void setAutoReload();
protected:
- virtual void urlSelected( const QString &url, int button,
- int state, const QString &_target,
+ virtual void urlSelected( const TQString &url, int button,
+ int state, const TQString &_target,
KParts::URLArgs args = KParts::URLArgs()) {
if (button == LeftButton ){
if (_target.lower() == "_self") {
@@ -116,7 +116,7 @@ class KHTMLSideBar : public KHTMLPart
KParts::URLArgs());
}
- void showMenu(const QString& url, const QPoint& pos) {
+ void showMenu(const TQString& url, const TQPoint& pos) {
if (url.isEmpty()) {
_menu->popup(pos);
} else {
@@ -126,15 +126,15 @@ class KHTMLSideBar : public KHTMLPart
}
void formProxy(const char *action,
- const QString& url,
- const QByteArray& formData,
- const QString& target,
- const QString& contentType,
- const QString& boundary) {
- QString t = target.lower();
- QString u;
-
- if (QCString(action).lower() != "post") {
+ const TQString& url,
+ const TQByteArray& formData,
+ const TQString& target,
+ const TQString& contentType,
+ const TQString& boundary) {
+ TQString t = target.lower();
+ TQString u;
+
+ if (TQCString(action).lower() != "post") {
// GET
KURL kurl = completeURL(url);
kurl.setQuery(formData.data());
@@ -157,7 +157,7 @@ class KHTMLSideBar : public KHTMLPart
}
private:
KPopupMenu *_menu, *_linkMenu;
- QString _lastUrl;
+ TQString _lastUrl;
};
@@ -166,28 +166,28 @@ class KonqSideBarWebModule : public KonqSidebarPlugin
{
Q_OBJECT
public:
- KonqSideBarWebModule(KInstance *instance, QObject *parent,
- QWidget *widgetParent, QString &desktopName,
+ KonqSideBarWebModule(KInstance *instance, TQObject *parent,
+ TQWidget *widgetParent, TQString &desktopName,
const char *name);
virtual ~KonqSideBarWebModule();
- virtual QWidget *getWidget();
- virtual void *provides(const QString &);
+ virtual TQWidget *getWidget();
+ virtual void *provides(const TQString &);
signals:
- void submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&);
+ void submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&);
void openURLRequest(const KURL &url, const KParts::URLArgs &args);
void createNewWindow(const KURL &url, const KParts::URLArgs &args);
protected:
virtual void handleURL(const KURL &url);
private slots:
- void urlClicked(const QString& url, KParts::URLArgs args);
+ void urlClicked(const TQString& url, KParts::URLArgs args);
void formClicked(const KURL& url, const KParts::URLArgs& args);
- void urlNewWindow(const QString& url, KParts::URLArgs args);
+ void urlNewWindow(const TQString& url, KParts::URLArgs args);
void pageLoaded();
void loadFavicon();
- void setTitle(const QString&);
+ void setTitle(const TQString&);
void setAutoReload();
void reload();
@@ -195,7 +195,7 @@ class KonqSideBarWebModule : public KonqSidebarPlugin
KHTMLSideBar *_htmlPart;
KURL _url;
int reloadTimeout;
- QString _desktopName;
+ TQString _desktopName;
};
#endif