summaryrefslogtreecommitdiffstats
path: root/konqueror/sidebar
diff options
context:
space:
mode:
Diffstat (limited to 'konqueror/sidebar')
-rw-r--r--konqueror/sidebar/konqsidebar.cpp12
-rw-r--r--konqueror/sidebar/konqsidebar.h4
-rw-r--r--konqueror/sidebar/konqsidebarplugin.cpp2
-rw-r--r--konqueror/sidebar/konqsidebarplugin.h2
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp61
-rw-r--r--konqueror/sidebar/sidebar_widget.h6
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp12
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp12
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.h2
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp6
-rw-r--r--konqueror/sidebar/trees/history_module/history_dlg.ui36
-rw-r--r--konqueror/sidebar/trees/history_module/history_item.cpp16
-rw-r--r--konqueror/sidebar/trees/history_module/history_item.h2
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.cpp14
-rw-r--r--konqueror/sidebar/trees/history_module/history_settings.cpp8
-rw-r--r--konqueror/sidebar/trees/history_module/kcmhistory.cpp8
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp52
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.h4
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreeitem.h2
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp6
-rw-r--r--konqueror/sidebar/trees/konqsidebar_tree.cpp6
-rw-r--r--konqueror/sidebar/web_module/web_module.h4
22 files changed, 139 insertions, 138 deletions
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index bdc99a4ca..0e3f3512a 100644
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@@ -22,7 +22,7 @@
#include <tqapplication.h>
#include <kaccelmanager.h>
-KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
+KonqSidebar::KonqSidebar( TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name, bool universalMode )
: KParts::ReadOnlyPart(parent, name),KonqSidebarIface()
{
@@ -30,15 +30,15 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
setInstance( KonqSidebarFactory::instance() );
m_extension = 0;
// this should be your custom internal widget
- m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() );
+ m_widget = new Sidebar_Widget( tqparentWidget, this, widgetName ,universalMode, tqparentWidget->tqtopLevelWidget()->property("currentProfile").toString() );
m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" );
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);
+ KAcceleratorManager::setNoAccel(TQT_TQWIDGET(m_widget));
+ setWidget(TQT_TQWIDGET(m_widget));
}
KInstance *KonqSidebar::getInstance()
@@ -97,12 +97,12 @@ KonqSidebarFactory::~KonqSidebarFactory()
s_about = 0L;
}
-KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
+KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *tqparentWidget, 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") );
+ KonqSidebar* obj = new KonqSidebar( tqparentWidget, widgetName, parent, name, args.tqcontains("universal") );
// See if we are to be read-write or not
// if (TQCString(classname) == "KParts::ReadOnlyPart")
diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h
index ec63e6d00..2724b2d39 100644
--- a/konqueror/sidebar/konqsidebar.h
+++ b/konqueror/sidebar/konqsidebar.h
@@ -77,7 +77,7 @@ public:
/**
* Default constructor
*/
- KonqSidebar(TQWidget *parentWidget, const char *widgetName,
+ KonqSidebar(TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name,bool universalMode);
/**
@@ -113,7 +113,7 @@ class KonqSidebarFactory : public KParts::Factory
public:
KonqSidebarFactory();
virtual ~KonqSidebarFactory();
- virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
+ virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char *classname, const TQStringList &args );
static KInstance* instance();
diff --git a/konqueror/sidebar/konqsidebarplugin.cpp b/konqueror/sidebar/konqsidebarplugin.cpp
index 75e762d35..1839425dc 100644
--- a/konqueror/sidebar/konqsidebarplugin.cpp
+++ b/konqueror/sidebar/konqsidebarplugin.cpp
@@ -52,7 +52,7 @@ void KonqSidebarPlugin::handlePreviewOnMouseOver(const KFileItem& /*items*/) {}
bool KonqSidebarPlugin::universalMode() {
if (!parent()) return false;
- KonqSidebarIface *ksi=static_cast<KonqSidebarIface*>(parent()->qt_cast("KonqSidebarIface"));
+ KonqSidebarIface *ksi=static_cast<KonqSidebarIface*>(tqparent()->tqqt_cast("KonqSidebarIface"));
if (!ksi) return false;
kdDebug()<<"calling KonqSidebarIface->universalMode()"<<endl;
return ksi->universalMode();
diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h
index d3ecf7ce4..8f3077b37 100644
--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@@ -30,7 +30,7 @@
class KonqSidebarPluginPrivate;
-class KDE_EXPORT KonqSidebarPlugin : public QObject
+class KDE_EXPORT KonqSidebarPlugin : public TQObject
{
Q_OBJECT
public:
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index b4940e8e5..50163c46a 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -25,6 +25,7 @@
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <tqstringlist.h>
+#include <tqucomextra_p.h>
#include <klocale.h>
#include <ksimpleconfig.h>
@@ -168,7 +169,7 @@ static TQString findFileName(const TQString* tmpl,bool universal, const TQString
void addBackEnd::activatedAddMenu(int id)
{
- kdDebug() << "activatedAddMenu: " << TQString("%1").arg(id) << endl;
+ kdDebug() << "activatedAddMenu: " << TQString("%1").tqarg(id) << endl;
if (((uint)id) == libNames.size())
doRollBack();
if(((uint)id) >= libNames.size())
@@ -251,7 +252,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
m_buttons.setAutoDelete(true);
m_hasStoredUrl = false;
m_latestViewed = -1;
- setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
TQSplitter *splitterWidget = splitter();
if (splitterWidget) {
@@ -261,7 +262,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
}
m_area = new KDockArea(this);
- m_area->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ m_area->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
m_mainDockWidget = m_area->createDockWidget("free", 0);
m_mainDockWidget->setWidget(new TQWidget(m_mainDockWidget));
m_area->setMainDockWidget(m_mainDockWidget);
@@ -462,8 +463,8 @@ void Sidebar_Widget::initialCopy()
{
//kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl;
if ( *eIt != "." && *eIt != ".." &&
- !entries.contains( *eIt ) &&
- !dirEntries.contains( *eIt ) )
+ !entries.tqcontains( *eIt ) &&
+ !dirEntries.tqcontains( *eIt ) )
{ // we don't have that one yet -> copy it.
TQString cp("cp -R -- ");
cp += KProcess::quote(dirtree_dir + *eIt);
@@ -674,11 +675,11 @@ void Sidebar_Widget::stdAction(const char *handlestd)
kdDebug() << "Try calling >active< module's (" << mod->module->className() << ") slot " << handlestd << endl;
- int id = mod->module->metaObject()->findSlot( handlestd );
+ int id = mod->module->tqmetaObject()->tqfindSlot( handlestd );
if ( id == -1 )
return;
kdDebug() << "Action slot was found, it will be called now" << endl;
- QUObject o[ 1 ];
+ TQUObject o[ 1 ];
mod->module->qt_invoke( id, o );
return;
}
@@ -742,7 +743,7 @@ void Sidebar_Widget::createButtons()
for (uint i = 0; i < m_buttons.count(); i++)
{
ButtonInfo *button = m_buttons.at(i);
- if (m_openViews.contains(button->file))
+ if (m_openViews.tqcontains(button->file))
{
m_buttonBar->setTab(i,true);
m_noUpdate = true;
@@ -814,7 +815,7 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
{
m_buttonBar->appendTab(SmallIcon(icon), lastbtn, name);
ButtonInfo *bi = new ButtonInfo(desktoppath, ((KonqSidebar*)m_partParent),0, url, lib, name,
- icon, this);
+ icon, TQT_TQOBJECT(this));
/*int id=*/m_buttons.insert(lastbtn, bi);
KMultiTabBarTab *tab = m_buttonBar->tab(lastbtn);
tab->installEventFilter(this);
@@ -833,7 +834,7 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
{
- if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQMouseEvent::RightButton)
+ if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==Qt::RightButton)
{
KMultiTabBarTab *bt=dynamic_cast<KMultiTabBarTab*>(obj);
if (bt)
@@ -881,7 +882,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
void Sidebar_Widget::mousePressEvent(TQMouseEvent *ev)
{
if (ev->type()==TQEvent::MouseButtonPress &&
- ((TQMouseEvent *)ev)->button()==TQMouseEvent::RightButton &&
+ ((TQMouseEvent *)ev)->button()==Qt::RightButton &&
!m_disableConfig)
{ m_menu->exec(TQCursor::pos()); }
}
@@ -1042,28 +1043,28 @@ void Sidebar_Widget::showHidePage(int page)
void Sidebar_Widget::collapseExpandSidebar()
{
- if (!parentWidget())
+ if (!tqparentWidget())
return; // Can happen during destruction
if (m_visibleViews.count()==0)
{
m_somethingVisible = false;
- parentWidget()->setMaximumWidth(minimumSizeHint().width());
+ tqparentWidget()->setMaximumWidth(tqminimumSizeHint().width());
updateGeometry();
emit panelHasBeenExpanded(false);
} else {
m_somethingVisible = true;
- parentWidget()->setMaximumWidth(32767);
+ tqparentWidget()->setMaximumWidth(32767);
updateGeometry();
emit panelHasBeenExpanded(true);
}
}
-TQSize Sidebar_Widget::sizeHint() const
+TQSize Sidebar_Widget::tqsizeHint() const
{
if (m_somethingVisible)
return TQSize(m_savedWidth,200);
- return minimumSizeHint();
+ return tqminimumSizeHint();
}
void Sidebar_Widget::dockWidgetHasUndocked(KDockWidget* wid)
@@ -1122,7 +1123,7 @@ void Sidebar_Widget::createNewWindow( const KURL &url, const KParts::URLArgs &ar
void Sidebar_Widget::enableAction( const char * name, bool enabled )
{
- if (sender()->parent()->isA("ButtonInfo"))
+ if (TQT_TQOBJECT_CONST(sender())->tqparent()->isA("ButtonInfo"))
{
ButtonInfo *btninfo = static_cast<ButtonInfo*>(sender()->parent());
if (btninfo)
@@ -1147,7 +1148,7 @@ void Sidebar_Widget::enableAction( const char * name, bool enabled )
bool Sidebar_Widget::doEnableActions()
{
- if (!(sender()->parent()->isA("ButtonInfo")))
+ if (!(TQT_TQOBJECT_CONST(sender())->tqparent()->isA("ButtonInfo")))
{
kdDebug()<<"Couldn't set active module, aborting"<<endl;
return false;
@@ -1194,50 +1195,50 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client,
void Sidebar_Widget::connectModule(TQObject *mod)
{
- if (mod->metaObject()->findSignal("started(KIO::Job*)") != -1) {
+ if (mod->tqmetaObject()->tqfindSignal("started(KIO::Job*)") != -1) {
connect(mod,TQT_SIGNAL(started(KIO::Job *)),this, TQT_SIGNAL(started(KIO::Job*)));
}
- if (mod->metaObject()->findSignal("completed()") != -1) {
+ if (mod->tqmetaObject()->tqfindSignal("completed()") != -1) {
connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
}
- if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) {
+ if (mod->tqmetaObject()->tqfindSignal("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 TQPoint&,const KURL&,const TQString&,mode_t)") != -1) {
+ if (mod->tqmetaObject()->tqfindSignal("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 TQPoint&,const KFileItemList&)") != -1) {
+ if (mod->tqmetaObject()->tqfindSignal("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) {
+ if (mod->tqmetaObject()->tqfindSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) {
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 TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) {
+ if (mod->tqmetaObject()->tqfindSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) {
connect(mod,
TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
this,
TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
}
- if (mod->metaObject()->findSignal("enableAction(const char*,bool)") != -1) {
+ if (mod->tqmetaObject()->tqfindSignal("enableAction(const char*,bool)") != -1) {
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) {
+ if (mod->tqmetaObject()->tqfindSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) {
connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &)));
}
@@ -1298,10 +1299,10 @@ void Sidebar_Widget::resizeEvent(TQResizeEvent* ev)
TQSplitter *Sidebar_Widget::splitter() const
{
if (m_universalMode) return 0;
- TQObject *p = parent();
+ TQObject *p = tqparent();
if (!p) return 0;
- p = p->parent();
- return static_cast<TQSplitter*>(p);
+ p = p->tqparent();
+ return static_cast<TQSplitter*>(TQT_TQWIDGET(p));
}
void Sidebar_Widget::userMovedSplitter()
diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h
index c99ae3883..dd7182a35 100644
--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@@ -70,7 +70,7 @@ public:
};
-class addBackEnd: public QObject
+class addBackEnd: public TQObject
{
Q_OBJECT
public:
@@ -93,7 +93,7 @@ private:
TQWidget *m_parent;
};
-class KDE_EXPORT Sidebar_Widget: public QWidget
+class KDE_EXPORT Sidebar_Widget: public TQWidget
{
Q_OBJECT
public:
@@ -107,7 +107,7 @@ public:
void stdAction(const char *handlestd);
//virtual KParts::ReadOnlyPart *getPart();
KParts::BrowserExtension *getExtension();
- virtual TQSize sizeHint() const;
+ virtual TQSize tqsizeHint() const;
public slots:
void addWebSideBar(const KURL& url, const TQString& name);
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index d00605c82..e79ed82df 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -161,10 +161,10 @@ void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQ
KBookmarkGroup parentGroup;
// 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()) {
+ if (item->tqparent()) {
bool error = false;
- KonqSidebarBookmarkItem *parent = dynamic_cast<KonqSidebarBookmarkItem*>( (item->parent()) );
+ KonqSidebarBookmarkItem *parent = dynamic_cast<KonqSidebarBookmarkItem*>( (item->tqparent()) );
if (!parent) {
error = true;
} else {
@@ -387,7 +387,7 @@ void KonqSidebarBookmarkModule::slotOpenTab()
else
return;
- DCOPRef ref(kapp->dcopClient()->appId(), tree()->topLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), tree()->tqtopLevelWidget()->name());
if (bookmark.isGroup()) {
KBookmarkGroup group = bookmark.toGroup();
@@ -412,9 +412,9 @@ void KonqSidebarBookmarkModule::slotCopyLocation()
if ( !bookmark.isGroup() )
{
- kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+ kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
QClipboard::Selection );
- kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+ kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
QClipboard::Clipboard );
}
}
@@ -484,7 +484,7 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo
fillGroup( item, grp );
TQString address(grp.address());
- if (m_folderOpenState.contains(address))
+ if (m_folderOpenState.tqcontains(address))
item->setOpen(m_folderOpenState[address]);
else
item->setOpen(false);
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
index 811867b14..16c1bfb78 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -108,7 +108,7 @@ bool KonqSidebarDirTreeItem::hasStandardIcon()
return m_fileItem->iconName() == "folder";
}
-void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
+void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment )
{
if (m_fileItem->isLink())
{
@@ -116,7 +116,7 @@ void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup
f.setItalic( TRUE );
_painter->setFont( f );
}
- TQListViewItem::paintCell( _painter, _cg, _column, _width, _alignment );
+ TQListViewItem::paintCell( _painter, _cg, _column, _width, _tqalignment );
}
KURL KonqSidebarDirTreeItem::externalURL() const
@@ -134,7 +134,7 @@ TQString KonqSidebarDirTreeItem::externalMimeType() const
bool KonqSidebarDirTreeItem::acceptsDrops( const TQStrList & formats )
{
- if ( formats.contains("text/uri-list") )
+ if ( formats.tqcontains("text/uri-list") )
return m_fileItem->acceptsDrops();
return false;
}
@@ -162,8 +162,8 @@ void KonqSidebarDirTreeItem::itemSelected()
if ( m_fileItem->url().directory(false) == KGlobalSettings::trashPath() )
bInTrash = true;
- TQMimeSource *data = TQApplication::clipboard()->data();
- bool paste = ( data->encodedData( data->format() ).size() != 0 );
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
+ bool paste = ( data->tqencodedData( data->format() ).size() != 0 );
tree()->enableActions( true, true, paste, true && !bInTrash, true, true );
}
@@ -197,7 +197,7 @@ void KonqSidebarDirTreeItem::paste()
{
// move or not move ?
bool move = false;
- TQMimeSource *data = TQApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1201) << "move (from clipboard data) = " << move << endl;
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
index 050f19424..3a599c7e9 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
@@ -36,7 +36,7 @@ public:
virtual void setOpen( bool open );
- virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment );
+ virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment );
virtual bool acceptsDrops( const TQStrList & formats );
virtual void drop( TQDropEvent * ev );
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index ac26b1285..401c4985a 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -357,7 +357,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item )
if (openItem)
{
// We have this directory listed already, just copy the entries as we
- // can't use the dirlister, it would invalidate the old entries
+ // can't use the dirlister, it would tqinvalidate the old entries
int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
KonqSidebarTreeItem * parentItem = item;
KonqSidebarDirTreeItem *oldItem = static_cast<KonqSidebarDirTreeItem *> (openItem->firstChild());
@@ -549,7 +549,7 @@ void KonqSidebarDirTreeModule::slotRedirection( const KURL & oldUrl, const KURL
do
{
- if (item->alias.contains(newUrlStr)) continue;
+ if (item->alias.tqcontains(newUrlStr)) continue;
kdDebug()<<"Redirectiong element"<<endl;
// We need to update the URL in m_dictSubDirs
m_dictSubDirs.insert( newUrlStr, item );
@@ -574,7 +574,7 @@ void KonqSidebarDirTreeModule::slotListingStopped( const KURL & url )
if ( item->childCount() == 0 )
{
item->setExpandable( false );
- item->repaint();
+ item->tqrepaint();
}
m_pTree->stopAnimation( item );
diff --git a/konqueror/sidebar/trees/history_module/history_dlg.ui b/konqueror/sidebar/trees/history_module/history_dlg.ui
index 32fd31296..a90c1c49e 100644
--- a/konqueror/sidebar/trees/history_module/history_dlg.ui
+++ b/konqueror/sidebar/trees/history_module/history_dlg.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>KonqSidebarHistoryDlg</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KonqHistoryDlg</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>gbLimits</cstring>
</property>
@@ -40,14 +40,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>240</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QCheckBox" row="1" column="0">
+ <widget class="TQCheckBox" row="1" column="0">
<property name="name">
<cstring>cbExpire</cstring>
</property>
@@ -60,7 +60,7 @@
<cstring>spinExpire</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>lEntries</cstring>
</property>
@@ -78,7 +78,7 @@
</widget>
</grid>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>gbFonts</cstring>
</property>
@@ -99,12 +99,12 @@
<cstring>spinOlder</cstring>
</property>
</widget>
- <widget class="QComboBox" row="1" column="2">
+ <widget class="TQComboBox" row="1" column="2">
<property name="name">
<cstring>comboOlder</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>lbNewer</cstring>
</property>
@@ -112,12 +112,12 @@
<string>URLs newer than</string>
</property>
</widget>
- <widget class="QComboBox" row="0" column="2">
+ <widget class="TQComboBox" row="0" column="2">
<property name="name">
<cstring>comboNewer</cstring>
</property>
</widget>
- <widget class="QPushButton" row="1" column="3">
+ <widget class="TQPushButton" row="1" column="3">
<property name="name">
<cstring>btnFontOlder</cstring>
</property>
@@ -125,7 +125,7 @@
<string>Choose Font...</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>lbOlder</cstring>
</property>
@@ -133,7 +133,7 @@
<string>URLs older than</string>
</property>
</widget>
- <widget class="QPushButton" row="0" column="3">
+ <widget class="TQPushButton" row="0" column="3">
<property name="name">
<cstring>btnFontNewer</cstring>
</property>
@@ -143,7 +143,7 @@
</widget>
</grid>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>gbDetails</cstring>
</property>
@@ -154,7 +154,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>cbDetailedTips</cstring>
</property>
@@ -167,7 +167,7 @@
</widget>
</hbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout4</cstring>
</property>
@@ -175,7 +175,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>btnClearHistory</cstring>
</property>
@@ -193,7 +193,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>418</width>
<height>0</height>
@@ -212,7 +212,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>30</height>
diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp
index 981be03bb..57647c04c 100644
--- a/konqueror/sidebar/trees/history_module/history_item.cpp
+++ b/konqueror/sidebar/trees/history_module/history_item.cpp
@@ -29,7 +29,7 @@
#include <kiconloader.h>
#define MYMODULE static_cast<KonqSidebarHistoryModule*>(module())
-#define MYGROUP static_cast<KonqSidebarHistoryGroupItem*>(parent())
+#define MYGROUP static_cast<KonqSidebarHistoryGroupItem*>(tqparent())
KonqSidebarHistorySettings * KonqSidebarHistoryItem::s_settings = 0L;
@@ -126,30 +126,30 @@ TQString KonqSidebarHistoryItem::toolTipText() const
}
void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg,
- int column, int width, int alignment )
+ int column, int width, int tqalignment )
{
TQDateTime dt;
- TQDateTime current = TQDateTime::currentDateTime();
+ TQDateTime current = TQDateTime::tqcurrentDateTime();
if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS )
- dt = current.addDays( - s_settings->m_valueYoungerThan );
+ dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueYoungerThan ));
else
- dt = current.addSecs( - (s_settings->m_valueYoungerThan * 60) );
+ dt = TQT_TQDATETIME_OBJECT(current.addSecs( - (s_settings->m_valueYoungerThan * 60) ));
if ( m_entry->lastVisited > dt )
p->setFont( s_settings->m_fontYoungerThan );
else {
if ( s_settings->m_metricOlderThan == KonqSidebarHistorySettings::DAYS )
- dt = current.addDays( - s_settings->m_valueOlderThan );
+ dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueOlderThan ));
else
- dt = current.addSecs( - (s_settings->m_valueOlderThan * 60) );
+ dt = TQT_TQDATETIME_OBJECT(current.addSecs( - (s_settings->m_valueOlderThan * 60) ));
if ( m_entry->lastVisited < dt )
p->setFont( s_settings->m_fontOlderThan );
}
- KonqSidebarTreeItem::paintCell( p, cg, column, width, alignment );
+ KonqSidebarTreeItem::paintCell( p, cg, column, width, tqalignment );
}
///////////////////////////////////////////////////////////////////
diff --git a/konqueror/sidebar/trees/history_module/history_item.h b/konqueror/sidebar/trees/history_module/history_item.h
index 1c6c7c4c4..0ddc7ae4e 100644
--- a/konqueror/sidebar/trees/history_module/history_item.h
+++ b/konqueror/sidebar/trees/history_module/history_item.h
@@ -60,7 +60,7 @@ public:
static void setSettings( KonqSidebarHistorySettings *s ) { s_settings = s; }
virtual void paintCell( TQPainter *, const TQColorGroup & cg, int column,
- int width, int alignment );
+ int width, int tqalignment );
private:
const KonqHistoryEntry *m_entry;
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index a3806be94..2c8cd5728 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -54,7 +54,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() ));
m_dict.setAutoDelete( true );
- m_currentTime = TQDateTime::currentDateTime();
+ m_currentTime = TQDateTime::tqcurrentDateTime();
KConfig *kc = KGlobal::config();
KConfigGroupSaver cs( kc, "HistorySettings" );
@@ -132,7 +132,7 @@ void KonqSidebarHistoryModule::slotCreateItems()
KonqHistoryEntry *entry;
KonqHistoryList entries( KonqHistoryManager::kself()->entries() );
KonqHistoryIterator it( entries );
- m_currentTime = TQDateTime::currentDateTime();
+ m_currentTime = TQDateTime::tqcurrentDateTime();
// the group item and the item of the serverroot '/' get a fav-icon
// if available. All others get the protocol icon.
@@ -149,7 +149,7 @@ void KonqSidebarHistoryModule::slotCreateItems()
TQStringList::Iterator it2 = openGroups.begin();
KonqSidebarHistoryGroupItem *group;
while ( it2 != openGroups.end() ) {
- group = m_dict.find( *it2 );
+ group = m_dict.tqfind( *it2 );
if ( group )
group->setOpen( true );
@@ -171,7 +171,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry )
if ( !m_initialized )
return;
- m_currentTime = TQDateTime::currentDateTime();
+ m_currentTime = TQDateTime::tqcurrentDateTime();
KonqSidebarHistoryGroupItem *group = getGroupItem( entry->url );
KonqSidebarHistoryItem *item = group->findChild( entry );
if ( !item )
@@ -185,7 +185,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry )
t->lockScrolling( true );
group->sort();
m_topLevelItem->sort();
- qApp->processOneEvent();
+ tqApp->processOneEvent();
t->lockScrolling( false );
}
@@ -195,7 +195,7 @@ void KonqSidebarHistoryModule::slotEntryRemoved( const KonqHistoryEntry *entry )
return;
TQString groupKey = groupForURL( entry->url );
- KonqSidebarHistoryGroupItem *group = m_dict.find( groupKey );
+ KonqSidebarHistoryGroupItem *group = m_dict.tqfind( groupKey );
if ( !group )
return;
@@ -324,7 +324,7 @@ void KonqSidebarHistoryModule::groupOpened( KonqSidebarHistoryGroupItem *item, b
KonqSidebarHistoryGroupItem * KonqSidebarHistoryModule::getGroupItem( const KURL& url )
{
const TQString& groupKey = groupForURL( url );
- KonqSidebarHistoryGroupItem *group = m_dict.find( groupKey );
+ KonqSidebarHistoryGroupItem *group = m_dict.tqfind( groupKey );
if ( !group ) {
group = new KonqSidebarHistoryGroupItem( url, m_topLevelItem );
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index 6871415a0..20ca214d4 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -56,8 +56,8 @@ void KonqSidebarHistorySettings::readSettings(bool global)
m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 );
m_valueOlderThan = config->readNumEntry("Value olderThan", 2 );
- TQString minutes = TQString::fromLatin1("minutes");
- TQString days = TQString::fromLatin1("days");
+ TQString minutes = TQString::tqfromLatin1("minutes");
+ TQString days = TQString::tqfromLatin1("days");
TQString metric = config->readEntry("Metric youngerThan", days );
m_metricYoungerThan = (metric == days) ? DAYS : MINUTES;
metric = config->readEntry("Metric olderThan", days );
@@ -83,8 +83,8 @@ void KonqSidebarHistorySettings::applySettings()
config->writeEntry("Value youngerThan", m_valueYoungerThan );
config->writeEntry("Value olderThan", m_valueOlderThan );
- TQString minutes = TQString::fromLatin1("minutes");
- TQString days = TQString::fromLatin1("days");
+ TQString minutes = TQString::tqfromLatin1("minutes");
+ TQString days = TQString::tqfromLatin1("days");
config->writeEntry("Metric youngerThan", m_metricYoungerThan == DAYS ?
days : minutes );
config->writeEntry("Metric olderThan", m_metricOlderThan == DAYS ?
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index ccedf65d9..532e3a164 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -144,8 +144,8 @@ void HistorySidebarConfig::load()
void HistorySidebarConfig::save()
{
- Q_UINT32 age = dialog->cbExpire->isChecked() ? dialog->spinExpire->value() : 0;
- Q_UINT32 count = dialog->spinEntries->value();
+ TQ_UINT32 age = dialog->cbExpire->isChecked() ? dialog->spinExpire->value() : 0;
+ TQ_UINT32 count = dialog->spinEntries->value();
KConfig config("konquerorrc");
config.setGroup("HistorySettings");
@@ -156,13 +156,13 @@ void HistorySidebarConfig::save()
TQDataStream streamAge( dataAge, IO_WriteOnly );
streamAge << age << "foo";
kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
- "notifyMaxAge(Q_UINT32, TQCString)", dataAge );
+ "notifyMaxAge(TQ_UINT32, TQCString)", dataAge );
TQByteArray dataCount;
TQDataStream streamCount( dataCount, IO_WriteOnly );
streamCount << count << "foo";
kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
- "notifyMaxCount(Q_UINT32, TQCString)", dataCount );
+ "notifyMaxCount(TQ_UINT32, TQCString)", dataCount );
m_settings->m_valueYoungerThan = dialog->spinNewer->value();
m_settings->m_valueOlderThan = dialog->spinOlder->value();
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index c1c98e07a..9b342f20e 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -55,7 +55,7 @@ static const int autoOpenTimeout = 750;
getModule KonqSidebarTree::getPluginFactory(TQString name)
{
- if (!pluginFactories.contains(name))
+ if (!pluginFactories.tqcontains(name))
{
KLibLoader *loader = KLibLoader::self();
TQString libName = pluginInfo[name];
@@ -114,8 +114,8 @@ public:
};
-KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path )
- : KListView( parentWidget ),
+KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *tqparentWidget, int virt, const TQString& path )
+ : KListView( tqparentWidget ),
m_currentTopLevelItem( 0 ),
m_toolTip( this ),
m_scrollingLocked( false ),
@@ -272,7 +272,7 @@ void KonqSidebarTree::contentsDragMoveEvent( TQDragMoveEvent *e )
TQListViewItem *item = itemAt( contentsToViewport( e->pos() ) );
// Accept drops on the background, if URLs
- if ( !item && m_lstDropFormats.contains("text/uri-list") )
+ if ( !item && m_lstDropFormats.tqcontains("text/uri-list") )
{
m_dropItem = 0;
e->acceptAction();
@@ -417,7 +417,7 @@ bool KonqSidebarTree::acceptDrag(TQDropEvent* e) const
{
// for KListViewMode...
for( int i = 0; e->format( i ); i++ )
- if ( d->m_dropFormats.contains(e->format( i ) ) )
+ if ( d->m_dropFormats.tqcontains(e->format( i ) ) )
return true;
return false;
}
@@ -482,7 +482,7 @@ void KonqSidebarTree::slotExecuted( TQListViewItem *item )
void KonqSidebarTree::slotMouseButtonPressed( int _button, TQListViewItem* _item, const TQPoint&, int col )
{
KonqSidebarTreeItem * item = static_cast<KonqSidebarTreeItem*>( _item );
- if (_button == RightButton)
+ if (_button == Qt::RightButton)
{
if ( item && col < 2)
{
@@ -498,10 +498,10 @@ void KonqSidebarTree::slotMouseButtonClicked(int _button, TQListViewItem* _item,
if(_item && col < 2)
{
switch( _button ) {
- case LeftButton:
+ case Qt::LeftButton:
slotExecuted( item );
break;
- case MidButton:
+ case Qt::MidButton:
item->middleButtonClicked();
break;
}
@@ -516,7 +516,7 @@ void KonqSidebarTree::slotAutoOpenFolder()
return;
m_dropItem->setOpen( true );
- m_dropItem->repaint();
+ m_dropItem->tqrepaint();
}
void KonqSidebarTree::rescanConfiguration()
@@ -606,7 +606,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
// Version 5 includes the audiocd browser
// Version 6 includes the printmanager and lan browser
const int currentVersion = 6;
- TQString key = TQString::fromLatin1("X-KDE-DirTreeVersionNumber");
+ TQString key = TQString::tqfromLatin1("X-KDE-DirTreeVersionNumber");
KSimpleConfig versionCfg( path + "/.directory" );
int versionNumber = versionCfg.readNumEntry( key, 1 );
kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl;
@@ -652,7 +652,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
{
//kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl;
if ( *eIt != "." && *eIt != ".."
- && !entries.contains( *eIt ) && !dirEntries.contains( *eIt ) )
+ && !entries.tqcontains( *eIt ) && !dirEntries.tqcontains( *eIt ) )
{ // we don't have that one yet -> copy it.
TQString cp("cp -R -- ");
cp += KProcess::quote(dirtree_dir + *eIt);
@@ -813,7 +813,7 @@ void KonqSidebarTree::slotAnimation()
for (; it != end; ++it )
{
uint & iconNumber = it.data().iconNumber;
- TQString icon = TQString::fromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) );
+ TQString icon = TQString::tqfromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) );
it.key()->setPixmap( 0, SmallIcon( icon));
iconNumber++;
@@ -836,7 +836,7 @@ void KonqSidebarTree::startAnimation( KonqSidebarTreeItem * item, const char * i
void KonqSidebarTree::stopAnimation( KonqSidebarTreeItem * item )
{
- MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.find(item);
+ MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.tqfind(item);
if ( it != m_mapCurrentOpeningFolders.end() )
{
item->setPixmap( 0, it.data().originalPixmap );
@@ -882,7 +882,7 @@ void KonqSidebarTree::enableActions( bool copy, bool cut, bool paste,
bool KonqSidebarTree::tabSupport()
{
// see if the newTab() dcop function is available (i.e. the sidebar is embedded into konqueror)
- DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), tqtopLevelWidget()->name());
DCOPReply reply = ref.call("functions()");
if (reply.isValid()) {
QCStringList funcs;
@@ -907,21 +907,21 @@ void KonqSidebarTree::showToplevelContextMenu()
if (!m_collection)
{
m_collection = new KActionCollection( this, "bookmark actions" );
- (void) new KAction( i18n("&Create New Folder..."), "folder_new", 0, this,
+ (void) new KAction( i18n("&Create New Folder..."), "folder_new", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
- (void) new KAction( i18n("Delete Folder"), "editdelete", 0, this,
+ (void) new KAction( i18n("Delete Folder"), "editdelete", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
- (void) new KAction( i18n("Rename"), 0, this,
+ (void) new KAction( i18n("Rename"), 0, TQT_TQOBJECT(this),
TQT_SLOT( slotRename() ), m_collection, "rename");
- (void) new KAction( i18n("Delete Link"), "editdelete", 0, this,
+ (void) new KAction( i18n("Delete Link"), "editdelete", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotDelete() ), m_collection, "delete_link");
- (void) new KAction( i18n("Properties"), "edit", 0, this,
+ (void) new KAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotProperties() ), m_collection, "item_properties");
- (void) new KAction( i18n("Open in New Window"), "window_new", 0, this,
+ (void) new KAction( i18n("Open in New Window"), "window_new", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
- (void) new KAction( i18n("Open in New Tab"), "tab_new", 0, this,
+ (void) new KAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
- (void) new KAction( i18n("Copy Link Address"), "editcopy", 0, this,
+ (void) new KAction( i18n("Copy Link Address"), "editcopy", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
}
@@ -1023,7 +1023,7 @@ void KonqSidebarTree::slotOpenNewWindow()
void KonqSidebarTree::slotOpenTab()
{
if (!m_currentTopLevelItem) return;
- DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), tqtopLevelWidget()->name());
ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() );
}
@@ -1031,8 +1031,8 @@ void KonqSidebarTree::slotCopyLocation()
{
if (!m_currentTopLevelItem) return;
KURL url = m_currentTopLevelItem->externalURL();
- kapp->clipboard()->setData( new KURLDrag(url, 0), QClipboard::Selection );
- kapp->clipboard()->setData( new KURLDrag(url, 0), QClipboard::Clipboard );
+ kapp->tqclipboard()->setData( new KURLDrag(url, 0), QClipboard::Selection );
+ kapp->tqclipboard()->setData( new KURLDrag(url, 0), QClipboard::Clipboard );
}
///////////////////////////////////////////////////////////////////
@@ -1045,7 +1045,7 @@ void KonqSidebarTreeToolTip::maybeTip( const TQPoint &point )
if ( item ) {
TQString text = static_cast<KonqSidebarTreeItem*>( item )->toolTipText();
if ( !text.isEmpty() )
- tip ( m_view->itemRect( item ), text );
+ tip ( m_view->tqitemRect( item ), text );
}
}
diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h
index 269803a84..8db2a613e 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.h
+++ b/konqueror/sidebar/trees/konq_sidebartree.h
@@ -50,7 +50,7 @@ typedef struct DirTreeConfigData_
} DirTreeConfigData;
-class KonqSidebarTreeToolTip : public QToolTip
+class KonqSidebarTreeToolTip : public TQToolTip
{
public:
KonqSidebarTreeToolTip( TQListView *view ) : TQToolTip( view->viewport() ), m_view( view ) {}
@@ -77,7 +77,7 @@ class KonqSidebarTree : public KListView, public KDirNotify
{
Q_OBJECT
public:
- KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path );
+ KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *tqparentWidget, int virt, const TQString& path );
virtual ~KonqSidebarTree();
void followURL( const KURL &url );
diff --git a/konqueror/sidebar/trees/konq_sidebartreeitem.h b/konqueror/sidebar/trees/konq_sidebartreeitem.h
index d39743b90..9fc313af2 100644
--- a/konqueror/sidebar/trees/konq_sidebartreeitem.h
+++ b/konqueror/sidebar/trees/konq_sidebartreeitem.h
@@ -37,7 +37,7 @@ class KonqSidebarTreeTopLevelItem;
* Items belonging to a given module are created and managed by the module,
* but they should all be KonqSidebarTreeItems, for the event handling in KonqSidebarTree.
*/
-class KonqSidebarTreeItem : public QListViewItem
+class KonqSidebarTreeItem : public TQListViewItem
{
public:
// Create an item under another one
diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
index 4ce6fe445..91d4d1eb5 100644
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
@@ -50,14 +50,14 @@ void KonqSidebarTreeTopLevelItem::setOpen( bool open )
void KonqSidebarTreeTopLevelItem::itemSelected()
{
kdDebug() << "KonqSidebarTreeTopLevelItem::itemSelected" << endl;
- TQMimeSource *data = TQApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
bool paste = m_bTopLevelGroup && data->provides("text/uri-list");
tree()->enableActions( true, true, paste, true, true, true /*rename*/ );
}
bool KonqSidebarTreeTopLevelItem::acceptsDrops( const TQStrList & formats )
{
- return formats.contains("text/uri-list") &&
+ return formats.tqcontains("text/uri-list") &&
( m_bTopLevelGroup || !externalURL().isEmpty() );
}
@@ -157,7 +157,7 @@ void KonqSidebarTreeTopLevelItem::paste()
{
// move or not move ?
bool move = false;
- TQMimeSource *data = TQApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1201) << "move (from clipboard data) = " << move << endl;
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 219063026..916e152fd 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -75,14 +75,14 @@ void KonqSidebar_Tree::cut()
{
TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L, true );
if (drag)
- TQApplication::clipboard()->setData( drag );
+ TQApplication::tqclipboard()->setData( drag );
}
void KonqSidebar_Tree::copy()
{
TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L );
if (drag)
- TQApplication::clipboard()->setData( drag );
+ TQApplication::tqclipboard()->setData( drag );
}
void KonqSidebar_Tree::paste()
@@ -147,7 +147,7 @@ extern "C"
i18n( "Select type:" ), names );
if (!item.isEmpty())
{
- int id=names.findIndex( item );
+ int id=names.tqfindIndex( item );
if (id==-1) return false;
KSimpleConfig ksc2(*list.at(id));
ksc2.setGroup("Desktop Entry");
diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h
index eb10414a9..36109ff86 100644
--- a/konqueror/sidebar/web_module/web_module.h
+++ b/konqueror/sidebar/web_module/web_module.h
@@ -82,7 +82,7 @@ class KHTMLSideBar : public KHTMLPart
virtual void urlSelected( const TQString &url, int button,
int state, const TQString &_target,
KParts::URLArgs args = KParts::URLArgs()) {
- if (button == LeftButton ){
+ if (button == Qt::LeftButton ){
if (_target.lower() == "_self") {
openURL(url);
} else if (_target.lower() == "_blank") {
@@ -92,7 +92,7 @@ class KHTMLSideBar : public KHTMLPart
}
return;
}
- if (button == MidButton) {
+ if (button == Qt::MidButton) {
emit openURLNewWindow(completeURL(url).url(),
args);
return;