summaryrefslogtreecommitdiffstats
path: root/konq-plugins
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-18 17:00:31 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-18 17:00:31 +0000
commit395a904bff7b4d6ead445c342f7ac0c5fbf29121 (patch)
tree9829cadb79d2cc7c29a940627fadb28b11e54150 /konq-plugins
parent399f47c376fdf4d19192732a701ea9578d11619d (diff)
downloadtdeaddons-395a904bff7b4d6ead445c342f7ac0c5fbf29121.tar.gz
tdeaddons-395a904bff7b4d6ead445c342f7ac0c5fbf29121.zip
TQt4 port kdeaddons
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1237404 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'konq-plugins')
-rw-r--r--konq-plugins/adblock/adblock.cpp12
-rw-r--r--konq-plugins/adblock/adblock.h7
-rw-r--r--konq-plugins/adblock/adblockdialogue.cpp4
-rw-r--r--konq-plugins/adblock/adblockdialogue.h9
-rw-r--r--konq-plugins/akregator/akregatorplugin.cpp16
-rw-r--r--konq-plugins/akregator/akregatorplugin.h1
-rw-r--r--konq-plugins/akregator/feeddetector.cpp4
-rw-r--r--konq-plugins/akregator/feeddetector.h4
-rw-r--r--konq-plugins/akregator/konqfeedicon.cpp14
-rw-r--r--konq-plugins/akregator/konqfeedicon.h11
-rw-r--r--konq-plugins/akregator/pluginbase.cpp4
-rw-r--r--konq-plugins/akregator/pluginbase.h4
-rw-r--r--konq-plugins/arkplugin/arkplugin.cpp24
-rw-r--r--konq-plugins/arkplugin/arkplugin.h1
-rw-r--r--konq-plugins/autorefresh/autorefresh.cpp8
-rw-r--r--konq-plugins/autorefresh/autorefresh.h3
-rw-r--r--konq-plugins/babelfish/plugin_babelfish.cpp74
-rw-r--r--konq-plugins/babelfish/plugin_babelfish.h3
-rw-r--r--konq-plugins/crashes/crashesplugin.cpp10
-rw-r--r--konq-plugins/crashes/crashesplugin.h7
-rw-r--r--konq-plugins/dirfilter/dirfilterplugin.cpp28
-rw-r--r--konq-plugins/dirfilter/dirfilterplugin.h3
-rw-r--r--konq-plugins/domtreeviewer/attributeeditdialog.ui22
-rw-r--r--konq-plugins/domtreeviewer/domlistviewitem.cpp20
-rw-r--r--konq-plugins/domtreeviewer/domlistviewitem.h12
-rw-r--r--konq-plugins/domtreeviewer/domtreecommands.cpp22
-rw-r--r--konq-plugins/domtreeviewer/domtreecommands.h25
-rw-r--r--konq-plugins/domtreeviewer/domtreeview.cpp92
-rw-r--r--konq-plugins/domtreeviewer/domtreeview.h5
-rw-r--r--konq-plugins/domtreeviewer/domtreeviewbase.ui54
-rw-r--r--konq-plugins/domtreeviewer/domtreewindow.cpp36
-rw-r--r--konq-plugins/domtreeviewer/domtreewindow.h3
-rw-r--r--konq-plugins/domtreeviewer/elementeditdialog.ui28
-rw-r--r--konq-plugins/domtreeviewer/messagedialog.ui20
-rw-r--r--konq-plugins/domtreeviewer/messagedialog.ui.h2
-rw-r--r--konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp6
-rw-r--r--konq-plugins/domtreeviewer/plugin_domtreeviewer.h3
-rw-r--r--konq-plugins/domtreeviewer/signalreceiver.cpp4
-rw-r--r--konq-plugins/domtreeviewer/signalreceiver.h5
-rw-r--r--konq-plugins/domtreeviewer/texteditdialog.ui18
-rw-r--r--konq-plugins/fsview/fsview.cpp28
-rw-r--r--konq-plugins/fsview/fsview.h3
-rw-r--r--konq-plugins/fsview/fsview_part.cpp20
-rw-r--r--konq-plugins/fsview/fsview_part.h9
-rw-r--r--konq-plugins/fsview/inode.cpp50
-rw-r--r--konq-plugins/fsview/inode.h2
-rw-r--r--konq-plugins/fsview/scan.cpp4
-rw-r--r--konq-plugins/fsview/scan.h4
-rw-r--r--konq-plugins/fsview/treemap.cpp302
-rw-r--r--konq-plugins/fsview/treemap.h77
-rwxr-xr-xkonq-plugins/imagerotation/exif.py8
-rwxr-xr-xkonq-plugins/imagerotation/orient.py8
-rw-r--r--konq-plugins/khtmlsettingsplugin/settingsplugin.cpp30
-rw-r--r--konq-plugins/khtmlsettingsplugin/settingsplugin.h3
-rw-r--r--konq-plugins/kimgalleryplugin/imgallerydialog.cpp12
-rw-r--r--konq-plugins/kimgalleryplugin/imgallerydialog.h3
-rw-r--r--konq-plugins/kimgalleryplugin/imgalleryplugin.cpp50
-rw-r--r--konq-plugins/kimgalleryplugin/imgalleryplugin.h3
-rw-r--r--konq-plugins/kuick/kcmkuick/kcmkuick.cpp4
-rw-r--r--konq-plugins/kuick/kcmkuick/kcmkuick.h3
-rw-r--r--konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui36
-rw-r--r--konq-plugins/kuick/kdirmenu.cpp24
-rw-r--r--konq-plugins/kuick/kdirmenu.h5
-rw-r--r--konq-plugins/kuick/kimcontactmenu.cpp4
-rw-r--r--konq-plugins/kuick/kimcontactmenu.h5
-rw-r--r--konq-plugins/kuick/kmetamenu.cpp20
-rw-r--r--konq-plugins/kuick/kmetamenu.h3
-rw-r--r--konq-plugins/kuick/kuick_plugin.cpp4
-rw-r--r--konq-plugins/kuick/kuick_plugin.h1
-rw-r--r--konq-plugins/microformat/konqmficon.cpp20
-rw-r--r--konq-plugins/microformat/konqmficon.h13
-rw-r--r--konq-plugins/microformat/pluginbase.cpp4
-rw-r--r--konq-plugins/microformat/pluginbase.h4
-rw-r--r--konq-plugins/minitools/minitoolsplugin.cpp14
-rw-r--r--konq-plugins/minitools/minitoolsplugin.h5
-rw-r--r--konq-plugins/rellinks/plugin_rellinks.cpp36
-rw-r--r--konq-plugins/rellinks/plugin_rellinks.h5
-rw-r--r--konq-plugins/rsync/rsyncconfigdialog.cpp34
-rw-r--r--konq-plugins/rsync/rsyncconfigdialog.h11
-rw-r--r--konq-plugins/rsync/rsyncplugin.cpp78
-rw-r--r--konq-plugins/rsync/rsyncplugin.h3
-rw-r--r--konq-plugins/searchbar/searchbar.cpp62
-rw-r--r--konq-plugins/searchbar/searchbar.h6
-rw-r--r--konq-plugins/sidebar/delicious/bookmarkListItem.cpp6
-rw-r--r--konq-plugins/sidebar/delicious/bookmarkListItem.h2
-rw-r--r--konq-plugins/sidebar/delicious/mainWidget.cpp8
-rw-r--r--konq-plugins/sidebar/delicious/mainWidget.h3
-rw-r--r--konq-plugins/sidebar/delicious/plugin.cpp4
-rw-r--r--konq-plugins/sidebar/delicious/plugin.h3
-rw-r--r--konq-plugins/sidebar/delicious/tagListItem.cpp6
-rw-r--r--konq-plugins/sidebar/delicious/tagListItem.h5
-rw-r--r--konq-plugins/sidebar/delicious/widget.ui18
-rw-r--r--konq-plugins/sidebar/mediaplayer/controls.cpp24
-rw-r--r--konq-plugins/sidebar/mediaplayer/controls.h12
-rw-r--r--konq-plugins/sidebar/mediaplayer/engine.cpp4
-rw-r--r--konq-plugins/sidebar/mediaplayer/engine.h5
-rw-r--r--konq-plugins/sidebar/mediaplayer/mediaplayer.cpp4
-rw-r--r--konq-plugins/sidebar/mediaplayer/mediaplayer.h3
-rw-r--r--konq-plugins/sidebar/mediaplayer/mediawidget.cpp6
-rw-r--r--konq-plugins/sidebar/mediaplayer/mediawidget.h3
-rw-r--r--konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui54
-rw-r--r--konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui56
-rw-r--r--konq-plugins/sidebar/mediaplayer/player.cpp4
-rw-r--r--konq-plugins/sidebar/mediaplayer/player.h5
-rw-r--r--konq-plugins/sidebar/metabar/Doxyfile4
-rw-r--r--konq-plugins/sidebar/metabar/src/configdialog.cpp60
-rw-r--r--konq-plugins/sidebar/metabar/src/configdialog.h7
-rw-r--r--konq-plugins/sidebar/metabar/src/defaultplugin.cpp26
-rw-r--r--konq-plugins/sidebar/metabar/src/defaultplugin.h1
-rw-r--r--konq-plugins/sidebar/metabar/src/httpplugin.cpp10
-rw-r--r--konq-plugins/sidebar/metabar/src/httpplugin.h1
-rw-r--r--konq-plugins/sidebar/metabar/src/metabar.cpp4
-rw-r--r--konq-plugins/sidebar/metabar/src/metabar.h3
-rw-r--r--konq-plugins/sidebar/metabar/src/metabarfunctions.cpp26
-rw-r--r--konq-plugins/sidebar/metabar/src/metabarfunctions.h5
-rw-r--r--konq-plugins/sidebar/metabar/src/metabarwidget.cpp50
-rw-r--r--konq-plugins/sidebar/metabar/src/metabarwidget.h7
-rw-r--r--konq-plugins/sidebar/metabar/src/protocolplugin.cpp6
-rw-r--r--konq-plugins/sidebar/metabar/src/protocolplugin.h3
-rw-r--r--konq-plugins/sidebar/metabar/src/remoteplugin.h1
-rw-r--r--konq-plugins/sidebar/metabar/src/serviceloader.cpp18
-rw-r--r--konq-plugins/sidebar/metabar/src/serviceloader.h5
-rw-r--r--konq-plugins/sidebar/metabar/src/settingsplugin.h1
-rw-r--r--konq-plugins/sidebar/newsticker/configfeeds.cpp2
-rw-r--r--konq-plugins/sidebar/newsticker/configfeeds.h3
-rw-r--r--konq-plugins/sidebar/newsticker/configfeedsbase.ui4
-rw-r--r--konq-plugins/sidebar/newsticker/norsswidget.cpp8
-rw-r--r--konq-plugins/sidebar/newsticker/norsswidget.h3
-rw-r--r--konq-plugins/sidebar/newsticker/nspanel.cpp10
-rw-r--r--konq-plugins/sidebar/newsticker/nspanel.h5
-rw-r--r--konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp24
-rw-r--r--konq-plugins/sidebar/newsticker/nsstacktabwidget.h5
-rw-r--r--konq-plugins/sidebar/newsticker/sidebar_news.cpp8
-rw-r--r--konq-plugins/sidebar/newsticker/sidebar_news.h3
-rw-r--r--konq-plugins/uachanger/uachangerplugin.cpp52
-rw-r--r--konq-plugins/uachanger/uachangerplugin.h3
-rw-r--r--konq-plugins/validators/plugin_validators.cpp18
-rw-r--r--konq-plugins/validators/plugin_validators.h3
-rw-r--r--konq-plugins/validators/validatorsdialog.cpp4
-rw-r--r--konq-plugins/validators/validatorsdialog.h3
-rw-r--r--konq-plugins/webarchiver/archivedialog.cpp32
-rw-r--r--konq-plugins/webarchiver/archivedialog.h3
-rw-r--r--konq-plugins/webarchiver/archiveviewbase.ui12
-rw-r--r--konq-plugins/webarchiver/plugin_webarchiver.cpp22
-rw-r--r--konq-plugins/webarchiver/plugin_webarchiver.h3
-rw-r--r--konq-plugins/webarchiver/webarchivecreator.h1
146 files changed, 1210 insertions, 1142 deletions
diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp
index c18c061..9d0fdb3 100644
--- a/konq-plugins/adblock/adblock.cpp
+++ b/konq-plugins/adblock/adblock.cpp
@@ -56,11 +56,11 @@ using namespace DOM;
typedef KGenericFactory<AdBlock> AdBlockFactory;
K_EXPORT_COMPONENT_FACTORY( libadblock, AdBlockFactory( "adblock" ) )
-AdBlock::AdBlock(TQObject *parent, const char *name, const TQStringList &) :
- KParts::Plugin(parent, name),
+AdBlock::AdBlock(TQObject *tqparent, const char *name, const TQStringList &) :
+ KParts::Plugin(tqparent, name),
m_label(0), m_menu(0)
{
- m_part = dynamic_cast<KHTMLPart *>(parent);
+ m_part = dynamic_cast<KHTMLPart *>(tqparent);
if(!m_part) { kdDebug() << "couldn't get KHTMLPart" << endl; return; }
m_menu = new KPopupMenu(m_part->widget());
@@ -95,7 +95,7 @@ void AdBlock::initLabel()
KIconLoader *loader = instance()->iconLoader();
m_label->setFixedHeight(loader->currentSize(KIcon::Small));
- m_label->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+ m_label->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
m_label->setUseCursor(false);
m_label->setPixmap(loader->loadIcon("filter", KIcon::Small));
@@ -176,7 +176,7 @@ void AdBlock::fillWithImages(AdElementList &elements)
if (!url.isEmpty() && url != m_part->baseURL().url())
{
AdElement element(url, "image", "IMG", false);
- if (!elements.contains( element ))
+ if (!elements.tqcontains( element ))
elements.append( element);
}
}
@@ -203,7 +203,7 @@ void AdBlock::fillWithHtmlTag(AdElementList &elements,
if (!url.isEmpty() && url != m_part->baseURL().url())
{
AdElement element(url, tagName.string(), category, false);
- if (!elements.contains( element ))
+ if (!elements.tqcontains( element ))
elements.append( element);
}
}
diff --git a/konq-plugins/adblock/adblock.h b/konq-plugins/adblock/adblock.h
index 0a9b15b..87c1e5d 100644
--- a/konq-plugins/adblock/adblock.h
+++ b/konq-plugins/adblock/adblock.h
@@ -18,8 +18,8 @@
02110-1301, USA.
*/
-#ifndef KONQ_ADBLOCK_H
-#define KONQ_ADBLOCK_H
+#ifndef KONTQ_ADBLOCK_H
+#define KONTQ_ADBLOCK_H
#include <tqguardedptr.h>
#include <tqvaluelist.h>
@@ -46,9 +46,10 @@ typedef TQValueList<AdElement> AdElementList;
class AdBlock : public KParts::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- AdBlock(TQObject *parent, const char *name, const TQStringList &);
+ AdBlock(TQObject *tqparent, const char *name, const TQStringList &);
~AdBlock();
private:
diff --git a/konq-plugins/adblock/adblockdialogue.cpp b/konq-plugins/adblock/adblockdialogue.cpp
index 1aff0f6..d4e0140 100644
--- a/konq-plugins/adblock/adblockdialogue.cpp
+++ b/konq-plugins/adblock/adblockdialogue.cpp
@@ -32,8 +32,8 @@
#include <tqfont.h>
#include <tqpainter.h>
-AdBlockDlg::AdBlockDlg(TQWidget *parent, AdElementList &elements) :
- KDialogBase( parent, "Adblock dialogue", true, "Adblock - able Items", Ok|Cancel, Ok, true )
+AdBlockDlg::AdBlockDlg(TQWidget *tqparent, AdElementList &elements) :
+ KDialogBase( tqparent, "Adblock dialogue", true, "Adblock - able Items", Ok|Cancel, Ok, true )
{
TQVBox *page = makeVBoxMainWidget();
m_label1 = new TQLabel( i18n("All blockable items in this page:"), page, "label1" );
diff --git a/konq-plugins/adblock/adblockdialogue.h b/konq-plugins/adblock/adblockdialogue.h
index 0890d09..b0e397f 100644
--- a/konq-plugins/adblock/adblockdialogue.h
+++ b/konq-plugins/adblock/adblockdialogue.h
@@ -17,8 +17,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef KONQ_ADBLOCKDLG_H
-#define KONQ_ADBLOCKDLG_H
+#ifndef KONTQ_ADBLOCKDLG_H
+#define KONTQ_ADBLOCKDLG_H
#include <kdialogbase.h>
#include <tqlistview.h>
@@ -30,6 +30,7 @@ class KPopupMenu;
class AdBlockDlg : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
private:
TQLineEdit *m_filter;
@@ -39,7 +40,7 @@ private:
KPopupMenu *m_menu;
public:
- AdBlockDlg(TQWidget *parent, AdElementList &elements);
+ AdBlockDlg(TQWidget *tqparent, AdElementList &elements);
~AdBlockDlg();
private slots:
@@ -55,7 +56,7 @@ signals:
// ----------------------------------------------------------------------------
-class ListViewItem : public QListViewItem
+class ListViewItem : public TQListViewItem
{
private:
bool m_blocked;
diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp
index 2f59adc..4402cd4 100644
--- a/konq-plugins/akregator/akregatorplugin.cpp
+++ b/konq-plugins/akregator/akregatorplugin.cpp
@@ -65,8 +65,8 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const
KHTMLView* view = 0L;
- if (popupmenu && popupmenu->parent() && popupmenu->parent()->inherits("KHTMLView"))
- view = static_cast<KHTMLView*>(popupmenu->parent());
+ if (popupmenu && popupmenu->tqparent() && popupmenu->tqparent()->inherits("KHTMLView"))
+ view = static_cast<KHTMLView*>(TQT_TQWIDGET(popupmenu->tqparent()));
if (view)
m_part = view->part();
@@ -85,7 +85,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const
{
kdDebug() << "AkregatorMenu: found feed URL " << it->url().prettyURL() << endl;
KAction *action = new KAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, TQT_SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" );
- addAction( action );
+ tqaddAction( action );
addSeparator();
m_feedURL = it->url().url();
break;
@@ -103,16 +103,16 @@ AkregatorMenu::~AkregatorMenu()
bool AkregatorMenu::isFeedUrl(const TQString &url)
{
- if (url.contains(".htm", false) != 0) return false;
- if (url.contains("rss", false) != 0) return true;
- if (url.contains("rdf", false) != 0) return true;
- if (url.contains("xml", false) != 0) return true;
+ if (url.tqcontains(".htm", false) != 0) return false;
+ if (url.tqcontains("rss", false) != 0) return true;
+ if (url.tqcontains("rdf", false) != 0) return true;
+ if (url.tqcontains("xml", false) != 0) return true;
return false;
}
bool AkregatorMenu::isFeedUrl(const KFileItem * item)
{
- if ( m_feedMimeTypes.contains( item->mimetype() ) )
+ if ( m_feedMimeTypes.tqcontains( item->mimetype() ) )
return true;
else
{
diff --git a/konq-plugins/akregator/akregatorplugin.h b/konq-plugins/akregator/akregatorplugin.h
index 9fb6787..4c03dee 100644
--- a/konq-plugins/akregator/akregatorplugin.h
+++ b/konq-plugins/akregator/akregatorplugin.h
@@ -36,6 +36,7 @@ namespace Akregator
class AkregatorMenu : public KonqPopupMenuPlugin, PluginBase
{
Q_OBJECT
+ TQ_OBJECT
public:
AkregatorMenu( KonqPopupMenu *, const char *name, const TQStringList &list );
virtual ~AkregatorMenu();
diff --git a/konq-plugins/akregator/feeddetector.cpp b/konq-plugins/akregator/feeddetector.cpp
index 57a333c..595f871 100644
--- a/konq-plugins/akregator/feeddetector.cpp
+++ b/konq-plugins/akregator/feeddetector.cpp
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#include <tqregexp.h>
diff --git a/konq-plugins/akregator/feeddetector.h b/konq-plugins/akregator/feeddetector.h
index 346663d..ccec4d7 100644
--- a/konq-plugins/akregator/feeddetector.h
+++ b/konq-plugins/akregator/feeddetector.h
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#ifndef AKREGATORFEEDDETECTOR_H
diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp
index ce6f89e..a1b993e 100644
--- a/konq-plugins/akregator/konqfeedicon.cpp
+++ b/konq-plugins/akregator/konqfeedicon.cpp
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#include "konqfeedicon.h"
@@ -55,12 +55,12 @@ typedef KGenericFactory<KonqFeedIcon> KonqFeedIconFactory;
K_EXPORT_COMPONENT_FACTORY(libakregatorkonqfeedicon,
KonqFeedIconFactory("akregatorkonqfeedicon"))
-KonqFeedIcon::KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &)
- : KParts::Plugin(parent, name), PluginBase(), m_part(0), m_feedIcon(0), m_statusBarEx(0), m_menu(0)
+KonqFeedIcon::KonqFeedIcon(TQObject *tqparent, const char *name, const TQStringList &)
+ : KParts::Plugin(tqparent, name), PluginBase(), m_part(0), m_feedIcon(0), m_statusBarEx(0), m_menu(0)
{
KGlobal::locale()->insertCatalogue("akregator_konqplugin");
- m_part = dynamic_cast<KHTMLPart*>(parent);
+ m_part = dynamic_cast<KHTMLPart*>(tqparent);
if(!m_part) { kdDebug() << "couldn't get part" << endl; return; }
// FIXME: need to do this because of a bug in khtmlpart, it's fixed now for 3.4 (and prolly backported for 3.3.3?)
//connect(m_part->view(), TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(addFeedIcon()));
@@ -110,7 +110,7 @@ bool KonqFeedIcon::feedFound()
for (unsigned int j = 0; j < node.attributes().length(); j++)
{
doc += node.attributes().item(j).nodeName().string() + "=\"";
- doc += TQStyleSheet::escape(node.attributes().item(j).nodeValue().string()).replace("\"", "&quot;");
+ doc += TQStyleSheet::escape(node.attributes().item(j).nodeValue().string()).tqreplace("\"", "&quot;");
doc += "\" ";
}
doc += "/>";
@@ -156,7 +156,7 @@ void KonqFeedIcon::addFeedIcon()
// from khtmlpart's ualabel
m_feedIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
- m_feedIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+ m_feedIcon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
m_feedIcon->setUseCursor(false);
//FIXME hackish
m_feedIcon->setPixmap(TQPixmap(locate("data", "akregator/pics/rss.png")));
diff --git a/konq-plugins/akregator/konqfeedicon.h b/konq-plugins/akregator/konqfeedicon.h
index 0ac19f0..1dcadcd 100644
--- a/konq-plugins/akregator/konqfeedicon.h
+++ b/konq-plugins/akregator/konqfeedicon.h
@@ -18,12 +18,12 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
-#ifndef KONQFEEDICON_H
-#define KONQFEEDICON_H
+#ifndef KONTQFEEDICON_H
+#define KONTQFEEDICON_H
#include <tqguardedptr.h>
#include <kparts/plugin.h>
@@ -46,8 +46,9 @@ namespace Akregator {
class KonqFeedIcon : public KParts::Plugin, PluginBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &);
+ KonqFeedIcon(TQObject *tqparent, const char *name, const TQStringList &);
~KonqFeedIcon();
diff --git a/konq-plugins/akregator/pluginbase.cpp b/konq-plugins/akregator/pluginbase.cpp
index f837426..c0ade83 100644
--- a/konq-plugins/akregator/pluginbase.cpp
+++ b/konq-plugins/akregator/pluginbase.cpp
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#include <kurl.h>
diff --git a/konq-plugins/akregator/pluginbase.h b/konq-plugins/akregator/pluginbase.h
index 1c1d4e6..64e1853 100644
--- a/konq-plugins/akregator/pluginbase.h
+++ b/konq-plugins/akregator/pluginbase.h
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#ifndef PLUGINBASE_H
diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp
index f1687fc..c1d18a1 100644
--- a/konq-plugins/arkplugin/arkplugin.cpp
+++ b/konq-plugins/arkplugin/arkplugin.cpp
@@ -73,7 +73,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
while ( ( item = it.current() ) != 0 )
{
++it;
- if ( m_extractMimeTypes.contains( item->mimetype() ) )
+ if ( m_extractMimeTypes.tqcontains( item->mimetype() ) )
{
hasArchives = true;
}
@@ -98,7 +98,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
{
item = itemList.first();
m_name = itemList.first()->name();
- action = new KAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this,
+ action = new KAction( i18n( "Compress as %1" ).tqarg( m_name + m_ext ), 0, this,
TQT_SLOT( slotCompressAsDefault() ), actionCollection() );
}
else
@@ -126,7 +126,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
action = new KAction( i18n( "Add to Archive..." ), 0, this,
TQT_SLOT( slotAdd() ), actionCollection() );
actionMenu->insert( action );
- addAction( actionMenu );
+ tqaddAction( actionMenu );
}
if ( !hasOther && hasArchives )
@@ -143,7 +143,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
{
TQString targetName = itemList.first()->name();
stripExtension( targetName );
- action = new KAction( i18n( "Extract to %1" ).arg( targetName ), 0, this,
+ action = new KAction( i18n( "Extract to %1" ).tqarg( targetName ), 0, this,
TQT_SLOT( slotExtractToSubfolders() ), actionCollection() );
}
else
@@ -155,12 +155,12 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
action = new KAction( i18n( "Extract To..." ), 0 , this,
TQT_SLOT( slotExtractTo() ), actionCollection() );
actionMenu->insert( action );
- addAction( actionMenu );
+ tqaddAction( actionMenu );
}
else
{
action = new KAction( i18n( "Extract To..." ), "ark", 0, this, TQT_SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" );
- addAction( action );
+ tqaddAction( action );
}
}
addSeparator();
@@ -442,7 +442,7 @@ void ArkMenu::stripExtension( TQString & name )
ext = (*it).remove( '*' );
if ( name.endsWith( ext ) )
{
- name = name.left( name.findRev( ext ) ) + '/';
+ name = name.left( name.tqfindRev( ext ) ) + '/';
break;
}
}
@@ -456,13 +456,13 @@ void ArkMenu::slotCompressAs( int pos )
TQStringList filelist( m_urlStringList );
//if KMimeType returns .ZIP, .7Z or .RAR. convert them to lowercase
- if ( m_extensionList[ pos ].contains ( ".ZIP" ) )
+ if ( m_extensionList[ pos ].tqcontains ( ".ZIP" ) )
m_extensionList[ pos ] = ".zip";
- if ( m_extensionList[ pos ].contains ( ".RAR" ) )
+ if ( m_extensionList[ pos ].tqcontains ( ".RAR" ) )
m_extensionList[ pos ] = ".rar";
- if ( m_extensionList[ pos ].contains ( ".7Z" ) )
+ if ( m_extensionList[ pos ].tqcontains ( ".7Z" ) )
m_extensionList[ pos ] = ".7z";
if ( filelist.count() == 1)
@@ -473,7 +473,7 @@ void ArkMenu::slotCompressAs( int pos )
int i=1;
while ( KIO::NetAccess::exists(target, true, 0 ) )
{
- target = m_dir + i18n("Archive %1").arg(i) + m_extensionList[ pos ];
+ target = m_dir + i18n("Archive %1").tqarg(i) + m_extensionList[ pos ];
i++;
}
}
@@ -517,7 +517,7 @@ void ArkMenu::slotCompressAsDefault()
int i=1;
while ( KIO::NetAccess::exists(name, true, 0 ) )
{
- name = m_dir + i18n("Archive %1").arg(i) + m_ext;
+ name = m_dir + i18n("Archive %1").tqarg(i) + m_ext;
i++;
}
}
diff --git a/konq-plugins/arkplugin/arkplugin.h b/konq-plugins/arkplugin/arkplugin.h
index 797d2d9..8cfdb94 100644
--- a/konq-plugins/arkplugin/arkplugin.h
+++ b/konq-plugins/arkplugin/arkplugin.h
@@ -30,6 +30,7 @@ class TQSignalMapper;
class ArkMenu : public KonqPopupMenuPlugin {
Q_OBJECT
+ TQ_OBJECT
public:
ArkMenu( KonqPopupMenu *, const char *name, const TQStringList & list );
virtual ~ArkMenu();
diff --git a/konq-plugins/autorefresh/autorefresh.cpp b/konq-plugins/autorefresh/autorefresh.cpp
index 64be883..bcb40f2 100644
--- a/konq-plugins/autorefresh/autorefresh.cpp
+++ b/konq-plugins/autorefresh/autorefresh.cpp
@@ -16,8 +16,8 @@
#include <tqtimer.h>
#include <kgenericfactory.h>
-AutoRefresh::AutoRefresh( TQObject* parent, const char* name, const TQStringList & /*args*/ )
- : Plugin( parent, name )
+AutoRefresh::AutoRefresh( TQObject* tqparent, const char* name, const TQStringList & /*args*/ )
+ : Plugin( tqparent, name )
{
timer = new TQTimer( this );
connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRefresh() ) );
@@ -85,7 +85,7 @@ void AutoRefresh::slotIntervalChanged()
void AutoRefresh::slotRefresh()
{
- if ( !parent()->inherits("KParts::ReadOnlyPart") ) {
+ if ( !tqparent()->inherits("KParts::ReadOnlyPart") ) {
TQString title = i18n( "Cannot Refresh Source" );
TQString text = i18n( "<qt>This plugin cannot auto-refresh the current part.</qt>" );
@@ -93,7 +93,7 @@ void AutoRefresh::slotRefresh()
}
else
{
- KParts::ReadOnlyPart *part = (KParts::ReadOnlyPart *) parent();
+ KParts::ReadOnlyPart *part = (KParts::ReadOnlyPart *) tqparent();
// Get URL
KURL url = part->url();
diff --git a/konq-plugins/autorefresh/autorefresh.h b/konq-plugins/autorefresh/autorefresh.h
index c72c335..04bdbdc 100644
--- a/konq-plugins/autorefresh/autorefresh.h
+++ b/konq-plugins/autorefresh/autorefresh.h
@@ -31,12 +31,13 @@ class TQTimer;
class AutoRefresh : public KParts::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Construct a new KParts plugin.
*/
- AutoRefresh( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList() );
+ AutoRefresh( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList() );
/**
* Destructor.
diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp
index fc7a80e..bf2e7da 100644
--- a/konq-plugins/babelfish/plugin_babelfish.cpp
+++ b/konq-plugins/babelfish/plugin_babelfish.cpp
@@ -34,9 +34,9 @@ typedef KGenericFactory<PluginBabelFish> BabelFishFactory;
static const KAboutData aboutdata("babelfish", I18N_NOOP("Translate Web Page") , "1.0" );
K_EXPORT_COMPONENT_FACTORY( libbabelfishplugin, BabelFishFactory( &aboutdata ) )
-PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name,
+PluginBabelFish::PluginBabelFish( TQObject* tqparent, const char* name,
const TQStringList & )
- : Plugin( parent, name )
+ : Plugin( tqparent, name )
{
setInstance(BabelFishFactory::instance());
@@ -178,9 +178,9 @@ PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name,
m_menu->setEnabled( true );
// TODO: we could also support plain text viewers...
- if ( parent && parent->inherits( "KHTMLPart" ) )
+ if ( tqparent && tqparent->inherits( "KHTMLPart" ) )
{
- KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>(parent);
+ KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>(tqparent);
connect( part, TQT_SIGNAL(started(KIO::Job*)), this,
TQT_SLOT(slotStarted(KIO::Job*)) );
}
@@ -193,9 +193,9 @@ PluginBabelFish::~PluginBabelFish()
void PluginBabelFish::slotStarted( KIO::Job* )
{
- if ( parent()->inherits("KHTMLPart") &&
+ if ( tqparent()->inherits("KHTMLPart") &&
// Babelfish wants http URLs only. No https.
- static_cast<KParts::ReadOnlyPart *>(parent())->url().protocol().lower() == "http" )
+ static_cast<KParts::ReadOnlyPart *>(tqparent())->url().protocol().lower() == "http" )
{
m_menu->setEnabled( true );
}
@@ -211,8 +211,8 @@ void PluginBabelFish::translateURL()
if ( !sender() )
return;
- // The parent is assumed to be a KHTMLPart
- if ( !parent()->inherits("KHTMLPart") )
+ // The tqparent is assumed to be a KHTMLPart
+ if ( !tqparent()->inherits("KHTMLPart") )
{
TQString title = i18n( "Cannot Translate Source" );
TQString text = i18n( "Only web pages can be translated using "
@@ -224,10 +224,10 @@ void PluginBabelFish::translateURL()
// Select engine
KConfig cfg( "translaterc", true );
- TQString engine = cfg.readEntry( sender()->name(), "babelfish" );
+ TQString engine = cfg.readEntry( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(), "babelfish" );
// Get URL
- KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent());
+ KHTMLPart *part = dynamic_cast<KHTMLPart *>(tqparent());
if ( !part )
return;
@@ -262,33 +262,33 @@ void PluginBabelFish::translateURL()
TQString query;
if( engine == "freetranslation" ) {
query = "sequence=core&Submit=FREE Translation&language=";
- if( sender()->name() == TQString( "en_es" ) )
+ if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_es" ) )
query += "English/Spanish";
- else if( sender()->name() == TQString( "en_de" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_de" ) )
query += "English/German";
- else if( sender()->name() == TQString( "en_it" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_it" ) )
query += "English/Italian";
- else if( sender()->name() == TQString( "en_nl" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_nl" ) )
query += "English/Dutch";
- else if( sender()->name() == TQString( "en_pt" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_pt" ) )
query += "English/Portuguese";
- else if( sender()->name() == TQString( "en_no" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_no" ) )
query += "English/Norwegian";
- else if( sender()->name() == TQString( "en_zh" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_zh" ) )
query += "English/SimplifiedChinese";
- else if( sender()->name() == TQString( "en_zhTW" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_zhTW" ) )
query += "English/TraditionalChinese";
- else if( sender()->name() == TQString( "es_en" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "es_en" ) )
query += "Spanish/English";
- else if( sender()->name() == TQString( "fr_en" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "fr_en" ) )
query += "French/English";
- else if( sender()->name() == TQString( "de_en" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "de_en" ) )
query += "German/English";
- else if( sender()->name() == TQString( "it_en" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "it_en" ) )
query += "Italian/English";
- else if( sender()->name() == TQString( "nl_en" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "nl_en" ) )
query += "Dutch/English";
- else if( sender()->name() == TQString( "pt_en" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "pt_en" ) )
query += "Portuguese/English";
else // Should be en_fr
query += "English/French";
@@ -313,21 +313,21 @@ void PluginBabelFish::translateURL()
} else if( engine == "reverso" ) {
result = KURL( "http://www.reverso.net/url/frame.asp" );
query = "autotranslate=on&templates=0&x=0&y=0&directions=";
- if( sender()->name() == TQString( "de_fr" ) )
+ if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "de_fr" ) )
query += "524292";
- else if( sender()->name() == TQString( "fr_en" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "fr_en" ) )
query += "65544";
- else if( sender()->name() == TQString( "fr_de" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "fr_de" ) )
query += "262152";
- else if( sender()->name() == TQString( "de_en" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "de_en" ) )
query += "65540";
- else if( sender()->name() == TQString( "en_de" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_de" ) )
query += "262145";
- else if( sender()->name() == TQString( "en_es" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_es" ) )
query += "2097153";
- else if( sender()->name() == TQString( "es_en" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "es_en" ) )
query += "65568";
- else if( sender()->name() == TQString( "fr_es" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "fr_es" ) )
query += "2097160";
else // "en_fr"
query += "524289";
@@ -336,20 +336,20 @@ void PluginBabelFish::translateURL()
} else if( engine == "tsail" ) {
result = KURL( "http://www.t-mail.com/cgi-bin/tsail" );
query = "sail=full&lp=";
- if( sender()->name() == TQString( "zhTW_en" ) )
+ if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "zhTW_en" ) )
query += "tw-en";
- else if( sender()->name() == TQString( "en_zhTW" ) )
+ else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_zhTW" ) )
query += "en-tw";
else
{
- query += sender()->name();
+ query += TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
query[15] = '-';
}
query += totrans;
} else if( engine == "voila" ) {
result = KURL( "http://trans.voila.fr/voila" );
query = "systran_id=Voila-fr&systran_lp=";
- query += sender()->name();
+ query += TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
if ( part->hasSelection() )
query += "&systran_charset=utf-8&systran_text=";
else
@@ -359,7 +359,7 @@ void PluginBabelFish::translateURL()
// Using the altavista babelfish engine
result = KURL( "http://babelfish.altavista.com/babelfish/tr" );
query = "lp=";
- query += sender()->name();
+ query += TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
if ( part->hasSelection() )
query += "&text=";
else
diff --git a/konq-plugins/babelfish/plugin_babelfish.h b/konq-plugins/babelfish/plugin_babelfish.h
index 1844ce1..98efe04 100644
--- a/konq-plugins/babelfish/plugin_babelfish.h
+++ b/konq-plugins/babelfish/plugin_babelfish.h
@@ -28,8 +28,9 @@ namespace KIO { class Job; }
class PluginBabelFish : public KParts::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- PluginBabelFish( TQObject* parent, const char* name,
+ PluginBabelFish( TQObject* tqparent, const char* name,
const TQStringList & );
virtual ~PluginBabelFish();
diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp
index b1e1f6f..5e04b1a 100644
--- a/konq-plugins/crashes/crashesplugin.cpp
+++ b/konq-plugins/crashes/crashesplugin.cpp
@@ -37,10 +37,10 @@
typedef KGenericFactory<CrashesPlugin> CrashesPluginFactory;
K_EXPORT_COMPONENT_FACTORY( libcrashesplugin, CrashesPluginFactory( "crashesplugin" ) )
-CrashesPlugin::CrashesPlugin( TQObject* parent, const char* name, const TQStringList & )
-: KParts::Plugin( parent, name )
+CrashesPlugin::CrashesPlugin( TQObject* tqparent, const char* name, const TQStringList & )
+: KParts::Plugin( tqparent, name )
{
- m_part = (parent && parent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(parent) : 0L;
+ m_part = (tqparent && tqparent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(tqparent) : 0L;
m_pCrashesMenu = new KActionMenu( i18n("&Crashes"), "core",
actionCollection(), "crashes" );
@@ -139,12 +139,12 @@ void CrashesPlugin::slotAboutToShow()
void CrashesPlugin::newBookmarkCallback( const TQString & text, const TQCString & url,
const TQString & )
{
- m_crashesList.prepend(qMakePair(text,url));
+ m_crashesList.prepend(tqMakePair(text,url));
}
void CrashesPlugin::endFolderCallback( )
{
- m_crashesList.prepend(qMakePair(TQString("-"),TQCString("-")));
+ m_crashesList.prepend(tqMakePair(TQString("-"),TQCString("-")));
}
void CrashesPlugin::slotClearCrashes() {
diff --git a/konq-plugins/crashes/crashesplugin.h b/konq-plugins/crashes/crashesplugin.h
index 3c6a402..0af567e 100644
--- a/konq-plugins/crashes/crashesplugin.h
+++ b/konq-plugins/crashes/crashesplugin.h
@@ -35,9 +35,10 @@ class KActionMenu;
class CrashesPlugin : public KParts::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- CrashesPlugin( TQObject* parent, const char* name,
+ CrashesPlugin( TQObject* tqparent, const char* name,
const TQStringList & );
~CrashesPlugin();
@@ -55,12 +56,12 @@ private:
KHTMLPart* m_part;
KActionMenu* m_pCrashesMenu;
- typedef QPair<TQString,TQCString> Crash;
+ typedef TQPair<TQString,TQCString> Crash;
typedef TQValueList<Crash> CrashesList;
CrashesList m_crashesList;
- typedef QPair<int, int> CrashRange;
+ typedef TQPair<int, int> CrashRange;
typedef TQValueList<CrashRange> CrashRangesList;
CrashRangesList m_crashRangesList;
diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp
index ff2eecd..ea5fe77 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.cpp
+++ b/konq-plugins/dirfilter/dirfilterplugin.cpp
@@ -141,14 +141,14 @@ void SessionManager::loadSettings()
-DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name,
+DirFilterPlugin::DirFilterPlugin (TQObject* tqparent, const char* name,
const TQStringList&)
- :KParts::Plugin (parent, name),
+ :KParts::Plugin (tqparent, name),
m_pFilterMenu(0),
m_searchWidget(0),
m_oldFilterString("")
{
- m_part = ::qt_cast<KonqDirPart*>(parent);
+ m_part = ::tqqt_cast<KonqDirPart*>(tqparent);
if ( !m_part || !m_part->scrollWidget() )
return;
@@ -179,12 +179,12 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name,
clear->setWhatsThis(i18n("Clear filter field<p>Clears the content of the filter field."));
- if ( ::qt_cast<KListView*>(m_part->scrollWidget()) )
+ if ( ::tqqt_cast<KListView*>(m_part->scrollWidget()) )
{
m_searchWidget = new KListViewSearchLine(hbox);
static_cast<KListViewSearchLine*>(m_searchWidget)->setListView(static_cast<KListView*>(m_part->scrollWidget()));
}
- else if ( ::qt_cast<TQIconView*>(m_part->scrollWidget()) )
+ else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) )
{
m_searchWidget = new KIconViewSearchLine(hbox);
static_cast<KIconViewSearchLine*>(m_searchWidget)->setIconView(static_cast<TQIconView*>(m_part->scrollWidget()));
@@ -204,7 +204,7 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name,
// FIXME: This causes crashes for an unknown reason on certain systems
// Probably the iconview onchange event handler should tempoarily stop this timer before doing anything else
-// Really the broken Qt3 iconview should just be modified to include a hidden list; it would make things *so* much easier!
+// Really the broken TQt3 iconview should just be modified to include a hidden list; it would make things *so* much easier!
m_refreshTimer = new TQTimer( this );
m_reactivateRefreshTimer = new TQTimer( this );
connect( m_refreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(activateSearch()) );
@@ -416,11 +416,11 @@ void DirFilterPlugin::slotItemsAdded (const KFileItemList& list)
m_pFilterMenu->setEnabled (m_part->nameFilter().isEmpty());
return;
}
- if ( ::qt_cast<KListView*>(m_part->scrollWidget()) )
+ if ( ::tqqt_cast<KListView*>(m_part->scrollWidget()) )
{
static_cast<KListViewSearchLine*>(m_searchWidget)->updateSearch();
}
- else if ( ::qt_cast<TQIconView*>(m_part->scrollWidget()) )
+ else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) )
{
static_cast<KIconViewSearchLine*>(m_searchWidget)->updateSearch();
}
@@ -438,11 +438,11 @@ void DirFilterPlugin::slotItemsAdded (const KFileItemList& list)
continue;
TQString mimeType = mime->name();
- if (!m_pMimeInfo.contains (mimeType))
+ if (!m_pMimeInfo.tqcontains (mimeType))
{
MimeInfo& mimeInfo = m_pMimeInfo[mimeType];
TQStringList filters = m_part->mimeFilter ();
- mimeInfo.useAsFilter = (!filters.isEmpty () && filters.contains (mimeType));
+ mimeInfo.useAsFilter = (!filters.isEmpty () && filters.tqcontains (mimeType));
mimeInfo.mimeComment = mime->comment();
mimeInfo.iconName = mime->icon(KURL(), false);
mimeInfo.filenames.insert(name, false);
@@ -468,13 +468,13 @@ void DirFilterPlugin::slotItemRemoved (const KFileItem* item)
// NOTE: This bug is NOT present in qlistviewitem
// HACK around it here...
- if ( ::qt_cast<TQIconView*>(m_part->scrollWidget()) ) {
+ if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) {
static_cast<KIconViewSearchLine*>(m_searchWidget)->iconDeleted(item->name());
}
TQString mimeType = item->mimetype().stripWhiteSpace();
- if (m_pMimeInfo.contains (mimeType)) {
+ if (m_pMimeInfo.tqcontains (mimeType)) {
MimeInfo info = m_pMimeInfo [mimeType];
if (info.filenames.size () > 1)
@@ -506,10 +506,10 @@ void DirFilterPlugin::activateSearch()
m_oldFilterString = m_searchWidget->text();
- if ( ::qt_cast<KListView*>(m_part->scrollWidget()) ) {
+ if ( ::tqqt_cast<KListView*>(m_part->scrollWidget()) ) {
static_cast<KListViewSearchLine*>(m_searchWidget)->updateSearch();
}
- else if ( ::qt_cast<TQIconView*>(m_part->scrollWidget()) ) {
+ else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) {
static_cast<KIconViewSearchLine*>(m_searchWidget)->updateSearch();
}
}
diff --git a/konq-plugins/dirfilter/dirfilterplugin.h b/konq-plugins/dirfilter/dirfilterplugin.h
index ff3497e..d6e87e6 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.h
+++ b/konq-plugins/dirfilter/dirfilterplugin.h
@@ -81,10 +81,11 @@ private:
class DirFilterPlugin : public KParts::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- DirFilterPlugin (TQObject* parent, const char* name, const TQStringList &);
+ DirFilterPlugin (TQObject* tqparent, const char* name, const TQStringList &);
~DirFilterPlugin ();
protected:
diff --git a/konq-plugins/domtreeviewer/attributeeditdialog.ui b/konq-plugins/domtreeviewer/attributeeditdialog.ui
index c77f92d..c98bb3d 100644
--- a/konq-plugins/domtreeviewer/attributeeditdialog.ui
+++ b/konq-plugins/domtreeviewer/attributeeditdialog.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>AttributeEditDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>AttributeEditDialog</cstring>
</property>
@@ -19,15 +19,15 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout7</cstring>
+ <cstring>tqlayout7</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -45,7 +45,7 @@
</widget>
</hbox>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -87,15 +87,15 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout8</cstring>
+ <cstring>tqlayout8</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>okBtn</cstring>
</property>
@@ -119,14 +119,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>121</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>cancelBtn</cstring>
</property>
@@ -166,7 +166,7 @@
<slot>accept()</slot>
</connection>
</connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>ktextedit.h</includehint>
diff --git a/konq-plugins/domtreeviewer/domlistviewitem.cpp b/konq-plugins/domtreeviewer/domlistviewitem.cpp
index 7ab20b4..4203765 100644
--- a/konq-plugins/domtreeviewer/domlistviewitem.cpp
+++ b/konq-plugins/domtreeviewer/domlistviewitem.cpp
@@ -23,26 +23,26 @@
#include <kglobalsettings.h>
-DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *parent )
- : TQListViewItem( parent ), m_node(node)
+DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *tqparent )
+ : TQListViewItem( tqparent ), m_node(node)
{
init();
}
-DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *parent, TQListViewItem *after)
- : TQListViewItem( parent, after ), m_node(node)
+DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *tqparent, TQListViewItem *after)
+ : TQListViewItem( tqparent, after ), m_node(node)
{
init();
}
-DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *parent )
- : TQListViewItem( parent ), m_node(node)
+DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *tqparent )
+ : TQListViewItem( tqparent ), m_node(node)
{
init();
}
-DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *parent, TQListViewItem *after)
- : TQListViewItem( parent, after ), m_node(node)
+DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *tqparent, TQListViewItem *after)
+ : TQListViewItem( tqparent, after ), m_node(node)
{
init();
}
@@ -59,14 +59,14 @@ void DOMListViewItem::init()
clos = false;
}
-void DOMListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment )
+void DOMListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment )
{
TQColorGroup _cg( cg );
TQColor c = _cg.text();
p->setFont(m_font);
_cg.setColor( TQColorGroup::Text, m_color );
- TQListViewItem::paintCell( p, _cg, column, width, alignment );
+ TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
_cg.setColor( TQColorGroup::Text, c );
}
diff --git a/konq-plugins/domtreeviewer/domlistviewitem.h b/konq-plugins/domtreeviewer/domlistviewitem.h
index 9a85fbf..14cf5ec 100644
--- a/konq-plugins/domtreeviewer/domlistviewitem.h
+++ b/konq-plugins/domtreeviewer/domlistviewitem.h
@@ -22,18 +22,18 @@
#include <tqcolor.h>
#include <tqfont.h>
-class DOMListViewItem : public QListViewItem
+class DOMListViewItem : public TQListViewItem
{
public:
- DOMListViewItem( const DOM::Node &, TQListView *parent );
- DOMListViewItem( const DOM::Node &, TQListView *parent, TQListViewItem *after );
- DOMListViewItem( const DOM::Node &, TQListViewItem *parent );
- DOMListViewItem( const DOM::Node &, TQListViewItem *parent, TQListViewItem *after );
+ DOMListViewItem( const DOM::Node &, TQListView *tqparent );
+ DOMListViewItem( const DOM::Node &, TQListView *tqparent, TQListViewItem *after );
+ DOMListViewItem( const DOM::Node &, TQListViewItem *tqparent );
+ DOMListViewItem( const DOM::Node &, TQListViewItem *tqparent, TQListViewItem *after );
virtual ~DOMListViewItem();
virtual void paintCell( TQPainter *p, const TQColorGroup &cg,
- int column, int width, int alignment );
+ int column, int width, int tqalignment );
void setColor( const TQColor &color) { m_color = color; }
diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp
index 0bbb918..e8f8f05 100644
--- a/konq-plugins/domtreeviewer/domtreecommands.cpp
+++ b/konq-plugins/domtreeviewer/domtreecommands.cpp
@@ -53,7 +53,7 @@ static const char * const dom_error_msgs[] = {
TQString domtreeviewer::domErrorMessage(int dom_err)
{
if ((unsigned)dom_err > sizeof dom_error_msgs/sizeof dom_error_msgs[0])
- return i18n("Unknown Exception %1").arg(dom_err);
+ return i18n("Unknown Exception %1").tqarg(dom_err);
else
return i18n(dom_error_msgs[dom_err]);
}
@@ -401,8 +401,8 @@ void ChangeCDataCommand::apply()
if (!shouldReapply()) {
oldValue = cdata.data();
has_newlines =
- TQConstString(value.unicode(), value.length()).string().contains('\n')
- || TQConstString(oldValue.unicode(), oldValue.length()).string().contains('\n');
+ TQConstString(value.tqunicode(), value.length()).string().tqcontains('\n')
+ || TQConstString(oldValue.tqunicode(), oldValue.length()).string().tqcontains('\n');
}
cdata.setData(value);
addChangedNode(cdata);
@@ -423,8 +423,8 @@ TQString ChangeCDataCommand::name() const
// == ManipulateNodeCommand ===========================================
-ManipulateNodeCommand::ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after)
-: _node(node), _parent(parent), _after(after)
+ManipulateNodeCommand::ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after)
+: _node(node), _parent(tqparent), _after(after)
{
}
@@ -457,8 +457,8 @@ void ManipulateNodeCommand::remove()
// == InsertNodeCommand ===========================================
-InsertNodeCommand::InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after)
-: ManipulateNodeCommand(node, parent, after)
+InsertNodeCommand::InsertNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after)
+: ManipulateNodeCommand(node, tqparent, after)
{
}
@@ -485,8 +485,8 @@ TQString InsertNodeCommand::name() const
// == RemoveNodeCommand ===========================================
-RemoveNodeCommand::RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after)
-: ManipulateNodeCommand(node, parent, after)
+RemoveNodeCommand::RemoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after)
+: ManipulateNodeCommand(node, tqparent, after)
{
}
@@ -513,8 +513,8 @@ TQString RemoveNodeCommand::name() const
// == MoveNodeCommand ===========================================
-MoveNodeCommand::MoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after)
-: _node(node), new_parent(parent), new_after(after)
+MoveNodeCommand::MoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after)
+: _node(node), new_parent(tqparent), new_after(after)
{
old_parent = node.parentNode();
old_after = node.nextSibling();
diff --git a/konq-plugins/domtreeviewer/domtreecommands.h b/konq-plugins/domtreeviewer/domtreecommands.h
index f068426..43af96b 100644
--- a/konq-plugins/domtreeviewer/domtreecommands.h
+++ b/konq-plugins/domtreeviewer/domtreecommands.h
@@ -51,9 +51,10 @@ TQString domErrorMessage(int exception_code);
* Internal class for emitting signals.
* @internal
*/
-class ManipulationCommandSignalEmitter : public QObject
+class ManipulationCommandSignalEmitter : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
ManipulationCommandSignalEmitter();
virtual ~ManipulationCommandSignalEmitter();
@@ -73,7 +74,7 @@ signals:
*/
void error(int err_id, const TQString &msg);
-private: // make moc not complain
+private: // make tqmoc not complain
friend class ManipulationCommand;
};
@@ -276,10 +277,10 @@ class ManipulateNodeCommand : public ManipulationCommand
{
public:
/**
- * Prepare command, where \c node is to be contained in \c parent, just
+ * Prepare command, where \c node is to be contained in \c tqparent, just
* before \c after. If \c after is 0, it is appended at the end.
*/
- ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after);
+ ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after);
virtual ~ManipulateNodeCommand();
protected:
@@ -303,10 +304,10 @@ class InsertNodeCommand : public ManipulateNodeCommand
{
public:
/**
- * Prepare insertion command, inserting \c node into \c parent, just
- * before \c after. If \c after is 0, append it to the list of children.
+ * Prepare insertion command, inserting \c node into \c tqparent, just
+ * before \c after. If \c after is 0, append it to the list of tqchildren.
*/
- InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after);
+ InsertNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after);
virtual ~InsertNodeCommand();
virtual TQString name() const;
@@ -329,10 +330,10 @@ class RemoveNodeCommand : public ManipulateNodeCommand
{
public:
/**
- * Prepare insertion command, inserting \c node into \c parent, just
- * before \c after. If \c after is 0, append it to the list of children.
+ * Prepare insertion command, inserting \c node into \c tqparent, just
+ * before \c after. If \c after is 0, append it to the list of tqchildren.
*/
- RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after);
+ RemoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after);
virtual ~RemoveNodeCommand();
virtual TQString name() const;
@@ -352,10 +353,10 @@ class MoveNodeCommand : public ManipulationCommand
{
public:
/**
- * Move \c node from current position into \c parent, just before \c after.
+ * Move \c node from current position into \c tqparent, just before \c after.
* Appends if \c after is 0.
*/
- MoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after);
+ MoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after);
virtual ~MoveNodeCommand();
virtual TQString name() const;
diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index d26dbfc..812cb5b 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -64,8 +64,8 @@
using namespace domtreeviewer;
-DOMTreeView::DOMTreeView(TQWidget *parent, const char* name, bool /*allowSaving*/)
- : DOMTreeViewBase(parent, name), m_expansionDepth(5), m_maxDepth(0),
+DOMTreeView::DOMTreeView(TQWidget *tqparent, const char* name, bool /*allowSaving*/)
+ : DOMTreeViewBase(tqparent, name), m_expansionDepth(5), m_maxDepth(0),
m_bPure(true), m_bShowAttributes(true), m_bHighlightHTML(true),
m_findDialog(0), focused_child(0)
{
@@ -101,8 +101,8 @@ DOMTreeView::DOMTreeView(TQWidget *parent, const char* name, bool /*allowSaving*
installEventFilter(m_listView);
- ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_SLOT(slotRefreshNode(const DOM::Node &)));
- ManipulationCommand::connect(TQT_SIGNAL(structureChanged()), this, TQT_SLOT(refresh()));
+ ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), TQT_TQOBJECT(this), TQT_SLOT(slotRefreshNode(const DOM::Node &)));
+ ManipulationCommand::connect(TQT_SIGNAL(structureChanged()), TQT_TQOBJECT(this), TQT_SLOT(refresh()));
initDOMNodeInfo();
@@ -124,28 +124,28 @@ void DOMTreeView::setHtmlPart(KHTMLPart *_part)
// nothing here yet
}
- parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).arg(part->url().prettyURL()) : i18n("DOM Tree") );
+ tqparentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).tqarg(part->url().prettyURL()) : i18n("DOM Tree") );
TQTimer::singleShot(0, this, TQT_SLOT(slotSetHtmlPartDelayed()));
}
DOMTreeWindow *DOMTreeView::mainWindow() const
{
- return static_cast<DOMTreeWindow *>(parentWidget());
+ return static_cast<DOMTreeWindow *>(tqparentWidget());
}
bool DOMTreeView::eventFilter(TQObject *o, TQEvent *e)
{
if (e->type() == TQEvent::AccelOverride) {
- TQKeyEvent *ke = static_cast<TQKeyEvent *>(e);
+ TQKeyEvent *ke = TQT_TQKEYEVENT(e);
kdDebug(90180) << " acceloverride " << ke->key() << " o " << o->name() << endl;
- if (o == m_listView) { // DOM tree
+ if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_listView)) { // DOM tree
KKey ks = mainWindow()->deleteNodeAction()->shortcut().seq(0).key(0);
if (ke->key() == ks.keyCodeQt())
return true;
- } else if (o == nodeAttributes) {
+ } else if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(nodeAttributes)) {
KKey ks = mainWindow()->deleteAttributeAction()->shortcut().seq(0).key(0);
if (ke->key() == ks.keyCodeQt())
return true;
@@ -155,14 +155,14 @@ bool DOMTreeView::eventFilter(TQObject *o, TQEvent *e)
} else if (e->type() == TQEvent::FocusIn) {
kdDebug(90180) << " focusin o " << o->name() << endl;
- if (o != this) {
+ if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this)) {
focused_child = o;
}
} else if (e->type() == TQEvent::FocusOut) {
kdDebug(90180) << " focusout o " << o->name() << endl;
- if (o != this) {
+ if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this)) {
focused_child = 0;
}
@@ -214,7 +214,7 @@ void DOMTreeView::slotShowTree(const DOM::Node &pNode)
void DOMTreeView::showRecursive(const DOM::Node &pNode, const DOM::Node &node, uint depth)
{
DOMListViewItem *cur_item;
- DOMListViewItem *parent_item = m_itemdict[pNode.handle()];
+ DOMListViewItem *tqparent_item = m_itemdict[pNode.handle()];
if (depth > m_maxDepth) {
m_maxDepth = depth;
@@ -224,7 +224,7 @@ void DOMTreeView::showRecursive(const DOM::Node &pNode, const DOM::Node &node, u
cur_item = new DOMListViewItem(node, m_listView);
m_document = pNode.ownerDocument();
} else {
- cur_item = new DOMListViewItem(node, parent_item);
+ cur_item = new DOMListViewItem(node, tqparent_item);
}
//kdDebug(90180) << node.nodeName().string() << " [" << depth << "]" << endl;
@@ -252,7 +252,7 @@ void DOMTreeView::showRecursive(const DOM::Node &pNode, const DOM::Node &node, u
cur_item = new DOMListViewItem(node, m_listView, cur_item);
m_document = pNode.ownerDocument();
} else {
- cur_item = new DOMListViewItem(node, parent_item, cur_item);
+ cur_item = new DOMListViewItem(node, tqparent_item, cur_item);
}
//kdDebug(90180) << "</" << node.nodeName().string() << ">" << endl;
addElement(element, cur_item, true);
@@ -318,13 +318,13 @@ void DOMTreeView::addElement ( const DOM::Node &node, DOMListViewItem *cur_item
m_itemdict.insert(node.handle(), cur_item);
}
- DOMListViewItem *parent;
- if (cur_item->parent()) {
- parent = static_cast<DOMListViewItem *>(cur_item->parent());
+ DOMListViewItem *tqparent;
+ if (cur_item->tqparent()) {
+ tqparent = static_cast<DOMListViewItem *>(cur_item->tqparent());
} else {
- parent = cur_item;
+ tqparent = cur_item;
}
- cur_item = new DOMListViewItem(node, parent, cur_item);
+ cur_item = new DOMListViewItem(node, tqparent, cur_item);
}
// This is one is too much
DOMListViewItem *notLastItem = static_cast<DOMListViewItem *>(cur_item->itemAbove());
@@ -343,7 +343,7 @@ void DOMTreeView::highlightHTML(DOMListViewItem *cur_item, const TQString &nodeN
* think it's worth it.
*/
- TQColor namedColor(palette().active().text());
+ TQColor namedColor(tqpalette().active().text());
TQString tagName = nodeName.upper();
if ( tagName == "HTML" ) {
namedColor = "#0000ff";
@@ -469,13 +469,13 @@ void DOMTreeView::slotMovedItems(TQPtrList<TQListViewItem> &items, TQPtrList<TQL
for (; it != items.end(); ++it, ++anit) {
DOMListViewItem *item = static_cast<DOMListViewItem *>(*it);
DOMListViewItem *anitem = static_cast<DOMListViewItem *>(*anit);
- DOM::Node parent = static_cast<DOMListViewItem *>(item->parent())->node();
- Q_ASSERT(!parent.isNull());
+ DOM::Node tqparent = static_cast<DOMListViewItem *>(item->tqparent())->node();
+ Q_ASSERT(!tqparent.isNull());
// kdDebug(90180) << " afternow " << anitem << " node " << (anitem ? anitem->node().nodeName().string() : TQString()) << "=" << (anitem ? anitem->node().nodeValue().string() : TQString()) << endl;
- cmd->addCommand(new MoveNodeCommand(item->node(), parent,
- anitem ? anitem->node().nextSibling() : parent.firstChild())
+ cmd->addCommand(new MoveNodeCommand(item->node(), tqparent,
+ anitem ? anitem->node().nextSibling() : tqparent.firstChild())
);
}
@@ -503,7 +503,7 @@ void DOMTreeView::searchRecursive(DOMListViewItem* cur_item, const TQString& sea
bool caseSensitive)
{
const TQString text(cur_item->text(0));
- if (text.contains(searchText, caseSensitive) > 0) {
+ if (text.tqcontains(searchText, caseSensitive) > 0) {
cur_item->setUnderline(true);
cur_item->setItalic(true);
m_listView->setCurrentItem(cur_item);
@@ -530,7 +530,7 @@ void DOMTreeView::slotSaveClicked()
if (file.exists()) {
const TQString title = i18n( "File Exists" );
- const TQString text = i18n( "Do you really want to overwrite: \n%1?" ).arg(url.url());
+ const TQString text = i18n( "Do you really want to overwrite: \n%1?" ).tqarg(url.url());
if (KMessageBox::Continue != KMessageBox::warningContinueCancel(this, text, title, i18n("Overwrite") ) ) {
return;
}
@@ -545,12 +545,12 @@ void DOMTreeView::slotSaveClicked()
delete m_textStream;
} else {
const TQString title = i18n( "Unable to Open File" );
- const TQString text = i18n( "Unable to open \n %1 \n for writing" ).arg(url.path());
+ const TQString text = i18n( "Unable to open \n %1 \n for writing" ).tqarg(url.path());
KMessageBox::sorry( this, text, title );
}
} else {
const TQString title = i18n( "Invalid URL" );
- const TQString text = i18n( "This URL \n %1 \n is not valid." ).arg(url.url());
+ const TQString text = i18n( "This URL \n %1 \n is not valid." ).tqarg(url.url());
KMessageBox::sorry( this, text, title );
}
}
@@ -720,8 +720,8 @@ void DOMTreeView::hideMessageLine()
void DOMTreeView::moveToParent()
{
// This is a hypersmart algorithm.
- // If infoNode is defined, go to the parent of infoNode, otherwise, go
- // to the parent of the tree view's current item.
+ // If infoNode is defined, go to the tqparent of infoNode, otherwise, go
+ // to the tqparent of the tree view's current item.
// Hope this isn't too smart.
DOM::Node cur = infoNode;
@@ -773,15 +773,15 @@ void DOMTreeView::deleteNodes()
// don't regard node more than once
if (item->node() == last) continue;
- // check for selected parent
+ // check for selected tqparent
bool has_selected_parent = false;
- for (TQListViewItem *p = item->parent(); p; p = p->parent()) {
+ for (TQListViewItem *p = item->tqparent(); p; p = p->tqparent()) {
if (p->isSelected()) { has_selected_parent = true; break; }
}
if (has_selected_parent) continue;
// kdDebug(90180) << " item->node " << item->node().nodeName().string() << ": schedule for removal" << endl;
- // remove this node if it isn't already recursively removed by its parent
+ // remove this node if it isn't already recursively removed by its tqparent
cmd->addCommand(new RemoveNodeCommand(item->node(), item->node().parentNode(), item->node().nextSibling()));
last = item->node();
}
@@ -885,13 +885,13 @@ void DOMTreeView::slotAddElementDlg()
DOM::Node curNode = item->node();
try {
- DOM::Node parent = addBefore() ? curNode.parentNode() : curNode;
+ DOM::Node tqparent = addBefore() ? curNode.parentNode() : curNode;
DOM::Node after = addBefore() ? curNode : 0;
// ### take namespace into account
DOM::Node newNode = curNode.ownerDocument().createElement(qname);
- ManipulationCommand *cmd = new InsertNodeCommand(newNode, parent, after);
+ ManipulationCommand *cmd = new InsertNodeCommand(newNode, tqparent, after);
mainWindow()->executeAndAddCommand(cmd);
if (cmd->isValid()) activateNode(newNode);
@@ -921,12 +921,12 @@ void DOMTreeView::slotAddTextDlg()
DOM::Node curNode = item->node();
try {
- DOM::Node parent = addBefore() ? curNode.parentNode() : curNode;
+ DOM::Node tqparent = addBefore() ? curNode.parentNode() : curNode;
DOM::Node after = addBefore() ? curNode : 0;
DOM::Node newNode = curNode.ownerDocument().createTextNode(text);
- ManipulationCommand *cmd = new InsertNodeCommand(newNode, parent, after);
+ ManipulationCommand *cmd = new InsertNodeCommand(newNode, tqparent, after);
mainWindow()->executeAndAddCommand(cmd);
if (cmd->isValid()) activateNode(newNode);
@@ -943,21 +943,21 @@ static TQString *clickToAdd;
/**
* List view item for attribute list.
*/
-class AttributeListItem : public QListViewItem
+class AttributeListItem : public TQListViewItem
{
typedef TQListViewItem super;
bool _new;
public:
- AttributeListItem(TQListView *parent, TQListViewItem *prev)
- : super(parent, prev), _new(true)
+ AttributeListItem(TQListView *tqparent, TQListViewItem *prev)
+ : super(tqparent, prev), _new(true)
{
}
AttributeListItem(const TQString &attrName, const TQString &attrValue,
- TQListView *parent, TQListViewItem *prev)
- : super(parent, prev), _new(false)
+ TQListView *tqparent, TQListViewItem *prev)
+ : super(tqparent, prev), _new(false)
{
setText(0, attrName);
setText(1, attrValue);
@@ -973,7 +973,7 @@ public:
protected:
virtual void paintCell( TQPainter *p, const TQColorGroup &cg,
- int column, int width, int alignment )
+ int column, int width, int tqalignment )
{
bool updates_enabled = listView()->isUpdatesEnabled();
listView()->setUpdatesEnabled(false);
@@ -993,7 +993,7 @@ protected:
TQColorGroup _cg( cg );
_cg.setColor( TQColorGroup::Text, c );
- super::paintCell( p, _cg, column, width, alignment );
+ super::paintCell( p, _cg, column, width, tqalignment );
if (text_changed) setText(column, oldText);
listView()->setUpdatesEnabled(updates_enabled);
@@ -1015,7 +1015,7 @@ void DOMTreeView::initDOMNodeInfo()
connect(applyContent, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyContent()));
- ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_SLOT(initializeOptionsFromNode(const DOM::Node &)));
+ ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), TQT_TQOBJECT(this), TQT_SLOT(initializeOptionsFromNode(const DOM::Node &)));
nodeAttributes->setRenameable(0, true);
nodeAttributes->setRenameable(1, true);
@@ -1168,7 +1168,7 @@ void DOMTreeView::slotEditAttribute(TQListViewItem *lvi, const TQPoint &, int co
slotItemRenamed(lvi, attrName, 0);
// Reget, item may have been changed
- lvi = nodeAttributes->findItem(attrName, 0);
+ lvi = nodeAttributes->tqfindItem(attrName, 0);
}
if (lvi && lvi->text(1) != attrValue)
diff --git a/konq-plugins/domtreeviewer/domtreeview.h b/konq-plugins/domtreeviewer/domtreeview.h
index 8589805..499a545 100644
--- a/konq-plugins/domtreeviewer/domtreeview.h
+++ b/konq-plugins/domtreeviewer/domtreeview.h
@@ -47,9 +47,10 @@ class KHTMLPart;
class DOMTreeView : public DOMTreeViewBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- DOMTreeView(TQWidget *parent, const char* name, bool allowSaving = true);
+ DOMTreeView(TQWidget *tqparent, const char* name, bool allowSaving = true);
~DOMTreeView();
KHTMLPart *htmlPart() const { return part; }
@@ -168,7 +169,7 @@ class DOMTreeView : public DOMTreeViewBase
// == DOM Node Info panel ======================================
public:
- // Keep in sync with the widget stack children
+ // Keep in sync with the widget stack tqchildren
enum InfoPanel { ElementPanel, CDataPanel, EmptyPanel };
public slots:
diff --git a/konq-plugins/domtreeviewer/domtreeviewbase.ui b/konq-plugins/domtreeviewer/domtreeviewbase.ui
index 984e435..025c623 100644
--- a/konq-plugins/domtreeviewer/domtreeviewbase.ui
+++ b/konq-plugins/domtreeviewer/domtreeviewbase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>DOMTreeViewBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>DOMTreeViewBase</cstring>
</property>
@@ -12,7 +12,7 @@
<height>508</height>
</rect>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>600</width>
<height>380</height>
@@ -25,7 +25,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>messageLinePane</cstring>
</property>
@@ -108,7 +108,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>10</width>
<height>20</height>
@@ -133,9 +133,9 @@
</widget>
</hbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout7</cstring>
+ <cstring>tqlayout7</cstring>
</property>
<hbox>
<property name="name">
@@ -169,11 +169,11 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox1</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>300</width>
<height>400</height>
@@ -186,15 +186,15 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="3" column="0">
+ <widget class="TQLabel" row="3" column="0">
<property name="name">
<cstring>textLabel1_2_3</cstring>
</property>
@@ -205,7 +205,7 @@
<cstring>nodeValue</cstring>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel1_2_2</cstring>
</property>
@@ -216,7 +216,7 @@
<cstring>nodeType</cstring>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
@@ -227,7 +227,7 @@
<cstring>nodeNamespace</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -308,11 +308,11 @@
</widget>
</grid>
</widget>
- <widget class="QWidgetStack">
+ <widget class="TQWidgetStack">
<property name="name">
<cstring>nodeInfoStack</cstring>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>ElementInfo</cstring>
</property>
@@ -370,7 +370,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>CharacterData</cstring>
</property>
@@ -398,15 +398,15 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>applyContent</cstring>
</property>
@@ -424,7 +424,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>81</width>
<height>20</height>
@@ -435,7 +435,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>Empty</cstring>
</property>
@@ -448,7 +448,7 @@
</widget>
</hbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox2</cstring>
</property>
@@ -459,7 +459,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_pureCheckBox</cstring>
</property>
@@ -470,7 +470,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_showAttributesCheckBox</cstring>
</property>
@@ -481,7 +481,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_highlightHTMLCheckBox</cstring>
</property>
@@ -509,7 +509,7 @@
<tabstop>m_highlightHTMLCheckBox</tabstop>
<tabstop>nodeAttributes</tabstop>
</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index 0dd6d7f..6790e5a 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -72,7 +72,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
// message window dialog
msgdlg = new MessageDialog(0, "MessageDialog");
- msgdlg->messagePane->setPaletteBackgroundColor(palette().active().base());
+ msgdlg->messagePane->setPaletteBackgroundColor(tqpalette().active().base());
// msgdlg->show();
// then, setup our actions
@@ -93,7 +93,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
TQT_SLOT(slotHtmlPartChanged(KHTMLPart *)));
ManipulationCommand::connect(TQT_SIGNAL(error(int, const TQString &)),
- this, TQT_SLOT(addMessage(int, const TQString &)));
+ TQT_TQOBJECT(this), TQT_SLOT(addMessage(int, const TQString &)));
infopanel_ctx = createInfoPanelAttrContextMenu();
domtree_ctx = createDOMTreeViewContextMenu();
@@ -119,17 +119,17 @@ void DOMTreeWindow::executeAndAddCommand(ManipulationCommand *cmd)
void DOMTreeWindow::setupActions()
{
- KStdAction::close(this, TQT_SLOT(close()), actionCollection());
+ KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
- KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection())->setEnabled(false);
- KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection())->setEnabled(false);
- KStdAction::paste(this, TQT_SLOT(slotPaste()), actionCollection())->setEnabled(false);
+ KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection())->setEnabled(false);
+ KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection())->setEnabled(false);
+ KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), actionCollection())->setEnabled(false);
m_commandHistory = new KCommandHistory(actionCollection());
- KStdAction::find(this, TQT_SLOT(slotFind()), actionCollection());
+ KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection());
- KStdAction::redisplay(m_view, TQT_SLOT(refresh()), actionCollection());
+ KStdAction::redisplay(TQT_TQOBJECT(m_view), TQT_SLOT(refresh()), actionCollection());
// toggle manipulation dialog
KAction *showMsgDlg = new KAction(i18n("Show Message Log"),
@@ -141,14 +141,14 @@ void DOMTreeWindow::setupActions()
// actionCollection(), "custom_action");
// actions for the dom tree list view toolbar
- KStdAction::up(view(), TQT_SLOT(moveToParent()), actionCollection(), "tree_up");
+ KStdAction::up(TQT_TQOBJECT(view()), TQT_SLOT(moveToParent()), actionCollection(), "tree_up");
KAction *tree_inc_level = new KAction(i18n("Expand"),
- "1rightarrow", CTRL+Key_Greater, view(),
+ "1rightarrow", CTRL+Key_Greater, TQT_TQOBJECT(view()),
TQT_SLOT(increaseExpansionDepth()), actionCollection(),
"tree_inc_level");
tree_inc_level->setToolTip(i18n("Increase expansion level"));
KAction *tree_dec_level = new KAction(i18n("Collapse"),
- "1leftarrow", CTRL+Key_Less, view(),
+ "1leftarrow", CTRL+Key_Less, TQT_TQOBJECT(view()),
TQT_SLOT(decreaseExpansionDepth()), actionCollection(),
"tree_dec_level");
tree_dec_level->setToolTip(i18n("Decrease expansion level"));
@@ -156,20 +156,20 @@ void DOMTreeWindow::setupActions()
// actions for the dom tree list view context menu
del_tree = new KAction(i18n("&Delete"), "editdelete",
- Key_Delete, view(), TQT_SLOT(deleteNodes()),
+ Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteNodes()),
actionCollection(), "tree_delete");
del_tree->setToolTip(i18n("Delete nodes"));
/*KAction *new_elem = */new KAction(i18n("New &Element ..."),
- "bookmark", KShortcut(), view(),
+ "bookmark", KShortcut(), TQT_TQOBJECT(view()),
TQT_SLOT(slotAddElementDlg()), actionCollection(),
"tree_add_element");
/*KAction *new_text = */new KAction(i18n("New &Text Node ..."),
- "text", KShortcut(), view(), TQT_SLOT(slotAddTextDlg()),
+ "text", KShortcut(), TQT_TQOBJECT(view()), TQT_SLOT(slotAddTextDlg()),
actionCollection(), "tree_add_text");
// actions for the info panel attribute list context menu
del_attr = new KAction(i18n("&Delete"), "editdelete",
- Key_Delete, view(), TQT_SLOT(deleteAttributes()),
+ Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteAttributes()),
actionCollection(), "attr_delete");
del_attr->setToolTip(i18n("Delete attributes"));
@@ -230,7 +230,7 @@ void DOMTreeWindow::dragEnterEvent(TQDragEnterEvent *event)
void DOMTreeWindow::dropEvent(TQDropEvent *event)
{
// this is a very simplistic implementation of a drop event. we
- // will only accept a dropped URL. the Qt dnd code can do *much*
+ // will only accept a dropped URL. the TQt dnd code can do *much*
// much more, so please read the docs there
KURL::List urls;
@@ -248,7 +248,7 @@ void DOMTreeWindow::dropEvent(TQDropEvent *event)
void DOMTreeWindow::addMessage(int msg_id, const TQString &msg)
{
- TQDateTime t(TQDateTime::currentDateTime());
+ TQDateTime t(TQDateTime::tqcurrentDateTime());
TQString fullmsg = t.toString();
fullmsg += ":";
@@ -356,7 +356,7 @@ void DOMTreeWindow::slotActivePartChanged(KParts::Part *p)
m_commandHistory->clear();
view()->disconnectFromTornDownPart();
- view()->setHtmlPart(::qt_cast<KHTMLPart *>(p));
+ view()->setHtmlPart(::tqqt_cast<KHTMLPart *>(p));
}
void DOMTreeWindow::slotPartRemoved(KParts::Part *p)
diff --git a/konq-plugins/domtreeviewer/domtreewindow.h b/konq-plugins/domtreeviewer/domtreewindow.h
index cbd1310..c7e134b 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.h
+++ b/konq-plugins/domtreeviewer/domtreewindow.h
@@ -61,6 +61,7 @@ class TQPopupMenu;
class DOMTreeWindow : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Default Constructor
@@ -134,7 +135,7 @@ public slots:
protected:
/**
- * Overridden virtuals for Qt drag 'n drop (XDND)
+ * Overridden virtuals for TQt drag 'n drop (XDND)
*/
virtual void dragEnterEvent(TQDragEnterEvent *event);
virtual void dropEvent(TQDropEvent *event);
diff --git a/konq-plugins/domtreeviewer/elementeditdialog.ui b/konq-plugins/domtreeviewer/elementeditdialog.ui
index 8705250..f91f717 100644
--- a/konq-plugins/domtreeviewer/elementeditdialog.ui
+++ b/konq-plugins/domtreeviewer/elementeditdialog.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ElementEditDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>ElementEditDialog</cstring>
</property>
@@ -19,15 +19,15 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout7</cstring>
+ <cstring>tqlayout7</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -45,15 +45,15 @@
</widget>
</hbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -102,15 +102,15 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>tqlayout6</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>insChildBtn</cstring>
</property>
@@ -124,7 +124,7 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>insBeforeBtn</cstring>
</property>
@@ -145,14 +145,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>60</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>cancelBtn</cstring>
</property>
@@ -192,7 +192,7 @@
<slot>accept()</slot>
</connection>
</connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kcombobox.h</includehint>
diff --git a/konq-plugins/domtreeviewer/messagedialog.ui b/konq-plugins/domtreeviewer/messagedialog.ui
index 3ef4a75..73223a5 100644
--- a/konq-plugins/domtreeviewer/messagedialog.ui
+++ b/konq-plugins/domtreeviewer/messagedialog.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>MessageDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>MessageDialog</cstring>
</property>
@@ -39,15 +39,15 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>btnClear</cstring>
</property>
@@ -68,14 +68,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>300</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>btnClose</cstring>
</property>
@@ -107,10 +107,10 @@
<includes>
<include location="local" impldecl="in implementation">messagedialog.ui.h</include>
</includes>
-<slots>
- <slot specifier="non virtual">addMessage( const QString &amp; msg )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+<Q_SLOTS>
+ <slot specifier="non virtual">addMessage( const TQString &amp; msg )</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>ktextedit.h</includehint>
</includehints>
diff --git a/konq-plugins/domtreeviewer/messagedialog.ui.h b/konq-plugins/domtreeviewer/messagedialog.ui.h
index 33a2951..0c660d0 100644
--- a/konq-plugins/domtreeviewer/messagedialog.ui.h
+++ b/konq-plugins/domtreeviewer/messagedialog.ui.h
@@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you want to add, delete, or rename functions or slots, use
-** Qt Designer to update this file, preserving your code.
+** TQt Designer to update this file, preserving your code.
**
** You should not define a constructor or destructor in this file.
** Instead, write your code in functions called init() and destroy().
diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
index c33f132..2615263 100644
--- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
+++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
@@ -15,9 +15,9 @@
typedef KGenericFactory<PluginDomtreeviewer> DomtreeviewerFactory;
K_EXPORT_COMPONENT_FACTORY( libdomtreeviewerplugin, DomtreeviewerFactory( "domtreeviewer" ) )
-PluginDomtreeviewer::PluginDomtreeviewer( TQObject* parent, const char* name,
+PluginDomtreeviewer::PluginDomtreeviewer( TQObject* tqparent, const char* name,
const TQStringList & )
- : Plugin( parent, name ), m_dialog( 0 )
+ : Plugin( tqparent, name ), m_dialog( 0 )
{
(void) new KAction( i18n("Show &DOM Tree"),
"domtreeviewer", 0,
@@ -38,7 +38,7 @@ void PluginDomtreeviewer::slotShowDOMTree()
delete m_dialog;
Q_ASSERT((DOMTreeWindow *)m_dialog == (DOMTreeWindow *)0);
}
- if (KHTMLPart *part = ::qt_cast<KHTMLPart *>(parent()))
+ if (KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(tqparent()))
{
m_dialog = new DOMTreeWindow(this);
connect( m_dialog, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h
index c6d7320..75ec607 100644
--- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h
+++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h
@@ -12,8 +12,9 @@ class KURL;
class PluginDomtreeviewer : public KParts::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- PluginDomtreeviewer( TQObject* parent, const char* name,
+ PluginDomtreeviewer( TQObject* tqparent, const char* name,
const TQStringList & );
virtual ~PluginDomtreeviewer();
diff --git a/konq-plugins/domtreeviewer/signalreceiver.cpp b/konq-plugins/domtreeviewer/signalreceiver.cpp
index a0c0b1b..fb67abf 100644
--- a/konq-plugins/domtreeviewer/signalreceiver.cpp
+++ b/konq-plugins/domtreeviewer/signalreceiver.cpp
@@ -20,8 +20,8 @@
#include "signalreceiver.h"
-SignalReceiver::SignalReceiver(TQObject *parent, const char *name)
-: TQObject(parent, name), rcvd(false)
+SignalReceiver::SignalReceiver(TQObject *tqparent, const char *name)
+: TQObject(tqparent, name), rcvd(false)
{
}
diff --git a/konq-plugins/domtreeviewer/signalreceiver.h b/konq-plugins/domtreeviewer/signalreceiver.h
index cf67495..9652310 100644
--- a/konq-plugins/domtreeviewer/signalreceiver.h
+++ b/konq-plugins/domtreeviewer/signalreceiver.h
@@ -42,12 +42,13 @@
* use different signal receiver instances for different signals.
* @autor Leo Savernik
*/
-class SignalReceiver : public QObject
+class SignalReceiver : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- SignalReceiver(TQObject *parent = 0, const char *name = 0);
+ SignalReceiver(TQObject *tqparent = 0, const char *name = 0);
virtual ~SignalReceiver();
/** returns true if any signal has been received */
diff --git a/konq-plugins/domtreeviewer/texteditdialog.ui b/konq-plugins/domtreeviewer/texteditdialog.ui
index 96980e2..8563032 100644
--- a/konq-plugins/domtreeviewer/texteditdialog.ui
+++ b/konq-plugins/domtreeviewer/texteditdialog.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>TextEditDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>TextEditDialog</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -58,15 +58,15 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>tqlayout6</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>insChildBtn</cstring>
</property>
@@ -80,7 +80,7 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>insBeforeBtn</cstring>
</property>
@@ -101,14 +101,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>60</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>cancelBtn</cstring>
</property>
@@ -142,7 +142,7 @@
<slot>accept()</slot>
</connection>
</connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>ktextedit.h</includehint>
</includehints>
diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp
index 931c43f..48d97f7 100644
--- a/konq-plugins/fsview/fsview.cpp
+++ b/konq-plugins/fsview/fsview.cpp
@@ -43,8 +43,8 @@
TQMap<TQString, MetricEntry> FSView::_dirMetric;
-FSView::FSView(Inode* base, TQWidget* parent, const char* name)
- : TreeMapWidget(base, parent, name)
+FSView::FSView(Inode* base, TQWidget* tqparent, const char* name)
+ : TreeMapWidget(base, tqparent, name)
{
setFieldType(0, i18n("Name"));
setFieldType(1, i18n("Size"));
@@ -94,12 +94,12 @@ FSView::FSView(Inode* base, TQWidget* parent, const char* name)
double s;
TQString str;
for (i=1;i<=ccount;i++) {
- str = TQString("Dir%1").arg(i);
+ str = TQString("Dir%1").tqarg(i);
if (!cconfig.hasKey(str)) continue;
str = cconfig.readPathEntry(str);
- s = cconfig.readDoubleNumEntry(TQString("Size%1").arg(i), 0.0);
- f = cconfig.readNumEntry(TQString("Files%1").arg(i), 0);
- d = cconfig.readNumEntry(TQString("Dirs%1").arg(i), 0);
+ s = cconfig.readDoubleNumEntry(TQString("Size%1").tqarg(i), 0.0);
+ f = cconfig.readNumEntry(TQString("Files%1").tqarg(i), 0);
+ d = cconfig.readNumEntry(TQString("Dirs%1").tqarg(i), 0);
if (s==0.0 || f==0 || d==0) continue;
setDirMetric(str, s, f, d);
}
@@ -133,7 +133,7 @@ void FSView::setPath(TQString p)
if (!fi.isDir()) {
_path = fi.dirPath(true);
}
- _pathDepth = _path.contains('/');
+ _pathDepth = _path.tqcontains('/');
KURL u;
u.setPath(_path);
@@ -147,7 +147,7 @@ void FSView::setPath(TQString p)
b->setPeer(d);
- setCaption(TQString("%1 - FSView").arg(_path));
+ setCaption(TQString("%1 - FSView").tqarg(_path));
requestUpdate(b);
}
@@ -170,7 +170,7 @@ bool FSView::getDirMetric(const TQString& k,
{
TQMap<TQString, MetricEntry>::iterator it;
- it = _dirMetric.find(k);
+ it = _dirMetric.tqfind(k);
if (it == _dirMetric.end()) return false;
s = (*it).size;
@@ -286,7 +286,7 @@ void FSView::contextMenu(TreeMapItem* i, const TQPoint& p)
popup.insertItem(i18n("Refresh"), 5);
popup.setItemEnabled(5, !_sm.scanRunning());
- if (i) popup.insertItem(i18n("Refresh '%1'").arg(i->text(0)), 4);
+ if (i) popup.insertItem(i18n("Refresh '%1'").tqarg(i->text(0)), 4);
popup.insertSeparator();
addDepthStopItems(dpopup, 1001, i);
popup.insertItem(i18n("Stop at Depth"), dpopup, 1000);
@@ -331,10 +331,10 @@ void FSView::saveMetric(KConfigGroup* g)
TQMap<TQString, MetricEntry>::iterator it;
int c = 1;
for (it=_dirMetric.begin();it!=_dirMetric.end();++it) {
- g->writePathEntry(TQString("Dir%1").arg(c), it.key());
- g->writeEntry(TQString("Size%1").arg(c), (*it).size);
- g->writeEntry(TQString("Files%1").arg(c), (*it).fileCount);
- g->writeEntry(TQString("Dirs%1").arg(c), (*it).dirCount);
+ g->writePathEntry(TQString("Dir%1").tqarg(c), it.key());
+ g->writeEntry(TQString("Size%1").tqarg(c), (*it).size);
+ g->writeEntry(TQString("Files%1").tqarg(c), (*it).fileCount);
+ g->writeEntry(TQString("Dirs%1").tqarg(c), (*it).dirCount);
c++;
}
g->writeEntry("Count", c-1);
diff --git a/konq-plugins/fsview/fsview.h b/konq-plugins/fsview/fsview.h
index 2e12986..fe1c689 100644
--- a/konq-plugins/fsview/fsview.h
+++ b/konq-plugins/fsview/fsview.h
@@ -58,11 +58,12 @@ class MetricEntry
class FSView : public TreeMapWidget, public ScanListener
{
Q_OBJECT
+ TQ_OBJECT
public:
enum ColorMode { None = 0, Depth, Name, Owner, Group, Mime };
- FSView(Inode*, TQWidget* parent=0, const char* name=0);
+ FSView(Inode*, TQWidget* tqparent=0, const char* name=0);
~FSView();
KConfig* config() { return _config; }
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index 02df4c6..b9d2f5b 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -74,7 +74,7 @@ void FSJob::progressSlot(int percent, int dirs, const TQString& cDir)
emitPercent(percent, 100);
slotInfoMessage(this, i18n("Read 1 folder, in %1",
"Read %n folders, in %1",
- dirs ).arg(cDir));
+ dirs ).tqarg(cDir));
}
else
slotInfoMessage(this, i18n("1 folder", "%n folders", dirs));
@@ -93,15 +93,15 @@ KAboutData* FSViewPart::createAboutData()
return aboutData;
}
-FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName,
- TQObject *parent, const char *name,
+FSViewPart::FSViewPart(TQWidget *tqparentWidget, const char *widgetName,
+ TQObject *tqparent, const char *name,
const TQStringList& /* args */)
- : KParts::ReadOnlyPart(parent, name)
+ : KParts::ReadOnlyPart(tqparent, name)
{
// we need an instance
setInstance( FSViewPartFactory::instance() );
- _view = new FSView(new Inode(), parentWidget, widgetName);
+ _view = new FSView(new Inode(), tqparentWidget, widgetName);
TQWhatsThis::add(_view, i18n("<p>This is the FSView plugin, a graphical "
"browsing mode showing filesystem utilization "
"by using a tree map visualization.</p>"
@@ -201,7 +201,7 @@ void FSViewPart::showInfo()
"currently visible in FSView, from the outside.\n"
"For details, see the 'Help/FSView Manual'.");
- KMessageBox::information( _view, info, TQString::null, "ShowFSViewInfo");
+ KMessageBox::information( _view, info, TQString(), "ShowFSViewInfo");
}
void FSViewPart::showHelp()
@@ -219,7 +219,7 @@ void FSViewPart::startedSlot()
void FSViewPart::completedSlot(int dirs)
{
if (_job) {
- _job->progressSlot(100, dirs, TQString::null);
+ _job->progressSlot(100, dirs, TQString());
delete _job;
_job = 0;
}
@@ -344,7 +344,7 @@ void FSViewBrowserExtension::trash()
void FSViewBrowserExtension::copySelection( bool move )
{
KonqDrag *urlData = KonqDrag::newDrag( _view->selectedUrls(), move );
- TQApplication::clipboard()->setData( urlData );
+ TQApplication::tqclipboard()->setData( urlData );
}
void FSViewBrowserExtension::editMimeType()
@@ -365,9 +365,9 @@ void FSViewBrowserExtension::refresh()
while( (i=s.next()) )
commonParent = commonParent->commonParent(i);
- /* if commonParent is a file, update parent directory */
+ /* if commonParent is a file, update tqparent directory */
if ( !((Inode*)commonParent)->isDir() ) {
- commonParent = commonParent->parent();
+ commonParent = commonParent->tqparent();
if (!commonParent) return;
}
diff --git a/konq-plugins/fsview/fsview_part.h b/konq-plugins/fsview/fsview_part.h
index ff0a17e..1adba9e 100644
--- a/konq-plugins/fsview/fsview_part.h
+++ b/konq-plugins/fsview/fsview_part.h
@@ -37,6 +37,7 @@ class FSViewPart;
class FSViewBrowserExtension : public KParts::BrowserExtension
{
Q_OBJECT
+ TQ_OBJECT
public:
FSViewBrowserExtension(FSViewPart *viewPart, const char *name=0L);
@@ -64,6 +65,7 @@ private:
class FSJob: public KIO::Job
{
Q_OBJECT
+ TQ_OBJECT
public:
FSJob(FSView*);
@@ -81,10 +83,11 @@ private:
class FSViewPart : public KParts::ReadOnlyPart
{
Q_OBJECT
- Q_PROPERTY( bool supportsUndo READ supportsUndo )
+ TQ_OBJECT
+ TQ_PROPERTY( bool supportsUndo READ supportsUndo )
public:
- FSViewPart(TQWidget *parentWidget, const char *widgetName,
- TQObject *parent, const char *name, const TQStringList &args);
+ FSViewPart(TQWidget *tqparentWidget, const char *widgetName,
+ TQObject *tqparent, const char *name, const TQStringList &args);
virtual ~FSViewPart();
diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp
index 6f5073c..849877e 100644
--- a/konq-plugins/fsview/inode.cpp
+++ b/konq-plugins/fsview/inode.cpp
@@ -40,12 +40,12 @@ Inode::Inode()
init("");
}
-Inode::Inode(ScanDir* d, Inode* parent)
- : TreeMapItem(parent)
+Inode::Inode(ScanDir* d, Inode* tqparent)
+ : TreeMapItem(tqparent)
{
TQString absPath;
- if (parent) {
- absPath = parent->path();
+ if (tqparent) {
+ absPath = tqparent->path();
if (!absPath.endsWith("/")) absPath += "/";
}
absPath += d->name();
@@ -56,12 +56,12 @@ Inode::Inode(ScanDir* d, Inode* parent)
init(absPath);
}
-Inode::Inode(ScanFile* f, Inode* parent)
- : TreeMapItem(parent)
+Inode::Inode(ScanFile* f, Inode* tqparent)
+ : TreeMapItem(tqparent)
{
TQString absPath;
- if (parent)
- absPath = parent->path() + "/";
+ if (tqparent)
+ absPath = tqparent->path() + "/";
absPath += f->name();
_dirPeer = 0;
@@ -168,7 +168,7 @@ void Inode::destroyed(ScanDir* d)
{
if (_dirPeer == d) _dirPeer = 0;
- // remove children
+ // remove tqchildren
clear();
}
@@ -179,15 +179,15 @@ void Inode::destroyed(ScanFile* f)
-TreeMapItemList* Inode::children()
+TreeMapItemList* Inode::tqchildren()
{
if (!_dirPeer) return 0;
- if (!_children) {
+ if (!_tqchildren) {
if (!_dirPeer->scanStarted()) return 0;
- _children = new TreeMapItemList;
- _children->setAutoDelete(true);
+ _tqchildren = new TreeMapItemList;
+ _tqchildren->setAutoDelete(true);
setSorting(-1);
@@ -215,7 +215,7 @@ TreeMapItemList* Inode::children()
_resortNeeded = false;
}
- return _children;
+ return _tqchildren;
}
@@ -284,7 +284,7 @@ TQColor Inode::backColor() const
if (id>0) n = TQString::number(id);
if (n.isEmpty())
- return widget()->colorGroup().button();
+ return widget()->tqcolorGroup().button();
const char* str = n.ascii();
int h = 0, s = 100;
@@ -325,21 +325,21 @@ TQString Inode::text(int i) const
double s = size();
if (s < 1000)
- text = TQString("%1 B").arg((int)(s+.5));
+ text = TQString("%1 B").tqarg((int)(s+.5));
else if (s < 10 * 1024)
- text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.005,2));
+ text = TQString("%1 kB").tqarg(KGlobal::locale()->formatNumber(s/1024+.005,2));
else if (s < 100 * 1024)
- text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.05,1));
+ text = TQString("%1 kB").tqarg(KGlobal::locale()->formatNumber(s/1024+.05,1));
else if (s < 1000 * 1024)
- text = TQString("%1 kB").arg((int)(s/1024+.5));
+ text = TQString("%1 kB").tqarg((int)(s/1024+.5));
else if (s < 10 * 1024 * 1024)
- text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2));
+ text = TQString("%1 MB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2));
else if (s < 100 * 1024 * 1024)
- text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1));
+ text = TQString("%1 MB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1));
else if (s < 1000 * 1024 * 1024)
- text = TQString("%1 MB").arg((int)(s/1024/1024+.5));
+ text = TQString("%1 MB").tqarg((int)(s/1024/1024+.5));
else
- text = TQString("%1 GB").arg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2));
+ text = TQString("%1 GB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2));
if (_sizeEstimation>0) text += "+";
return text;
@@ -354,10 +354,10 @@ TQString Inode::text(int i) const
if (f>0) {
while (f>1000) {
- text = TQString("%1 %2").arg(TQString::number(f).right(3)).arg(text);
+ text = TQString("%1 %2").tqarg(TQString::number(f).right(3)).tqarg(text);
f /= 1000;
}
- text = TQString("%1 %2").arg(TQString::number(f)).arg(text);
+ text = TQString("%1 %2").tqarg(TQString::number(f)).tqarg(text);
if (_fileCountEstimation>0) text += "+";
}
return text;
diff --git a/konq-plugins/fsview/inode.h b/konq-plugins/fsview/inode.h
index eb1e3dd..d21a689 100644
--- a/konq-plugins/fsview/inode.h
+++ b/konq-plugins/fsview/inode.h
@@ -53,7 +53,7 @@ public:
void setPeer(ScanDir*);
- TreeMapItemList* children();
+ TreeMapItemList* tqchildren();
double value() const;
double size() const;
diff --git a/konq-plugins/fsview/scan.cpp b/konq-plugins/fsview/scan.cpp
index 1d3d06a..c79ff99 100644
--- a/konq-plugins/fsview/scan.cpp
+++ b/konq-plugins/fsview/scan.cpp
@@ -80,8 +80,8 @@ void ScanManager::startScan(ScanDir* from)
if (scanRunning()) stopScan();
from->clear();
- if (from->parent())
- from->parent()->setupChildRescan();
+ if (from->tqparent())
+ from->tqparent()->setupChildRescan();
_list.append(new ScanItem(from->path(),from));
}
diff --git a/konq-plugins/fsview/scan.h b/konq-plugins/fsview/scan.h
index ca4ce4f..6d570f7 100644
--- a/konq-plugins/fsview/scan.h
+++ b/konq-plugins/fsview/scan.h
@@ -179,7 +179,7 @@ class ScanDir
*/
void setupChildRescan();
- /* Absolute path. Warning: Slow, loops to top parent. */
+ /* Absolute path. Warning: Slow, loops to top tqparent. */
TQString path();
/* get integer data attribute */
@@ -192,7 +192,7 @@ class ScanDir
KIO::fileoffset_t size() { update(); return _size; }
unsigned int fileCount() { update(); return _fileCount; }
unsigned int dirCount() { update(); return _dirCount; }
- ScanDir* parent() { return _parent; }
+ ScanDir* tqparent() { return _parent; }
bool scanStarted() { return (_dirsFinished >= 0); }
bool scanFinished() { return (_dirsFinished == (int)_dirs.count()); }
bool scanRunning() { return scanStarted() && !scanFinished(); }
diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp
index 5a42c75..b3f6cb6 100644
--- a/konq-plugins/fsview/treemap.cpp
+++ b/konq-plugins/fsview/treemap.cpp
@@ -51,7 +51,7 @@ StoredDrawParams::StoredDrawParams()
_shaded = true;
_rotated = false;
- _backColor = Qt::white;
+ _backColor = TQt::white;
// field array has size 0
}
@@ -72,7 +72,7 @@ StoredDrawParams::StoredDrawParams(TQColor c,
TQString StoredDrawParams::text(int f) const
{
if ((f<0) || (f >= (int)_field.size()))
- return TQString::null;
+ return TQString();
return _field[f].text;
}
@@ -266,7 +266,7 @@ void RectDrawing::drawBack(TQPainter* p, DrawParams* dp)
if (dp->shaded()) {
// some shading
- bool goDark = qGray(normal.rgb())>128;
+ bool goDark = tqGray(normal.rgb())>128;
int rBase, gBase, bBase;
normal.rgb(&rBase, &gBase, &bBase);
p->setBrush(TQBrush::NoBrush);
@@ -525,7 +525,7 @@ bool RectDrawing::drawField(TQPainter* p, int f, DrawParams* dp)
}
p->save();
- p->setPen( (qGray(dp->backColor().rgb())>100) ? Qt::black : Qt::white);
+ p->setPen( (tqGray(dp->backColor().rgb())>100) ? TQt::black : TQt::white);
p->setFont(dp->font());
if (rotate) {
//p->translate(r.x()+2, r.y()+r.height());
@@ -616,7 +616,7 @@ bool RectDrawing::drawField(TQPainter* p, int f, DrawParams* dp)
}
}
else
- remaining = TQString::null;
+ remaining = TQString();
/* truncate and add ... if needed */
if (w>width) {
@@ -655,7 +655,7 @@ bool RectDrawing::drawField(TQPainter* p, int f, DrawParams* dp)
p->drawText( x+pixW, y,
width - pixW, h,
- Qt::AlignLeft, name);
+ TQt::AlignLeft, name);
y = isBottom ? (y-h) : (y+h);
lines--;
@@ -717,11 +717,11 @@ int TreeMapItemList::compareItems ( Item item1, Item item2 )
bool ascending;
int result;
- TreeMapItem* parent = ((TreeMapItem*)item1)->parent();
+ TreeMapItem* tqparent = ((TreeMapItem*)item1)->tqparent();
// shouldn't happen
- if (!parent) return 0;
+ if (!tqparent) return 0;
- int textNo = parent->sorting(&ascending);
+ int textNo = tqparent->sorting(&ascending);
if (textNo < 0) {
double diff = ((TreeMapItem*)item1)->value() -
@@ -738,25 +738,25 @@ int TreeMapItemList::compareItems ( Item item1, Item item2 )
TreeMapItem* TreeMapItemList::commonParent()
{
- TreeMapItem* parent, *item;
- parent = first();
- if (parent)
+ TreeMapItem* tqparent, *item;
+ tqparent = first();
+ if (tqparent)
while( (item = next()) != 0)
- parent = parent->commonParent(item);
+ tqparent = tqparent->commonParent(item);
- return parent;
+ return tqparent;
}
// TreeMapItem
-TreeMapItem::TreeMapItem(TreeMapItem* parent, double value)
+TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value)
{
_value = value;
- _parent = parent;
+ _parent = tqparent;
_sum = 0;
- _children = 0;
+ _tqchildren = 0;
_widget = 0;
_index = -1;
_depth = -1; // not set
@@ -764,7 +764,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value)
_freeRects = 0;
if (_parent) {
- // take sorting from parent
+ // take sorting from tqparent
_sortTextNo = _parent->sorting(&_sortAscending);
_parent->addItem(this);
}
@@ -775,12 +775,12 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value)
}
-TreeMapItem::TreeMapItem(TreeMapItem* parent, double value,
+TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value,
TQString text1, TQString text2,
TQString text3, TQString text4)
{
_value = value;
- _parent = parent;
+ _parent = tqparent;
// this resizes the text vector only if needed
if (!text4.isEmpty()) setText(3, text4);
@@ -789,7 +789,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value,
setText(0, text1);
_sum = 0;
- _children = 0;
+ _tqchildren = 0;
_widget = 0;
_index = -1;
_depth = -1; // not set
@@ -801,7 +801,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value,
TreeMapItem::~TreeMapItem()
{
- if (_children) delete _children;
+ if (_tqchildren) delete _tqchildren;
if (_freeRects) delete _freeRects;
// finally, notify widget about deletion
@@ -829,7 +829,7 @@ bool TreeMapItem::isChildOf(TreeMapItem* item)
TreeMapItem* TreeMapItem::commonParent(TreeMapItem* item)
{
while (item && !isChildOf(item)) {
- item = item->parent();
+ item = item->tqparent();
}
return item;
}
@@ -842,18 +842,18 @@ void TreeMapItem::redraw()
void TreeMapItem::clear()
{
- if (_children) {
+ if (_tqchildren) {
// delete selected items below this item from selection
if (_widget) _widget->clearSelection(this);
- delete _children;
- _children = 0;
+ delete _tqchildren;
+ _tqchildren = 0;
}
}
-// invalidates current children and forces redraw
-// this is only usefull when children are created on demand in items()
+// tqinvalidates current tqchildren and forces redraw
+// this is only usefull when tqchildren are created on demand in items()
void TreeMapItem::refresh()
{
clear();
@@ -887,9 +887,9 @@ int TreeMapItem::depth() const
bool TreeMapItem::initialized()
{
- if (!_children) {
- _children = new TreeMapItemList;
- _children->setAutoDelete(true);
+ if (!_tqchildren) {
+ _tqchildren = new TreeMapItemList;
+ _tqchildren->setAutoDelete(true);
return false;
}
return true;
@@ -899,16 +899,16 @@ void TreeMapItem::addItem(TreeMapItem* i)
{
if (!i) return;
- if (!_children) {
- _children = new TreeMapItemList;
- _children->setAutoDelete(true);
+ if (!_tqchildren) {
+ _tqchildren = new TreeMapItemList;
+ _tqchildren->setAutoDelete(true);
}
i->setParent(this);
if (sorting(0) == -1)
- _children->append(i); // preserve insertion order
+ _tqchildren->append(i); // preserve insertion order
else
- _children->inSort(i);
+ _tqchildren->inSort(i);
}
@@ -974,17 +974,17 @@ void TreeMapItem::setSorting(int textNo, bool ascending)
_sortAscending = ascending;
_sortTextNo = textNo;
- if (_children && _sortTextNo != -1) _children->sort();
+ if (_tqchildren && _sortTextNo != -1) _tqchildren->sort();
}
void TreeMapItem::resort(bool recursive)
{
- if (!_children) return;
+ if (!_tqchildren) return;
- if (_sortTextNo != -1) _children->sort();
+ if (_sortTextNo != -1) _tqchildren->sort();
if (recursive)
- for (TreeMapItem* i=_children->first(); i; i=_children->next())
+ for (TreeMapItem* i=_tqchildren->first(); i; i=_tqchildren->next())
i->resort(recursive);
}
@@ -1002,13 +1002,13 @@ int TreeMapItem::rtti() const
return 0;
}
-TreeMapItemList* TreeMapItem::children()
+TreeMapItemList* TreeMapItem::tqchildren()
{
- if (!_children) {
- _children = new TreeMapItemList;
- _children->setAutoDelete(true);
+ if (!_tqchildren) {
+ _tqchildren = new TreeMapItemList;
+ _tqchildren->setAutoDelete(true);
}
- return _children;
+ return _tqchildren;
}
void TreeMapItem::clearItemRect()
@@ -1072,7 +1072,7 @@ void TreeMapItem::addFreeRect(const TQRect& r)
// Tooltips for TreeMapWidget
-class TreeMapTip: public QToolTip
+class TreeMapTip: public TQToolTip
{
public:
TreeMapTip( TQWidget* p ):TQToolTip(p) {}
@@ -1083,17 +1083,17 @@ protected:
void TreeMapTip::maybeTip( const TQPoint& pos )
{
- if ( !parentWidget()->inherits( "TreeMapWidget" ) )
+ if ( !tqparentWidget()->inherits( "TreeMapWidget" ) )
return;
- TreeMapWidget* p = (TreeMapWidget*)parentWidget();
+ TreeMapWidget* p = (TreeMapWidget*)tqparentWidget();
TreeMapItem* i;
i = p->item(pos.x(), pos.y());
TQPtrList<TQRect>* rList = i ? i->freeRects() : 0;
if (rList) {
TQRect* r;
for(r=rList->first();r;r=rList->next())
- if (r->contains(pos))
+ if (r->tqcontains(pos))
tip(*r, p->tipString(i));
}
}
@@ -1103,8 +1103,8 @@ void TreeMapTip::maybeTip( const TQPoint& pos )
// TreeMapWidget
TreeMapWidget::TreeMapWidget(TreeMapItem* base,
- TQWidget* parent, const char* name)
- : TQWidget(parent, name)
+ TQWidget* tqparent, const char* name)
+ : TQWidget(tqparent, name)
{
_base = base;
_base->setWidget(this);
@@ -1139,8 +1139,8 @@ TreeMapWidget::TreeMapWidget(TreeMapItem* base,
_lastOver = 0;
_needsRefresh = _base;
- setBackgroundMode(Qt::NoBackground);
- setFocusPolicy(TQWidget::StrongFocus);
+ setBackgroundMode(TQt::NoBackground);
+ setFocusPolicy(TQ_StrongFocus);
_tip = new TreeMapTip(this);
}
@@ -1252,7 +1252,7 @@ void TreeMapWidget::setMaxDrawingDepth(int d)
TQString TreeMapWidget::defaultFieldType(int f) const
{
- return i18n("Text %1").arg(f+1);
+ return i18n("Text %1").tqarg(f+1);
}
TQString TreeMapWidget::defaultFieldStop(int) const
@@ -1433,10 +1433,10 @@ void TreeMapWidget::setMinimalArea(int area)
void TreeMapWidget::deletingItem(TreeMapItem* i)
{
// remove any references to the item to be deleted
- while(_selection.findRef(i) > -1)
+ while(_selection.tqfindRef(i) > -1)
_selection.remove();
- while(_tmpSelection.findRef(i) > -1)
+ while(_tmpSelection.tqfindRef(i) > -1)
_tmpSelection.remove();
if (_current == i) _current = 0;
@@ -1446,9 +1446,9 @@ void TreeMapWidget::deletingItem(TreeMapItem* i)
// don't redraw a deleted item
if (_needsRefresh == i) {
- // we can savely redraw the parent, as deleting order is
- // from child to parent; i.e. i->parent() is existing.
- _needsRefresh = i->parent();
+ // we can savely redraw the tqparent, as deleting order is
+ // from child to tqparent; i.e. i->tqparent() is existing.
+ _needsRefresh = i->tqparent();
}
}
@@ -1468,7 +1468,7 @@ TQString TreeMapWidget::tipString(TreeMapItem* i) const
tip += itemTip;
}
- i = i->parent();
+ i = i->tqparent();
}
return tip;
}
@@ -1478,11 +1478,11 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
TreeMapItem* p = _base;
TreeMapItem* i;
- if (!rect().contains(x, y)) return 0;
+ if (!TQT_TQRECT_OBJECT(rect()).tqcontains(x, y)) return 0;
if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "):" << endl;
while (1) {
- TreeMapItemList* list = p->children();
+ TreeMapItemList* list = p->tqchildren();
if (!list)
i = 0;
else {
@@ -1491,11 +1491,11 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
if (DEBUG_DRAWING)
kdDebug(90100) << " Checking " << i->path(0).join("/") << " ("
- << i->itemRect().x() << "/" << i->itemRect().y()
- << "-" << i->itemRect().width()
- << "x" << i->itemRect().height() << ")" << endl;
+ << i->tqitemRect().x() << "/" << i->tqitemRect().y()
+ << "-" << i->tqitemRect().width()
+ << "x" << i->tqitemRect().height() << ")" << endl;
- if (i->itemRect().contains(x, y)) {
+ if (i->tqitemRect().tqcontains(x, y)) {
if (DEBUG_DRAWING) kdDebug(90100) << " .. Got. Index " << idx << endl;
@@ -1513,7 +1513,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
if (DEBUG_DRAWING)
kdDebug(90100) << "item(" << x << "," << y << "): Got "
<< p->path(0).join("/") << " (Size "
- << p->itemRect().width() << "x" << p->itemRect().height()
+ << p->tqitemRect().width() << "x" << p->tqitemRect().height()
<< ", Val " << p->value() << ")" << endl;
}
@@ -1530,7 +1530,7 @@ TreeMapItem* TreeMapWidget::possibleSelection(TreeMapItem* i) const
if (_maxSelectDepth>=0) {
int depth = i->depth();
while(i && depth > _maxSelectDepth) {
- i = i->parent();
+ i = i->tqparent();
depth--;
}
}
@@ -1542,16 +1542,16 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const
{
if (i) {
/* Must have a visible area */
- while(i && ((i->itemRect().width() <1) ||
- (i->itemRect().height() <1))) {
- TreeMapItem* p = i->parent();
+ while(i && ((i->tqitemRect().width() <1) ||
+ (i->tqitemRect().height() <1))) {
+ TreeMapItem* p = i->tqparent();
if (!p) break;
- int idx = p->children()->findRef(i);
+ int idx = p->tqchildren()->tqfindRef(i);
idx--;
if (idx<0)
i = p;
else
- i = p->children()->at(idx);
+ i = p->tqchildren()->at(idx);
}
}
return i;
@@ -1596,12 +1596,12 @@ TreeMapItemList TreeMapWidget::diff(TreeMapItemList& l1,
TreeMapItem* item;
while ( (item = it1.current()) != 0 ) {
++it1;
- if (l2.containsRef(item) > 0) continue;
+ if (l2.tqcontainsRef(item) > 0) continue;
l.append(item);
}
while ( (item = it2.current()) != 0 ) {
++it2;
- if (l1.containsRef(item) > 0) continue;
+ if (l1.tqcontainsRef(item) > 0) continue;
l.append(item);
}
@@ -1644,13 +1644,13 @@ TreeMapItem* TreeMapWidget::setTmpSelected(TreeMapItem* item, bool selected)
}
-bool TreeMapWidget::clearSelection(TreeMapItem* parent)
+bool TreeMapWidget::clearSelection(TreeMapItem* tqparent)
{
TreeMapItemList old = _selection;
TreeMapItem* i=_selection.first();
while (i) {
- if (i->isChildOf(parent)) {
+ if (i->isChildOf(tqparent)) {
_selection.remove();
i = _selection.current();
}
@@ -1668,12 +1668,12 @@ bool TreeMapWidget::clearSelection(TreeMapItem* parent)
bool TreeMapWidget::isSelected(TreeMapItem* i) const
{
- return _selection.containsRef(i)>0;
+ return _selection.tqcontainsRef(i)>0;
}
bool TreeMapWidget::isTmpSelected(TreeMapItem* i)
{
- return _tmpSelection.containsRef(i)>0;
+ return _tmpSelection.tqcontainsRef(i)>0;
}
@@ -1738,14 +1738,14 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1,
TreeMapItem* commonParent = i1;
while (commonParent && !i2->isChildOf(commonParent)) {
i1 = commonParent;
- commonParent = commonParent->parent();
+ commonParent = commonParent->tqparent();
}
if (!commonParent) return changed;
- while (i2 && i2->parent() != commonParent)
- i2 = i2->parent();
+ while (i2 && i2->tqparent() != commonParent)
+ i2 = i2->tqparent();
if (!i2) return changed;
- TreeMapItemList* list = commonParent->children();
+ TreeMapItemList* list = commonParent->tqchildren();
if (!list) return changed;
TreeMapItem* i = list->first();
@@ -1768,11 +1768,11 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e )
{
//kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl;
- if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) )
+ if ( tqreceivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) )
e->accept();
if ( e->reason() == TQContextMenuEvent::Keyboard ) {
- TQRect r = (_current) ? _current->itemRect() : _base->itemRect();
+ TQRect r = (_current) ? _current->tqitemRect() : _base->tqitemRect();
TQPoint p = TQPoint(r.left() + r.width()/2, r.top() + r.height()/2);
emit contextMenuRequested(_current, p);
}
@@ -1826,7 +1826,7 @@ void TreeMapWidget::mousePressEvent( TQMouseEvent* e )
}
// item under mouse always selected on right button press
- if (e->button() == RightButton) {
+ if (e->button() == Qt::RightButton) {
TreeMapItem* changed2 = setTmpSelected(item, true);
if (changed2) changed = changed2->commonParent(changed);
}
@@ -1836,7 +1836,7 @@ void TreeMapWidget::mousePressEvent( TQMouseEvent* e )
if (changed)
redraw(changed);
- if (e->button() == RightButton) {
+ if (e->button() == Qt::RightButton) {
// emit selection change
if (! (_tmpSelection == _selection)) {
@@ -1935,15 +1935,15 @@ void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e )
/* returns -1 if nothing visible found */
int nextVisible(TreeMapItem* i)
{
- TreeMapItem* p = i->parent();
- if (!p || p->itemRect().isEmpty()) return -1;
+ TreeMapItem* p = i->tqparent();
+ if (!p || p->tqitemRect().isEmpty()) return -1;
- int idx = p->children()->findRef(i);
+ int idx = p->tqchildren()->tqfindRef(i);
if (idx<0) return -1;
- while (idx < (int)p->children()->count()-1) {
+ while (idx < (int)p->tqchildren()->count()-1) {
idx++;
- TQRect r = p->children()->at(idx)->itemRect();
+ TQRect r = p->tqchildren()->at(idx)->tqitemRect();
if (r.width()>1 && r.height()>1)
return idx;
}
@@ -1953,15 +1953,15 @@ int nextVisible(TreeMapItem* i)
/* returns -1 if nothing visible found */
int prevVisible(TreeMapItem* i)
{
- TreeMapItem* p = i->parent();
- if (!p || p->itemRect().isEmpty()) return -1;
+ TreeMapItem* p = i->tqparent();
+ if (!p || p->tqitemRect().isEmpty()) return -1;
- int idx = p->children()->findRef(i);
+ int idx = p->tqchildren()->tqfindRef(i);
if (idx<0) return -1;
while (idx > 0) {
idx--;
- TQRect r = p->children()->at(idx)->itemRect();
+ TQRect r = p->tqchildren()->at(idx)->tqitemRect();
if (r.width()>1 && r.height()>1)
return idx;
}
@@ -2024,7 +2024,7 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e )
}
TreeMapItem* old = _current, *newItem;
- TreeMapItem* p = _current->parent();
+ TreeMapItem* p = _current->tqparent();
bool goBack;
if (_current->sorting(&goBack) == -1) {
@@ -2042,24 +2042,24 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e )
int newIdx = goBack ? nextVisible(_current) : prevVisible(_current);
if (p && newIdx>=0) {
p->setIndex(newIdx);
- setCurrent(p->children()->at(newIdx), true);
+ setCurrent(p->tqchildren()->at(newIdx), true);
}
}
else if (e->key() == Key_Right) {
int newIdx = goBack ? prevVisible(_current) : nextVisible(_current);
if (p && newIdx>=0) {
p->setIndex(newIdx);
- setCurrent(p->children()->at(newIdx), true);
+ setCurrent(p->tqchildren()->at(newIdx), true);
}
}
else if (e->key() == Key_Down) {
- if (_current->children() && _current->children()->count()>0) {
+ if (_current->tqchildren() && _current->tqchildren()->count()>0) {
int newIdx = _current->index();
if (newIdx<0)
- newIdx = goBack ? (_current->children()->count()-1) : 0;
- if (newIdx>=(int)_current->children()->count())
- newIdx = _current->children()->count()-1;
- newItem = visibleItem(_current->children()->at(newIdx));
+ newIdx = goBack ? (_current->tqchildren()->count()-1) : 0;
+ if (newIdx>=(int)_current->tqchildren()->count())
+ newIdx = _current->tqchildren()->count()-1;
+ newItem = visibleItem(_current->tqchildren()->at(newIdx));
setCurrent(newItem, true);
}
}
@@ -2136,7 +2136,7 @@ void TreeMapWidget::drawTreeMap()
}
else {
// only subitem
- if (!_needsRefresh->itemRect().isValid()) return;
+ if (!_needsRefresh->tqitemRect().isValid()) return;
}
// reset cached font object; it could have been changed
@@ -2147,14 +2147,14 @@ void TreeMapWidget::drawTreeMap()
_needsRefresh = 0;
}
- bitBlt( this, 0, 0, &_pixmap, 0, 0,
+ bitBlt( TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&_pixmap), 0, 0,
TQWidget::width(), TQWidget::height(), CopyROP, true);
if (hasFocus()) {
TQPainter p(this);
- style().drawPrimitive( TQStyle::PE_FocusRect, &p,
+ tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
TQRect(0, 0, TQWidget::width(), TQWidget::height()),
- colorGroup() );
+ tqcolorGroup() );
}
}
@@ -2184,7 +2184,7 @@ void TreeMapWidget::drawItem(TQPainter* p,
TreeMapItem* i;
if (_markNo>0) {
- for(i = item;i;i=i->parent())
+ for(i = item;i;i=i->tqparent())
if (i->isMarked(_markNo)) break;
isSelected = (i!=0);
@@ -2198,7 +2198,7 @@ void TreeMapWidget::drawItem(TQPainter* p,
bool isCurrent = _current && item->isChildOf(_current);
- RectDrawing d(item->itemRect());
+ RectDrawing d(item->tqitemRect());
item->setSelected(isSelected);
item->setCurrent(isCurrent);
item->setShaded(_shading);
@@ -2232,25 +2232,25 @@ void TreeMapWidget::drawItems(TQPainter* p,
{
if (DEBUG_DRAWING)
kdDebug(90100) << "+drawItems(" << item->path(0).join("/") << ", "
- << item->itemRect().x() << "/" << item->itemRect().y()
- << "-" << item->itemRect().width() << "x"
- << item->itemRect().height() << "), Val " << item->value()
+ << item->tqitemRect().x() << "/" << item->tqitemRect().y()
+ << "-" << item->tqitemRect().width() << "x"
+ << item->tqitemRect().height() << "), Val " << item->value()
<< ", Sum " << item->sum() << endl;
drawItem(p, item);
item->clearFreeRects();
- TQRect origRect = item->itemRect();
+ TQRect origRect = item->tqitemRect();
int bw = item->borderWidth();
TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw,
origRect.width()-2*bw, origRect.height()-2*bw);
- TreeMapItemList* list = item->children();
+ TreeMapItemList* list = item->tqchildren();
TreeMapItem* i;
bool stopDrawing = false;
- // only subdivide if there are children
+ // only subdivide if there are tqchildren
if (!list || list->count()==0)
stopDrawing = true;
@@ -2283,12 +2283,12 @@ void TreeMapWidget::drawItems(TQPainter* p,
if (stopDrawing) {
if (list) {
- // invalidate rects
+ // tqinvalidate rects
for (i=list->first();i;i=list->next())
i->clearItemRect();
}
// tooltip apears on whole item rect
- item->addFreeRect(item->itemRect());
+ item->addFreeRect(item->tqitemRect());
// if we have space for text...
if ((r.height() < _fontHeight) || (r.width() < _fontHeight)) return;
@@ -2399,7 +2399,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
r.setRect(r.x(), r.y()+sr.height(), r.width(), r.height()-sr.height());
}
- // set selfRect (not occupied by children) for tooltip
+ // set selfRect (not occupied by tqchildren) for tooltip
item->addFreeRect(sr);
if (0) kdDebug(90100) << "Item " << item->path(0).join("/") << ": SelfR "
@@ -2537,16 +2537,16 @@ void TreeMapWidget::drawItems(TQPainter* p,
kdDebug(90100) << "-drawItems(" << item->path(0).join("/") << ")" << endl;
}
-// fills area with a pattern if to small to draw children
+// fills area with a pattern if to small to draw tqchildren
void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r)
{
- p->setBrush(Qt::Dense4Pattern);
- p->setPen(Qt::NoPen);
+ p->setBrush(TQt::Dense4Pattern);
+ p->setPen(TQt::NoPen);
p->drawRect(r);
i->addFreeRect(r);
}
-// fills area with a pattern if to small to draw children
+// fills area with a pattern if to small to draw tqchildren
void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r,
TreeMapItemListIterator it, int len, bool goBack)
{
@@ -2555,8 +2555,8 @@ void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r,
<< "-" << r.width() << "x" << r.height()
<< ", len " << len << ")" << endl;
- p->setBrush(Qt::Dense4Pattern);
- p->setPen(Qt::NoPen);
+ p->setBrush(TQt::Dense4Pattern);
+ p->setPen(TQt::NoPen);
p->drawRect(r);
i->addFreeRect(r);
@@ -2845,10 +2845,10 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id)
popup->insertItem(i18n("Border"), bpopup, id+1);
bpopup->insertItem(i18n("Correct Borders Only"), id+2);
bpopup->insertSeparator();
- bpopup->insertItem(i18n("Width %1").arg(0), id+3);
- bpopup->insertItem(i18n("Width %1").arg(1), id+4);
- bpopup->insertItem(i18n("Width %1").arg(2), id+5);
- bpopup->insertItem(i18n("Width %1").arg(3), id+6);
+ bpopup->insertItem(i18n("Width %1").tqarg(0), id+3);
+ bpopup->insertItem(i18n("Width %1").tqarg(1), id+4);
+ bpopup->insertItem(i18n("Width %1").tqarg(2), id+5);
+ bpopup->insertItem(i18n("Width %1").tqarg(3), id+6);
bpopup->setItemChecked(id+2, skipIncorrectBorder());
bpopup->setItemChecked(id+3, borderWidth()==0);
bpopup->setItemChecked(id+4, borderWidth()==1);
@@ -2906,7 +2906,7 @@ void TreeMapWidget::selectionActivated(int id)
TreeMapItem* i = _menuItem;
id -= _selectionID;
while (id>0 && i) {
- i=i->parent();
+ i=i->tqparent();
id--;
}
if (i)
@@ -2928,18 +2928,18 @@ void TreeMapWidget::addSelectionItems(TQPopupMenu* popup,
TQString name = i->text(0);
if (name.isEmpty()) break;
popup->insertItem(i->text(0), id++);
- i = i->parent();
+ i = i->tqparent();
}
}
void TreeMapWidget::fieldStopActivated(int id)
{
- if (id == _fieldStopID) setFieldStop(0, TQString::null);
+ if (id == _fieldStopID) setFieldStop(0, TQString());
else {
TreeMapItem* i = _menuItem;
id -= _fieldStopID+1;
while (id>0 && i) {
- i=i->parent();
+ i=i->tqparent();
id--;
}
if (i)
@@ -2955,7 +2955,7 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup,
connect(popup, TQT_SIGNAL(activated(int)),
this, TQT_SLOT(fieldStopActivated(int)));
- popup->insertItem(i18n("No %1 Limit").arg(fieldType(0)), id);
+ popup->insertItem(i18n("No %1 Limit").tqarg(fieldType(0)), id);
popup->setItemChecked(id, fieldStop(0).isEmpty());
_menuItem = i;
bool foundFieldStop = false;
@@ -2971,7 +2971,7 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup,
popup->setItemChecked(id, true);
foundFieldStop = true;
}
- i = i->parent();
+ i = i->tqparent();
}
}
@@ -3014,7 +3014,7 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup,
int area = i->width() * i->height();
popup->insertSeparator();
popup->insertItem(i18n("Area of '%1' (%2)")
- .arg(i->text(0)).arg(area), id+1);
+ .tqarg(i->text(0)).tqarg(area), id+1);
if (area == minimalArea()) {
popup->setItemChecked(id+1, true);
foundArea = true;
@@ -3040,9 +3040,9 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup,
}
popup->insertItem(i18n("Double Area Limit (to %1)")
- .arg(minimalArea()*2), id+5);
+ .tqarg(minimalArea()*2), id+5);
popup->insertItem(i18n("Halve Area Limit (to %1)")
- .arg(minimalArea()/2), id+6);
+ .tqarg(minimalArea()/2), id+6);
}
}
@@ -3079,7 +3079,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
int d = i->depth();
popup->insertSeparator();
popup->insertItem(i18n("Depth of '%1' (%2)")
- .arg(i->text(0)).arg(d), id+1);
+ .tqarg(i->text(0)).tqarg(d), id+1);
if (d == maxDrawingDepth()) {
popup->setItemChecked(id+1, true);
foundDepth = true;
@@ -3089,7 +3089,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
popup->insertSeparator();
int depth = 2, count;
for (count=0;count<3;count++) {
- popup->insertItem(i18n("Depth %1").arg(depth), id+4+count);
+ popup->insertItem(i18n("Depth %1").tqarg(depth), id+4+count);
if (depth == maxDrawingDepth()) {
popup->setItemChecked(id+4+count, true);
foundDepth = true;
@@ -3100,14 +3100,14 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
if (maxDrawingDepth()>1) {
popup->insertSeparator();
if (!foundDepth) {
- popup->insertItem(i18n("Depth %1").arg(maxDrawingDepth()), id+10);
+ popup->insertItem(i18n("Depth %1").tqarg(maxDrawingDepth()), id+10);
popup->setItemChecked(id+10, true);
}
popup->insertItem(i18n("Decrement (to %1)")
- .arg(maxDrawingDepth()-1), id+2);
+ .tqarg(maxDrawingDepth()-1), id+2);
popup->insertItem(i18n("Increment (to %1)")
- .arg(maxDrawingDepth()+1), id+3);
+ .tqarg(maxDrawingDepth()+1), id+3);
}
}
@@ -3130,13 +3130,13 @@ void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix)
int f, fCount = _attr.size();
config->writeEntry(prefix+"FieldCount", fCount);
for (f=0;f<fCount;f++) {
- config->writeEntry(TQString(prefix+"FieldVisible%1").arg(f),
+ config->writeEntry(TQString(prefix+"FieldVisible%1").tqarg(f),
_attr[f].visible);
- config->writeEntry(TQString(prefix+"FieldForced%1").arg(f),
+ config->writeEntry(TQString(prefix+"FieldForced%1").tqarg(f),
_attr[f].forced);
- config->writeEntry(TQString(prefix+"FieldStop%1").arg(f),
+ config->writeEntry(TQString(prefix+"FieldStop%1").tqarg(f),
_attr[f].stop);
- config->writeEntry(TQString(prefix+"FieldPosition%1").arg(f),
+ config->writeEntry(TQString(prefix+"FieldPosition%1").tqarg(f),
fieldPositionString(f));
}
}
@@ -3180,18 +3180,18 @@ void TreeMapWidget::restoreOptions(KConfigGroup* config, TQString prefix)
int f;
for (f=0;f<num;f++) {
- str = TQString(prefix+"FieldVisible%1").arg(f);
+ str = TQString(prefix+"FieldVisible%1").tqarg(f);
if (config->hasKey(str))
setFieldVisible(f, config->readBoolEntry(str));
- str = TQString(prefix+"FieldForced%1").arg(f);
+ str = TQString(prefix+"FieldForced%1").tqarg(f);
if (config->hasKey(str))
setFieldForced(f, config->readBoolEntry(str));
- str = config->readEntry(TQString(prefix+"FieldStop%1").arg(f));
+ str = config->readEntry(TQString(prefix+"FieldStop%1").tqarg(f));
setFieldStop(f, str);
- str = config->readEntry(TQString(prefix+"FieldPosition%1").arg(f));
+ str = config->readEntry(TQString(prefix+"FieldPosition%1").tqarg(f));
if (!str.isEmpty()) setFieldPosition(f, str);
}
}
diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h
index d4b37a9..ca10251 100644
--- a/konq-plugins/fsview/treemap.h
+++ b/konq-plugins/fsview/treemap.h
@@ -81,7 +81,7 @@ public:
virtual int maxLines(int) const { return 0; }
virtual int fieldCount() const { return 0; }
- virtual TQColor backColor() const { return Qt::white; }
+ virtual TQColor backColor() const { return TQt::white; }
virtual const TQFont& font() const = 0;
virtual bool selected() const { return false; }
@@ -215,7 +215,7 @@ typedef TQPtrListIterator<TreeMapItem> TreeMapItemListIterator;
*
* If you want more flexibility, reimplement TreeMapItem and
* override the corresponding methods. For dynamic creation of child
- * items on demand, reimplement children().
+ * items on demand, reimplement tqchildren().
*/
class TreeMapItem: public StoredDrawParams
{
@@ -227,20 +227,20 @@ public:
* longest side of rectangle left for drawing
* Best: Choose split direction for all subitems of an area
* depending on longest side
- * HAlternate: Horizontal at top; alternate direction on depth step
- * VAlternate: Vertical at top; alternate direction on depth step
- * Horizontal: Always horizontal split direction
- * Vertical: Always vertical split direction
+ * HAlternate:Qt::Horizontal at top; alternate direction on depth step
+ * VAlternate:Qt::Vertical at top; alternate direction on depth step
+ * Qt::Horizontal: Always horizontal split direction
+ * Qt::Vertical: Always vertical split direction
*/
enum SplitMode { Bisection, Columns, Rows,
AlwaysBest, Best,
HAlternate, VAlternate,
Horizontal, Vertical };
- TreeMapItem(TreeMapItem* parent = 0, double value = 1.0 );
- TreeMapItem(TreeMapItem* parent, double value,
- TQString text1, TQString text2 = TQString::null,
- TQString text3 = TQString::null, TQString text4 = TQString::null);
+ TreeMapItem(TreeMapItem* tqparent = 0, double value = 1.0 );
+ TreeMapItem(TreeMapItem* tqparent, double value,
+ TQString text1, TQString text2 = TQString(),
+ TQString text3 = TQString(), TQString text4 = TQString());
virtual ~TreeMapItem();
bool isChildOf(TreeMapItem*);
@@ -250,7 +250,7 @@ public:
// force a redraw of this item
void redraw();
- // delete all children
+ // delete all tqchildren
void clear();
// force new child generation & refresh
@@ -261,9 +261,9 @@ public:
bool initialized();
/**
- * Adds an item to a parent.
+ * Adds an item to a tqparent.
* When no sorting is used, the item is appended (drawn at bottom).
- * This is only needed if the parent was not already specified in the
+ * This is only needed if the tqparent was not already specified in the
* construction of the item.
*/
void addItem(TreeMapItem*);
@@ -282,7 +282,7 @@ public:
/**
* Parent Item
*/
- TreeMapItem* parent() const { return _parent; }
+ TreeMapItem* tqparent() const { return _parent; }
/**
* Temporary rectangle used for drawing this item the last time.
@@ -290,7 +290,7 @@ public:
*/
void setItemRect(const TQRect& r) { _rect = r; }
void clearItemRect();
- const TQRect& itemRect() const { return _rect; }
+ const TQRect& tqitemRect() const { return _rect; }
int width() const { return _rect.width(); }
int height() const { return _rect.height(); }
@@ -321,7 +321,7 @@ public:
virtual double sum() const;
virtual double value() const;
- // replace "Default" position with setting from TreeMapWidget
+ // tqreplace "Default" position with setting from TreeMapWidget
virtual Position position(int) const;
virtual const TQFont& font() const;
virtual bool isMarked(int) const;
@@ -343,7 +343,7 @@ public:
* For value() sorting, use <textNo> = -2
*
* For fast sorting, set this to -1 before child insertions and call
- * again after inserting all children.
+ * again after inserting all tqchildren.
*/
void setSorting(int textNo, bool ascending = true);
@@ -351,18 +351,18 @@ public:
* Resort according to the already set sorting.
*
* This has to be done if the sorting base changes (e.g. text or values
- * change). If this is only true for the children of this item, you can
+ * change). If this is only true for the tqchildren of this item, you can
* set the recursive parameter to false.
*/
void resort(bool recursive = true);
virtual SplitMode splitMode() const;
virtual int rtti() const;
- // not const as this can create children on demand
- virtual TreeMapItemList* children();
+ // not const as this can create tqchildren on demand
+ virtual TreeMapItemList* tqchildren();
protected:
- TreeMapItemList* _children;
+ TreeMapItemList* _tqchildren;
double _sum, _value;
private:
@@ -372,7 +372,7 @@ private:
int _sortTextNo;
bool _sortAscending;
- // temporary layout
+ // temporary tqlayout
TQRect _rect;
TQPtrList<TQRect>* _freeRects;
int _depth;
@@ -389,18 +389,19 @@ private:
* Class for visualisation of a metric of hierarchically
* nested items as 2D areas.
*/
-class TreeMapWidget: public QWidget
+class TreeMapWidget: public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
- * Same as in QListBox/QListView
+ * Same as in TQListBox/TQListView
*/
enum SelectionMode { Single, Multi, Extended, NoSelection };
- TreeMapWidget(TreeMapItem* base, TQWidget* parent=0, const char* name=0);
+ TreeMapWidget(TreeMapItem* base, TQWidget* tqparent=0, const char* name=0);
~TreeMapWidget();
/**
@@ -427,7 +428,7 @@ public:
/**
* Returns the item possible for selection. this returns the
- * given item itself or a parent thereof,
+ * given item itself or a tqparent thereof,
* depending on setting of maxSelectDepth().
*/
TreeMapItem* possibleSelection(TreeMapItem*) const;
@@ -435,7 +436,7 @@ public:
/**
* Selects or unselects an item.
* In multiselection mode, the constrain that a selected item
- * has no selected children or parents stays true.
+ * has no selected tqchildren or tqparents stays true.
*/
void setSelected(TreeMapItem*, bool selected = true);
@@ -451,19 +452,19 @@ public:
void setMarked(int markNo = 1, bool redraw = true);
/**
- * Clear selection of all selected items which are children of
- * parent. When parent == 0, clears whole selection
+ * Clear selection of all selected items which are tqchildren of
+ * tqparent. When tqparent == 0, clears whole selection
* Returns true if selection changed.
*/
- bool clearSelection(TreeMapItem* parent = 0);
+ bool clearSelection(TreeMapItem* tqparent = 0);
/**
* Selects or unselects items in a range.
* This is needed internally for Shift-Click in Extented mode.
* Range means for a hierarchical widget:
* - select/unselect i1 and i2 according selected
- * - search common parent of i1 and i2, and select/unselect the
- * range of direct children between but excluding the child
+ * - search common tqparent of i1 and i2, and select/unselect the
+ * range of direct tqchildren between but excluding the child
* leading to i1 and the child leading to i2.
*/
void setRangeSelection(TreeMapItem* i1,
@@ -516,15 +517,15 @@ public:
void setVisibleWidth(int width, bool reuseSpace = false);
/**
- * If a children value() is almost the parents sum(),
+ * If a tqchildren value() is almost the tqparents sum(),
* it can happen that the border to be drawn for visibilty of
* nesting relations takes to much space, and the
- * parent/child size relation can not be mapped to a correct
+ * tqparent/child size relation can not be mapped to a correct
* area size relation.
*
* Either
* (1) Ignore the incorrect drawing, or
- * (2) Skip drawing of the parent level alltogether.
+ * (2) Skip drawing of the tqparent level alltogether.
*/
void setSkipIncorrectBorder(bool enable = true);
bool skipIncorrectBorder() const { return _skipIncorrectBorder; }
@@ -598,8 +599,8 @@ public:
/**
* Save/restore options.
*/
- void saveOptions(KConfigGroup*, TQString prefix = TQString::null);
- void restoreOptions(KConfigGroup*, TQString prefix = TQString::null);
+ void saveOptions(KConfigGroup*, TQString prefix = TQString());
+ void restoreOptions(KConfigGroup*, TQString prefix = TQString());
/**
* These functions populate given popup menus.
@@ -628,7 +629,7 @@ public:
virtual TQString tipString(TreeMapItem* i) const;
/**
- * Redraws an item with all children.
+ * Redraws an item with all tqchildren.
* This takes changed values(), sums(), colors() and text() into account.
*/
void redraw(TreeMapItem*);
diff --git a/konq-plugins/imagerotation/exif.py b/konq-plugins/imagerotation/exif.py
index 309df47..f056b51 100755
--- a/konq-plugins/imagerotation/exif.py
+++ b/konq-plugins/imagerotation/exif.py
@@ -97,7 +97,7 @@ EXIF_TAGS={
0x010F: ('Make', ),
0x0110: ('Model', ),
0x0111: ('StripOffsets', ),
- 0x0112: ('Orientation', ),
+ 0x0112: ('Qt::Orientation', ),
0x0115: ('SamplesPerPixel', ),
0x0116: ('RowsPerStrip', ),
0x0117: ('StripByteCounts', ),
@@ -240,7 +240,7 @@ GPS_TAGS={
0x0006: ('GPSAltitude', ),
0x0007: ('GPSTimeStamp', ),
0x0008: ('GPSSatellites', ),
- 0x0009: ('GPSStatus', ),
+ 0x0009: ('GPStqStatus', ),
0x000A: ('GPSMeasureMode', ),
0x000B: ('GPSDOP', ),
0x000C: ('GPSSpeedRef', ),
@@ -763,7 +763,7 @@ class EXIF_header:
# special case: null-terminated ASCII string
if count != 0:
self.file.seek(self.offset+offset)
- values=self.file.read(count).strip().replace('\x00','')
+ values=self.file.read(count).strip().tqreplace('\x00','')
else:
values=''
elif tag == 0x927C or tag == 0x9286: # MakerNote or UserComment
@@ -811,7 +811,7 @@ class EXIF_header:
repr(self.tags[ifd_name+' '+tag_name]))
# extract uncompressed TIFF thumbnail (like pulling teeth)
- # we take advantage of the pre-existing layout in the thumbnail IFD as
+ # we take advantage of the pre-existing tqlayout in the thumbnail IFD as
# much as possible
def extract_TIFF_thumbnail(self, thumb_ifd):
entries=self.s2n(thumb_ifd, 2)
diff --git a/konq-plugins/imagerotation/orient.py b/konq-plugins/imagerotation/orient.py
index 0671876..8db06ad 100755
--- a/konq-plugins/imagerotation/orient.py
+++ b/konq-plugins/imagerotation/orient.py
@@ -42,13 +42,13 @@ if not tags:
print 'no EXIF information in', filename
sys.exit(1)
if not tags.has_key('Exif Offset') \
- or not tags.has_key('Image Orientation'):
+ or not tags.has_key('Image Qt::Orientation'):
print 'cannot get orientation info in', filename
sys.exit(1)
exifp = tags['Exif Offset']
endian = tags['Exif Endian']
-tagp = tags['Image Orientation'].field_offset
+tagp = tags['Image Qt::Orientation'].field_offset
orientp = exifp + tagp
@@ -93,8 +93,8 @@ os.write(fd,chr(newo))
# Thumbnail orientation :
thumb_ifdp = 0
-if tags.has_key('Thumbnail Orientation'):
- thumb_tagp = tags['Thumbnail Orientation'].field_offset
+if tags.has_key('Thumbnail Qt::Orientation'):
+ thumb_tagp = tags['Thumbnail Qt::Orientation'].field_offset
thumb_orientp = exifp + thumb_tagp
if endian == 'M': # MM byte order
thumb_orientp += 1
diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp
index 989ec43..3d52c5b 100644
--- a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp
+++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp
@@ -39,9 +39,9 @@ static const KAboutData aboutdata("khtmlsettingsplugin", I18N_NOOP("HTML Setting
K_EXPORT_COMPONENT_FACTORY( libkhtmlsettingsplugin,
SettingsPluginFactory( &aboutdata ) )
-SettingsPlugin::SettingsPlugin( TQObject* parent, const char* name,
+SettingsPlugin::SettingsPlugin( TQObject* tqparent, const char* name,
const TQStringList & )
- : KParts::Plugin( parent, name ), mConfig(0)
+ : KParts::Plugin( tqparent, name ), mConfig(0)
{
setInstance(SettingsPluginFactory::instance());
@@ -118,13 +118,13 @@ SettingsPlugin::~SettingsPlugin()
void SettingsPlugin::showPopup()
{
- if( !parent() || !parent()->inherits("KHTMLPart"))
+ if( !tqparent() || !tqparent()->inherits("KHTMLPart"))
return;
if (!mConfig)
mConfig = new KConfig("settingspluginrc", false, false);
- KHTMLPart *part = static_cast<KHTMLPart *>( parent() );
+ KHTMLPart *part = static_cast<KHTMLPart *>( tqparent() );
KProtocolManager::reparseConfiguration();
bool cookies = cookiesEnabled( part->url().url() );
@@ -159,28 +159,28 @@ void SettingsPlugin::showPopup()
void SettingsPlugin::toggleJava()
{
- if( parent() && parent()->inherits("KHTMLPart"))
+ if( tqparent() && tqparent()->inherits("KHTMLPart"))
{
- KHTMLPart *part = static_cast<KHTMLPart *>(parent());
+ KHTMLPart *part = static_cast<KHTMLPart *>(tqparent());
part->setJavaEnabled( ((KToggleAction*)actionCollection()->action("java"))->isChecked() );
}
}
void SettingsPlugin::toggleJavascript()
{
- if( parent() && parent()->inherits("KHTMLPart"))
+ if( tqparent() && tqparent()->inherits("KHTMLPart"))
{
- KHTMLPart *part = static_cast<KHTMLPart *>(parent());
+ KHTMLPart *part = static_cast<KHTMLPart *>(tqparent());
part->setJScriptEnabled( ((KToggleAction*)actionCollection()->action("javascript"))->isChecked() );
}
}
void SettingsPlugin::toggleCookies()
{
- if( !parent() || !parent()->inherits("KHTMLPart"))
+ if( !tqparent() || !tqparent()->inherits("KHTMLPart"))
return;
- KHTMLPart *part = static_cast<KHTMLPart *>( parent() );
+ KHTMLPart *part = static_cast<KHTMLPart *>( tqparent() );
TQString advice;
bool enable = ((KToggleAction*)actionCollection()->action("cookies"))->isChecked();
@@ -203,18 +203,18 @@ void SettingsPlugin::toggleCookies()
void SettingsPlugin::togglePlugins()
{
- if( parent() && parent()->inherits("KHTMLPart"))
+ if( tqparent() && tqparent()->inherits("KHTMLPart"))
{
- KHTMLPart *part = static_cast<KHTMLPart *>(parent());
+ KHTMLPart *part = static_cast<KHTMLPart *>(tqparent());
part->setPluginsEnabled( ((KToggleAction*)actionCollection()->action("plugins"))->isChecked() );
}
}
void SettingsPlugin::toggleImageLoading()
{
- if( parent() && parent()->inherits("KHTMLPart"))
+ if( tqparent() && tqparent()->inherits("KHTMLPart"))
{
- KHTMLPart *part = static_cast<KHTMLPart *>(parent());
+ KHTMLPart *part = static_cast<KHTMLPart *>(tqparent());
part->setAutoloadImages( ((KToggleAction*)actionCollection()->action("imageloading"))->isChecked() );
}
}
@@ -229,7 +229,7 @@ bool SettingsPlugin::cookiesEnabled( const TQString& url )
bool enabled = false;
- if ( replyType == "TQString" )
+ if ( replyType == TQSTRING_OBJECT_NAME_STRING )
{
TQString advice;
TQDataStream s( reply, IO_ReadOnly );
diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.h b/konq-plugins/khtmlsettingsplugin/settingsplugin.h
index 63be54d..77fdc09 100644
--- a/konq-plugins/khtmlsettingsplugin/settingsplugin.h
+++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.h
@@ -28,8 +28,9 @@ class KConfig;
class SettingsPlugin : public KParts::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- SettingsPlugin( TQObject* parent, const char* name,
+ SettingsPlugin( TQObject* tqparent, const char* name,
const TQStringList & );
virtual ~SettingsPlugin();
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
index 87e2e31..7e07835 100644
--- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
+++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
@@ -44,9 +44,9 @@ Boston, MA 02110-1301, USA.
#include "imgallerydialog.h"
#include "imgallerydialog.moc"
-KIGPDialog::KIGPDialog(TQWidget *parent, const TQString& path, const char *name )
+KIGPDialog::KIGPDialog(TQWidget *tqparent, const TQString& path, const char *name )
: KDialogBase( IconList, i18n("Configure"), Default|Ok|Cancel,
- Ok, parent, name, true, true ),
+ Ok, tqparent, name, true, true ),
m_dialogOk( false )
{
m_path = path;
@@ -60,7 +60,7 @@ KIGPDialog::KIGPDialog(TQWidget *parent, const TQString& path, const char *name
void KIGPDialog::slotDefault()
{
- m_title->setText(i18n("Image Gallery for %1").arg(m_path));
+ m_title->setText(i18n("Image Gallery for %1").tqarg(m_path));
m_imagesPerRow->setValue(4);
m_imageName->setChecked(true);
m_imageSize->setChecked(false);
@@ -96,7 +96,7 @@ void KIGPDialog::setupLookPage(const TQString& path) {
label = new TQLabel( i18n("&Page title:"), page);
vlay->addWidget(label);
- m_title = new TQLineEdit(i18n("Image Gallery for %1").arg(path), page);
+ m_title = new TQLineEdit(i18n("Image Gallery for %1").tqarg(path), page);
vlay->addWidget( m_title );
label->setBuddy(m_title);
@@ -333,8 +333,8 @@ void KIGPDialog::writeConfig()
m_config->writeEntry("ImageProperty", printImageProperty());
m_config->writeEntry("FontName", getFontName());
m_config->writeEntry("FontSize", getFontSize());
- m_config->writeEntry("ForegroundColor", getForegroundColor().name() );
- m_config->writeEntry("BackgroundColor", getBackgroundColor().name());
+ m_config->writeEntry("ForegroundColor", TQString(getForegroundColor().name()) );
+ m_config->writeEntry("BackgroundColor", TQString(getBackgroundColor().name()));
m_config->setGroup("Directory");
m_config->writeEntry("RecurseSubDirectories", recurseSubDirectories());
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.h b/konq-plugins/kimgalleryplugin/imgallerydialog.h
index 1e14daa..f22c06b 100644
--- a/konq-plugins/kimgalleryplugin/imgallerydialog.h
+++ b/konq-plugins/kimgalleryplugin/imgallerydialog.h
@@ -39,9 +39,10 @@ typedef TQMap<TQString,TQString> CommentMap;
class KIGPDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- KIGPDialog(TQWidget *parent=0, const TQString& path=0, const char *name=0 );
+ KIGPDialog(TQWidget *tqparent=0, const TQString& path=0, const char *name=0 );
~KIGPDialog();
bool isDialogOk() const;
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
index 4b9a5e0..2b33df4 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
@@ -48,8 +48,8 @@ Boston, MA 02110-1301, USA.
typedef KGenericFactory<KImGalleryPlugin> KImGalleryPluginFactory;
K_EXPORT_COMPONENT_FACTORY( libkimgallery, KImGalleryPluginFactory( "imgalleryplugin" ) )
-KImGalleryPlugin::KImGalleryPlugin( TQObject* parent, const char* name, const TQStringList & )
- : KParts::Plugin( parent, name ), m_commentMap(0)
+KImGalleryPlugin::KImGalleryPlugin( TQObject* tqparent, const char* name, const TQStringList & )
+ : KParts::Plugin( tqparent, name ), m_commentMap(0)
{
new KAction( i18n( "&Create Image Gallery..." ), "imagegallery", CTRL+Key_I, this,
TQT_SLOT( slotExecute() ), actionCollection(), "create_img_gallery" );
@@ -58,12 +58,12 @@ KImGalleryPlugin::KImGalleryPlugin( TQObject* parent, const char* name, const TQ
void KImGalleryPlugin::slotExecute()
{
m_progressDlg=0L;
- if ( !parent() || !parent()->inherits("KonqDirPart"))
+ if ( !tqparent() || !tqparent()->inherits("KonqDirPart"))
{
KMessageBox::sorry( 0L, i18n("Could not create the plugin, please report a bug."));
return;
}
- m_part = static_cast<KonqDirPart *>(parent());
+ m_part = static_cast<KonqDirPart *>(tqparent());
if (!m_part->url().isLocalFile()) { //TODO support remote URLs too?
KMessageBox::sorry(m_part->widget(), i18n("Creating an image gallery works only on local folders."));
return;
@@ -105,7 +105,7 @@ bool KImGalleryPlugin::createDirectory(TQDir thumb_dir, TQString imgGalleryDir,
if (!thumb_dir.exists()) {
thumb_dir.setPath( imgGalleryDir);
if (!(thumb_dir.mkdir(dirName, false))) {
- KMessageBox::sorry(m_part->widget(), i18n("Couldn't create folder: %1").arg(thumb_dir.path()));
+ KMessageBox::sorry(m_part->widget(), i18n("Couldn't create folder: %1").tqarg(thumb_dir.path()));
return false;
} else {
thumb_dir.setPath( imgGalleryDir + "/" + dirName + "/" );
@@ -155,7 +155,7 @@ TQString KImGalleryPlugin::extension(const TQString& imageFormat)
if (imageFormat == "JPEG")
return ".jpg";
Q_ASSERT(false);
- return TQString::null;
+ return TQString();
}
void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDirName, const TQStringList& subDirList,
@@ -163,11 +163,11 @@ void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDi
{
int numOfImages = imageDir.count();
const TQString imgGalleryDir = url.directory();
- const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate()));
+ const TQString today(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()));
stream << "<body>\n<h1>" << TQStyleSheet::escape(m_configDlg->getTitle()) << "</h1><p>" << endl;
- stream << i18n("<i>Number of images</i>: %1").arg(numOfImages) << "<br/>" << endl;
- stream << i18n("<i>Created on</i>: %1").arg(today) << "</p>" << endl;
+ stream << i18n("<i>Number of images</i>: %1").tqarg(numOfImages) << "<br/>" << endl;
+ stream << i18n("<i>Created on</i>: %1").tqarg(today) << "</p>" << endl;
stream << "<hr/>" << endl;
@@ -205,10 +205,10 @@ void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDi
const TQString imgPath("thumbs/" + imgName + extension(imageFormat));
stream << "<img src=\"" << imgPath << "\" width=\"" << m_imgWidth << "\" ";
stream << "height=\"" << m_imgHeight << "\" alt=\"" << imgPath << "\"/>";
- m_progressDlg->setLabelText( i18n("Created thumbnail for: \n%1").arg(imgName) );
+ m_progressDlg->setLabelText( i18n("Created thumbnail for: \n%1").tqarg(imgName) );
} else {
kdDebug(90170) << "Creating thumbnail for " << imgName << " failed" << endl;
- m_progressDlg->setLabelText( i18n("Creating thumbnail for: \n%1\n failed").arg(imgName) );
+ m_progressDlg->setLabelText( i18n("Creating thumbnail for: \n%1\n failed").tqarg(imgName) );
}
stream << "</a>" << endl;
@@ -249,9 +249,9 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName
if(m_cancelled) return false;
- if( !parent() || !parent()->inherits("KonqDirPart"))
+ if( !tqparent() || !tqparent()->inherits("KonqDirPart"))
return false;
- KonqDirPart * part = static_cast<KonqDirPart *>(parent());
+ KonqDirPart * part = static_cast<KonqDirPart *>(tqparent());
TQStringList subDirList;
if (m_recurseSubDirectories && (recursionLevel >= 0)) { //recursionLevel == 0 means endless
@@ -266,7 +266,7 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName
if (!subDir.exists()) {
subDir.setPath( url.directory() );
if (!(subDir.mkdir(currentDir, false))) {
- KMessageBox::sorry(part->widget(), i18n("Couldn't create folder: %1").arg(subDir.path()));
+ KMessageBox::sorry(part->widget(), i18n("Couldn't create folder: %1").tqarg(subDir.path()));
continue;
} else {
subDir.setPath( url.directory() + "/" + currentDir );
@@ -293,12 +293,12 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName
kdDebug(90170) << "imgGalleryDir: " << imgGalleryDir << endl;
// Create the "thumbs" subdirectory if necessary
- TQDir thumb_dir( imgGalleryDir + TQString::fromLatin1("/thumbs/"));
+ TQDir thumb_dir( imgGalleryDir + TQString::tqfromLatin1("/thumbs/"));
if (createDirectory(thumb_dir, imgGalleryDir, "thumbs") == false)
return false;
// Create the "images" subdirectory if necessary
- TQDir images_dir( imgGalleryDir + TQString::fromLatin1("/images/"));
+ TQDir images_dir( imgGalleryDir + TQString::tqfromLatin1("/images/"));
if (m_copyFiles) {
if (createDirectory(images_dir, imgGalleryDir, "images") == false)
return false;
@@ -320,7 +320,7 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName
return !m_cancelled;
} else {
- KMessageBox::sorry(m_part->widget(),i18n("Couldn't open file: %1").arg(url.path(+1)));
+ KMessageBox::sorry(m_part->widget(),i18n("Couldn't open file: %1").tqarg(url.path(+1)));
return false;
}
}
@@ -344,8 +344,8 @@ void KImGalleryPlugin::deleteCancelledGallery(const KURL& url, const TQString& s
}
const TQString imgGalleryDir = url.directory();
- TQDir thumb_dir( imgGalleryDir + TQString::fromLatin1("/thumbs/"));
- TQDir images_dir( imgGalleryDir + TQString::fromLatin1("/images/"));
+ TQDir thumb_dir( imgGalleryDir + TQString::tqfromLatin1("/thumbs/"));
+ TQDir images_dir( imgGalleryDir + TQString::tqfromLatin1("/images/"));
TQDir imageDir( sourceDirName, "*.png *.PNG *.gif *.GIF *.jpg *.JPG *.jpeg *.JPEG *.bmp *.BMP",
TQDir::Name|TQDir::IgnoreCase, TQDir::Files|TQDir::Readable);
TQFile file( url.path() );
@@ -392,7 +392,7 @@ void KImGalleryPlugin::loadCommentFile()
// Lines starting with '#' are comment
if (!(curLineStripped.isEmpty()) && !curLineStripped.startsWith("#")) {
if (curLineStripped.endsWith(":")) {
- picComment = TQString::null;
+ picComment = TQString();
picName = curLineStripped.left(curLineStripped.length()-1);
kdDebug(90170) << "picName: " << picName << endl;
} else {
@@ -415,7 +415,7 @@ void KImGalleryPlugin::loadCommentFile()
kdDebug(90170) << "File closed." << endl;
delete m_textStream;
} else {
- KMessageBox::sorry(m_part->widget(), i18n("Couldn't open file: %1").arg(m_configDlg->getCommentFile()));
+ KMessageBox::sorry(m_part->widget(), i18n("Couldn't open file: %1").tqarg(m_configDlg->getCommentFile()));
m_useCommentFile = false;
}
}
@@ -424,18 +424,18 @@ bool KImGalleryPlugin::createThumb( const TQString& imgName, const TQString& sou
const TQString& imgGalleryDir, const TQString& imageFormat)
{
TQImage img;
- const TQString pixPath = sourceDirName + TQString::fromLatin1("/") + imgName;
+ const TQString pixPath = sourceDirName + TQString::tqfromLatin1("/") + imgName;
if (m_copyFiles) {
KURL srcURL = KURL::fromPathOrURL(pixPath);
//kdDebug(90170) << "srcURL: " << srcURL << endl;
- KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::fromLatin1("/images/") + imgName);
+ KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::tqfromLatin1("/images/") + imgName);
//kdDebug(90170) << "destURL: " << destURL << endl;
- KIO::NetAccess::copy(srcURL, destURL, static_cast<KParts::Part *>(parent())->widget());
+ KIO::NetAccess::copy(srcURL, destURL, static_cast<KParts::Part *>(tqparent())->widget());
}
const TQString imgNameFormat = imgName + extension(imageFormat);
- const TQString thumbDir = imgGalleryDir + TQString::fromLatin1("/thumbs/");
+ const TQString thumbDir = imgGalleryDir + TQString::tqfromLatin1("/thumbs/");
int extent = m_configDlg->getThumbnailSize();
// this code is stolen from kdebase/kioslave/thumbnail/imagecreator.cpp
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.h b/konq-plugins/kimgalleryplugin/imgalleryplugin.h
index 3168247..0139ae3 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.h
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.h
@@ -35,8 +35,9 @@ typedef TQMap<TQString,TQString> CommentMap;
class KImGalleryPlugin : public KParts::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- KImGalleryPlugin( TQObject* parent, const char* name,
+ KImGalleryPlugin( TQObject* tqparent, const char* name,
const TQStringList & );
~KImGalleryPlugin() {}
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
index 27459ee..de544bf 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
@@ -33,8 +33,8 @@
typedef KGenericFactory<KCMKuick, TQWidget> KuickFactory;
K_EXPORT_COMPONENT_FACTORY ( kcm_kuick, KuickFactory( "kcmkuick" ) )
-KCMKuick::KCMKuick(TQWidget *parent, const char *name, const TQStringList &)
-:KCModule(parent, name)
+KCMKuick::KCMKuick(TQWidget *tqparent, const char *name, const TQStringList &)
+:KCModule(tqparent, name)
{
KAboutData *ab=new KAboutData( "kcmkuick", I18N_NOOP("KCM Kuick"),
"0.2",I18N_NOOP("KControl module for Kuick's configuration"), KAboutData::License_GPL,
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.h b/konq-plugins/kuick/kcmkuick/kcmkuick.h
index d4316eb..6ff97eb 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.h
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.h
@@ -24,9 +24,10 @@ class KCMKuick
: public KCModule
{
Q_OBJECT
+ TQ_OBJECT
public:
- KCMKuick (TQWidget *parent, const char *name, const TQStringList &);
+ KCMKuick (TQWidget *tqparent, const char *name, const TQStringList &);
~KCMKuick();
void load();
void load(const TQString &);
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui b/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui
index 5001ad9..2ca7a5c 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui
+++ b/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>KCMKuickDialog</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KCMKuickDialog</cstring>
</property>
@@ -22,7 +22,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_chkShow</cstring>
</property>
@@ -30,7 +30,7 @@
<string>&amp;Show "Copy To" and "Move To" entries in context menus</string>
</property>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>m_grpCopy</cstring>
</property>
@@ -47,7 +47,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QPushButton" row="2" column="0">
+ <widget class="TQPushButton" row="2" column="0">
<property name="name">
<cstring>pbCopyClear</cstring>
</property>
@@ -55,7 +55,7 @@
<string>&amp;Clear List</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="2">
+ <widget class="TQLabel" row="0" column="2">
<property name="name">
<cstring>m_txtCopyDir</cstring>
</property>
@@ -63,7 +63,7 @@
<string>folders.</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>m_txtCopyCache</cstring>
</property>
@@ -79,7 +79,7 @@
<string>Cache the last</string>
</property>
</widget>
- <widget class="QSpinBox" row="0" column="1">
+ <widget class="TQSpinBox" row="0" column="1">
<property name="name">
<cstring>m_sbCopy</cstring>
</property>
@@ -100,7 +100,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -109,7 +109,7 @@
</spacer>
</grid>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>m_grpMove</cstring>
</property>
@@ -126,7 +126,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QPushButton" row="2" column="0">
+ <widget class="TQPushButton" row="2" column="0">
<property name="name">
<cstring>pbMoveClear</cstring>
</property>
@@ -134,7 +134,7 @@
<string>Clear &amp;List</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>m_txtMoveCache</cstring>
</property>
@@ -142,7 +142,7 @@
<string>Cache the last</string>
</property>
</widget>
- <widget class="QSpinBox" row="0" column="1">
+ <widget class="TQSpinBox" row="0" column="1">
<property name="name">
<cstring>m_sbMove</cstring>
</property>
@@ -153,7 +153,7 @@
<number>1</number>
</property>
</widget>
- <widget class="QLabel" row="0" column="2">
+ <widget class="TQLabel" row="0" column="2">
<property name="name">
<cstring>m_txtMoveDir</cstring>
</property>
@@ -171,7 +171,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -188,10 +188,10 @@
<tabstop>m_sbMove</tabstop>
<tabstop>pbMoveClear</tabstop>
</tabstops>
-<slots>
+<Q_SLOTS>
<slot access="private">slotClearMoveCache()</slot>
<slot access="protected">slotClearCopyCache()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="0"/>
-<layoutfunctions spacing="KDialog::spacingHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="0"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint"/>
</UI>
diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index 4dbd212..1174ee3 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -34,28 +34,28 @@
TQMap<TQString, TQPixmap> *KDirMenu::_icons = 0;
-KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src,
+KDirMenu::KDirMenu ( TQWidget *tqparent, const KURL &_src,
const TQString &_path, const TQString &_name, bool /*showfile*/ )
- : TQPopupMenu(parent),
+ : TQPopupMenu(tqparent),
path(_path),
name(_name),
src( _src ),
action( 0 )
{
- children.setAutoDelete( true );
+ tqchildren.setAutoDelete( true );
initIconMap( );
connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) );
connect( this, TQT_SIGNAL( aboutToHide( ) ), this, TQT_SLOT( slotAboutToHide( ) ) );
- children.clear(); // just in case
+ tqchildren.clear(); // just in case
TQFileInfo fileInfo(path);
if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable())
- action = new KAction(name, 0, this, TQT_SLOT(new_slot( ) ), this);
+ action = new KAction(name, 0, TQT_TQOBJECT(this), TQT_SLOT(new_slot( ) ), TQT_TQOBJECT(this));
}
KDirMenu::~KDirMenu( ) {
delete action;
clear( );
- children.clear( );
+ tqchildren.clear( );
}
void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) {
static const TQIconSet folder = SmallIconSet("folder");
@@ -76,11 +76,11 @@ void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) {
KIcon::DefaultState, 0, true);
if(icon.isNull())
icon = CICON("folder");
- insertItem( icon, escapedPath.replace( "&", "&&" ), submenu );
+ insertItem( icon, escapedPath.tqreplace( "&", "&&" ), submenu );
}
else
- insertItem( folder, escapedPath.replace( "&", "&&" ), submenu );
- children.append( submenu );
+ insertItem( folder, escapedPath.tqreplace( "&", "&&" ), submenu );
+ tqchildren.append( submenu );
connect(submenu, TQT_SIGNAL(fileChosen(const TQString &)),
this, TQT_SLOT(slotFileSelected(const TQString &)));
}
@@ -101,11 +101,11 @@ void KDirMenu::slotAboutToShow( ) {
setItemEnabled( insertItem( name ), false );
// all dirs writeable and readable
- TQDir dir(path, TQString::null,
+ TQDir dir(path, TQString(),
TQDir::Name | TQDir::DirsFirst | TQDir::IgnoreCase,
TQDir::Dirs | TQDir::Readable | TQDir::Executable);
- const QFileInfoList* dirList = dir.entryInfoList();
+ const TQFileInfoList* dirList = dir.entryInfoList();
if ( !dirList || dirList->isEmpty() ) {
if ( action )
action->setEnabled( false );
@@ -123,7 +123,7 @@ void KDirMenu::slotAboutToShow( ) {
static const TQString& dot = KGlobal::staticQString( "." );
static const TQString& dotdot = KGlobal::staticQString( ".." );
- for ( QFileInfoListIterator it( *dirList ); *it; ++it ) {
+ for ( TQFileInfoListIterator it( *dirList ); *it; ++it ) {
TQString fileName = (*it)->fileName();
if ( fileName == dot || fileName == dotdot )
continue;
diff --git a/konq-plugins/kuick/kdirmenu.h b/konq-plugins/kuick/kdirmenu.h
index 5bbe68e..cdc2933 100644
--- a/konq-plugins/kuick/kdirmenu.h
+++ b/konq-plugins/kuick/kdirmenu.h
@@ -30,8 +30,9 @@ class KURL;
class KDirMenu : public TQPopupMenu {
Q_OBJECT
+ TQ_OBJECT
public:
- KDirMenu( TQWidget *parent, const KURL &src, const TQString &_path,
+ KDirMenu( TQWidget *tqparent, const KURL &src, const TQString &_path,
const TQString &name, bool showfiles = false );
~KDirMenu( );
void setPath( const TQString &_path);
@@ -47,7 +48,7 @@ private:
TQString name;
KURL src;
KAction *action;
- TQPtrList<KDirMenu> children;
+ TQPtrList<KDirMenu> tqchildren;
void initIconMap( );
public slots:
void slotAboutToShow( );
diff --git a/konq-plugins/kuick/kimcontactmenu.cpp b/konq-plugins/kuick/kimcontactmenu.cpp
index 77ef7a4..e711df2 100644
--- a/konq-plugins/kuick/kimcontactmenu.cpp
+++ b/konq-plugins/kuick/kimcontactmenu.cpp
@@ -34,8 +34,8 @@
#include "kimcontactmenu.h"
-KIMContactMenu::KIMContactMenu( TQWidget *parent, KIMProxy *proxy )
- : TQPopupMenu( parent), mProxy( proxy )
+KIMContactMenu::KIMContactMenu( TQWidget *tqparent, KIMProxy *proxy )
+ : TQPopupMenu( tqparent), mProxy( proxy )
{
#ifdef KIMCONTACTS_USE_KABC
m_addressBook = KABC::StdAddressBook::self( false );
diff --git a/konq-plugins/kuick/kimcontactmenu.h b/konq-plugins/kuick/kimcontactmenu.h
index 478c55b..2f1c0bb 100644
--- a/konq-plugins/kuick/kimcontactmenu.h
+++ b/konq-plugins/kuick/kimcontactmenu.h
@@ -31,11 +31,12 @@ namespace KABC {
class AddressBook;
}
-class KIMContactMenu : public QPopupMenu
+class KIMContactMenu : public TQPopupMenu
{
Q_OBJECT
+ TQ_OBJECT
public:
- KIMContactMenu( TQWidget *parent, KIMProxy *proxy );
+ KIMContactMenu( TQWidget *tqparent, KIMProxy *proxy );
~KIMContactMenu();
protected slots:
// populate menus if not already populated
diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp
index 2b5d78a..451f127 100644
--- a/konq-plugins/kuick/kmetamenu.cpp
+++ b/konq-plugins/kuick/kmetamenu.cpp
@@ -36,9 +36,9 @@
#include "kimcontactmenu.h"
#include "kmetamenu.moc"
-KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
+KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url,
const TQString &text, const TQString &key, KIMProxy *imProxy )
-: TQPopupMenu( parent),
+: TQPopupMenu( tqparent),
m_root( 0 ), m_home( 0 ), m_etc( 0 ), m_current( 0 ), m_browse( 0 ) {
int recent_no;
group = key;
@@ -51,7 +51,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
u.setPath(TQDir::homeDirPath());
if ( kapp->authorizeURLAction("list", u, u) )
{
- m_home = new KDirMenu( parent, url, u.path() , text );
+ m_home = new KDirMenu( tqparent, url, u.path() , text );
insertItem( SmallIcon( "kfm_home" ), i18n("&Home Folder"), m_home);
dirList << u.path();
@@ -62,7 +62,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
u.setPath(TQDir::rootDirPath());
if ( kapp->authorizeURLAction("list", u, u) )
{
- m_root = new KDirMenu( parent, url, u.path() , text );
+ m_root = new KDirMenu( tqparent, url, u.path() , text );
insertItem( SmallIcon( "folder_red" ), i18n("&Root Folder"), m_root);
dirList << u.path();
@@ -75,7 +75,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
if ( TQFileInfo( confDir ).isWritable() &&
kapp->authorizeURLAction("list", u, u) )
{
- m_etc = new KDirMenu( parent, url, confDir, text );
+ m_etc = new KDirMenu( tqparent, url, confDir, text );
insertItem( SmallIcon( "folder_yellow" ) ,
i18n("&System Configuration"), m_etc);
dirList << confDir;
@@ -85,7 +85,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
}
if ( url.isLocalFile()
- && dirList.find( url.path() ) == dirList.end()
+ && dirList.tqfind( url.path() ) == dirList.end()
&& TQFileInfo( url.path() ).isWritable()
&& TQFileInfo( url.path() ).isDir()
&& kapp->authorizeURLAction("list", url, url) )
@@ -93,7 +93,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
//(#60192)
{
// Also add current working directory
- m_current = new KDirMenu( parent, url, url.path(), text );
+ m_current = new KDirMenu( tqparent, url, url.path(), text );
insertItem( SmallIcon( "folder" ), i18n( "&Current Folder" ),
m_current );
@@ -103,7 +103,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
if ( imProxy )
{
- m_contacts = new KIMContactMenu( parent, imProxy );
+ m_contacts = new KIMContactMenu( tqparent, imProxy );
int item = insertItem( SmallIconSet( "personal" ), i18n( "C&ontact" ), m_contacts );
connect ( m_contacts, TQT_SIGNAL( contactChosen( const TQString &) ), TQT_SIGNAL( contactChosen( const TQString & ) ) );
if ( !imProxy->initialize() || imProxy->fileTransferContacts().isEmpty() )
@@ -111,7 +111,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
}
- m_browse = new KAction(i18n("&Browse..."), 0, this, TQT_SLOT(slotBrowse()), this );
+ m_browse = new KAction(i18n("&Browse..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBrowse()), TQT_TQOBJECT(this) );
m_browse->plug(this);
// read the last chosen dirs
// first set the group according to our parameter
@@ -133,7 +133,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
continue;
}
TQString escapedDir = *it;
- KAction *action = new KAction(escapedDir.replace("&", "&&"), 0, this, TQT_SLOT(slotFastPath()), this);
+ KAction *action = new KAction(escapedDir.tqreplace("&", "&&"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastPath()), TQT_TQOBJECT(this));
action->plug(this );
actions.append( action );
++it;
diff --git a/konq-plugins/kuick/kmetamenu.h b/konq-plugins/kuick/kmetamenu.h
index 6b23cb7..a15878b 100644
--- a/konq-plugins/kuick/kmetamenu.h
+++ b/konq-plugins/kuick/kmetamenu.h
@@ -35,9 +35,10 @@ class KURL;
class KMetaMenu : public TQPopupMenu {
Q_OBJECT
+ TQ_OBJECT
public:
- KMetaMenu( TQWidget *parent, const KURL &url, const TQString &text,
+ KMetaMenu( TQWidget *tqparent, const KURL &url, const TQString &text,
const TQString &key, KIMProxy * imProxy = 0L );
KMetaMenu();
~KMetaMenu();
diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp
index 772f169..27152e7 100644
--- a/konq-plugins/kuick/kuick_plugin.cpp
+++ b/konq-plugins/kuick/kuick_plugin.cpp
@@ -43,7 +43,7 @@ KTestMenu::KTestMenu( KonqPopupMenu *popupmenu, const char *name, const TQString
meta_copy_mmu = 0L;
meta_move_mmu = 0L;
my_action = new KAction( "kuick_plugin", 0, this, TQT_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" );
- addAction( my_action );
+ tqaddAction( my_action );
addSeparator();
//popupmenu->addMerge();
connect( popup, TQT_SIGNAL(aboutToShow() ), this, TQT_SLOT(slotPrepareMenu( ) ) );
@@ -82,7 +82,7 @@ void KTestMenu::slotPrepareMenu( ) { // now it's time to set up the menu...
for(int i= popup->count(); i >=1; i--) {
int id = popup->idAt( i );
TQString text = popup->text( id );
- if( text.contains("kuick_plugin") ) {
+ if( text.tqcontains("kuick_plugin") ) {
popup->removeItem( id );
if (isKDesktop && !kapp->authorize("editable_desktop_icons"))
{
diff --git a/konq-plugins/kuick/kuick_plugin.h b/konq-plugins/kuick/kuick_plugin.h
index 8369f7f..cd35342 100644
--- a/konq-plugins/kuick/kuick_plugin.h
+++ b/konq-plugins/kuick/kuick_plugin.h
@@ -28,6 +28,7 @@ class KAction;
class KURL;
class KTestMenu : public KonqPopupMenuPlugin {
Q_OBJECT
+ TQ_OBJECT
public:
KTestMenu (KonqPopupMenu *, const char *name, const TQStringList &list);
virtual ~KTestMenu( );
diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp
index 9dfa53c..1816b08 100644
--- a/konq-plugins/microformat/konqmficon.cpp
+++ b/konq-plugins/microformat/konqmficon.cpp
@@ -17,8 +17,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#include "konqmficon.h"
@@ -41,11 +41,11 @@ typedef KGenericFactory<KonqMFIcon> KonqMFIconFactory;
K_EXPORT_COMPONENT_FACTORY(libmfkonqmficon,
KonqMFIconFactory("mfkonqmficon"))
-KonqMFIcon::KonqMFIcon(TQObject *parent, const char *name, const TQStringList &)
-: KParts::Plugin(parent, name), PluginBase(), m_part(0), m_mfIcon(0), m_statusBarEx(0), m_menu(0) {
+KonqMFIcon::KonqMFIcon(TQObject *tqparent, const char *name, const TQStringList &)
+: KParts::Plugin(tqparent, name), PluginBase(), m_part(0), m_mfIcon(0), m_statusBarEx(0), m_menu(0) {
KGlobal::locale()->insertCatalogue("mf_konqplugin");
- m_part = dynamic_cast<KHTMLPart*>(parent);
+ m_part = dynamic_cast<KHTMLPart*>(tqparent);
if (!m_part) {
kdDebug() << "couldn't get part" << endl;
return;
@@ -157,7 +157,7 @@ void KonqMFIcon::extractCard(DOM::Node node) {
if (!name.isEmpty()) {
value += "END:VCARD\n";
- _cards.append(qMakePair(name, value));
+ _cards.append(tqMakePair(name, value));
}
}
@@ -202,7 +202,7 @@ void KonqMFIcon::extractEvent(DOM::Node node) {
if (!name.isEmpty()) {
value += "END:VEVENT\nEND:VCALENDAR\n";
- _events.append(qMakePair(name, value));
+ _events.append(tqMakePair(name, value));
}
}
@@ -249,11 +249,11 @@ void KonqMFIcon::contextMenu() {
m_menu->insertTitle(i18n("Microformats"));
connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addMF(int)));
int id = 0;
- for (TQValueList<QPair<TQString, TQString> >::ConstIterator it = _events.begin(); it != _events.end(); ++it) {
+ for (TQValueList<TQPair<TQString, TQString> >::ConstIterator it = _events.begin(); it != _events.end(); ++it) {
m_menu->insertItem(SmallIcon("bookmark_add"), (*it).first, id);
id++;
}
- for (TQValueList<QPair<TQString, TQString> >::ConstIterator it = _cards.begin(); it != _cards.end(); ++it) {
+ for (TQValueList<TQPair<TQString, TQString> >::ConstIterator it = _cards.begin(); it != _cards.end(); ++it) {
m_menu->insertItem(SmallIcon("bookmark_add"), (*it).first, id);
id++;
}
@@ -275,7 +275,7 @@ void KonqMFIcon::addMFIcon() {
m_mfIcon = new KURLLabel(m_statusBarEx->statusBar());
m_mfIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
- m_mfIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+ m_mfIcon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
m_mfIcon->setUseCursor(false);
//FIXME hackish
m_mfIcon->setPixmap(TQPixmap(locate("data", "microformat/pics/microformat.png")));
diff --git a/konq-plugins/microformat/konqmficon.h b/konq-plugins/microformat/konqmficon.h
index 5a9e02c..8213f8f 100644
--- a/konq-plugins/microformat/konqmficon.h
+++ b/konq-plugins/microformat/konqmficon.h
@@ -17,12 +17,12 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
-#ifndef KONQFEEDICON_H
-#define KONQFEEDICON_H
+#ifndef KONTQFEEDICON_H
+#define KONTQFEEDICON_H
#include <khtml_part.h>
#include <kparts/plugin.h>
@@ -41,8 +41,9 @@ namespace KParts {
class KonqMFIcon : public KParts::Plugin, PluginBase {
Q_OBJECT
+ TQ_OBJECT
public:
- KonqMFIcon(TQObject *parent, const char *name, const TQStringList &);
+ KonqMFIcon(TQObject *tqparent, const char *name, const TQStringList &);
~KonqMFIcon();
@@ -56,7 +57,7 @@ class KonqMFIcon : public KParts::Plugin, PluginBase {
KURLLabel *m_mfIcon;
KParts::StatusBarExtension *m_statusBarEx;
TQGuardedPtr<KPopupMenu> m_menu;
- TQValueList<QPair<TQString, TQString> > _events, _cards;
+ TQValueList<TQPair<TQString, TQString> > _events, _cards;
private slots:
void waitPartToLoad();
diff --git a/konq-plugins/microformat/pluginbase.cpp b/konq-plugins/microformat/pluginbase.cpp
index 486721a..f722340 100644
--- a/konq-plugins/microformat/pluginbase.cpp
+++ b/konq-plugins/microformat/pluginbase.cpp
@@ -17,8 +17,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#include <kprocess.h>
diff --git a/konq-plugins/microformat/pluginbase.h b/konq-plugins/microformat/pluginbase.h
index 17a504d..a786af5 100644
--- a/konq-plugins/microformat/pluginbase.h
+++ b/konq-plugins/microformat/pluginbase.h
@@ -17,8 +17,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#ifndef PLUGINBASE_H
diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp
index a1a5bfc..2346831 100644
--- a/konq-plugins/minitools/minitoolsplugin.cpp
+++ b/konq-plugins/minitools/minitoolsplugin.cpp
@@ -42,9 +42,9 @@
typedef KGenericFactory<MinitoolsPlugin> MinitoolsPluginFactory;
K_EXPORT_COMPONENT_FACTORY( libminitoolsplugin, MinitoolsPluginFactory("minitoolsplugin") )
-MinitoolsPlugin::MinitoolsPlugin(TQObject* parent, const char* name, const TQStringList &)
- : KParts::Plugin(parent, name) {
- m_part = (parent && parent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(parent) : 0L;
+MinitoolsPlugin::MinitoolsPlugin(TQObject* tqparent, const char* name, const TQStringList &)
+ : KParts::Plugin(tqparent, name) {
+ m_part = (tqparent && tqparent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(tqparent) : 0L;
m_pMinitoolsMenu = new KActionMenu(i18n("&Minitools"), "minitools", actionCollection(), "minitools");
@@ -124,17 +124,17 @@ void MinitoolsPlugin::newBookmarkCallback(
const TQString & text, const TQCString & url, const TQString &
) {
kdDebug(90150) << "MinitoolsPlugin::newBookmarkCallback" << text << url << endl;
- m_minitoolsList.prepend(qMakePair(text,url));
+ m_minitoolsList.prepend(tqMakePair(text,url));
}
void MinitoolsPlugin::endFolderCallback() {
kdDebug(90150) << "MinitoolsPlugin::endFolderCallback" << endl;
- m_minitoolsList.prepend(qMakePair(TQString("-"),TQCString("-")));
+ m_minitoolsList.prepend(tqMakePair(TQString("-"),TQCString("-")));
}
TQString MinitoolsPlugin::minitoolsFilename(bool local) {
- return local ? locateLocal("data", TQString::fromLatin1("konqueror/minitools.xml"))
- : locateLocal("data", TQString::fromLatin1("konqueror/minitools-global.xml"));
+ return local ? locateLocal("data", TQString::tqfromLatin1("konqueror/minitools.xml"))
+ : locateLocal("data", TQString::tqfromLatin1("konqueror/minitools-global.xml"));
}
void MinitoolsPlugin::slotEditBookmarks() {
diff --git a/konq-plugins/minitools/minitoolsplugin.h b/konq-plugins/minitools/minitoolsplugin.h
index 04d2ae8..8607efe 100644
--- a/konq-plugins/minitools/minitoolsplugin.h
+++ b/konq-plugins/minitools/minitoolsplugin.h
@@ -34,9 +34,10 @@ class KActionMenu;
class MinitoolsPlugin : public KParts::Plugin {
Q_OBJECT
+ TQ_OBJECT
public:
- MinitoolsPlugin( TQObject* parent, const char* name, const TQStringList & );
+ MinitoolsPlugin( TQObject* tqparent, const char* name, const TQStringList & );
~MinitoolsPlugin();
protected slots:
@@ -57,7 +58,7 @@ private:
KHTMLPart* m_part;
KActionMenu* m_pMinitoolsMenu;
- typedef QPair<TQString,TQCString> Minitool;
+ typedef TQPair<TQString,TQCString> Minitool;
typedef TQValueList<Minitool> MinitoolsList;
MinitoolsList m_minitoolsList;
diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp
index 14a47a3..e77e1e3 100644
--- a/konq-plugins/rellinks/plugin_rellinks.cpp
+++ b/konq-plugins/rellinks/plugin_rellinks.cpp
@@ -1,6 +1,6 @@
/***************************************************************************
* Copyright (C) 2002, Anders Lund <anders@alweb.dk> *
- * Copyright (C) 2003, 2004, Franck Quélain <shift@free.fr> *
+ * Copyright (C) 2003, 2004, Franck Qu�lain <shift@free.fr> *
* Copyright (C) 2004, Kevin Krammer <kevin.krammer@gmx.at> *
* Copyright (C) 2004, 2006, Oliviet Goffart <ogoffart @ kde.org> *
* *
@@ -23,7 +23,7 @@
-// Qt includes
+// TQt includes
#include <tqapplication.h>
#include <tqtimer.h>
@@ -61,8 +61,8 @@ K_EXPORT_COMPONENT_FACTORY( librellinksplugin, RelLinksFactory("rellinks") )
#endif
/** Constructor of the plugin. */
-RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStringList &)
- : KParts::Plugin( parent, name ),
+RelLinksPlugin::RelLinksPlugin(TQObject *tqparent, const char *name, const TQStringList &)
+ : KParts::Plugin( tqparent, name ),
m_part(0),
m_viewVisible(false)
{
@@ -74,7 +74,7 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin
kaction_map["home"]->setWhatsThis( i18n("<p>This link references a home page or the top of some hierarchy.</p>") );
kaction_map["up"] = new KAction( i18n("&Up"), "1uparrow", KShortcut("Ctrl+Alt+U"), this, TQT_SLOT(goUp()), actionCollection(), "rellinks_up" );
- kaction_map["up"]->setWhatsThis( i18n("<p>This link references the immediate parent of the current document.</p>") );
+ kaction_map["up"]->setWhatsThis( i18n("<p>This link references the immediate tqparent of the current document.</p>") );
bool isRTL = TQApplication::reverseLayout();
@@ -91,7 +91,7 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin
kaction_map["last"]->setWhatsThis( i18n("<p>This link references the end of a sequence of documents.</p>") );
// ------------ special items --------------------------
- kaction_map["search"] = new KAction( i18n("&Search"), "filefind", KShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" );
+ kaction_map["search"] = new KAction( i18n("&Search"), "filetqfind", KShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" );
kaction_map["search"]->setWhatsThis( i18n("<p>This link references the search.</p>") );
// ------------ Document structure links ---------------
@@ -175,7 +175,7 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin
disableAll();
// When the rendering of the HTML is done, we update the site navigation bar
- m_part = dynamic_cast<KHTMLPart *>(parent);
+ m_part = dynamic_cast<KHTMLPart *>(tqparent);
if (!m_part)
return;
@@ -199,7 +199,7 @@ bool RelLinksPlugin::eventFilter(TQObject *watched, TQEvent* event) {
if (watched == 0 || event == 0) return false;
- if (watched == m_view)
+ if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_view))
{
switch (event->type())
{
@@ -310,7 +310,7 @@ void RelLinksPlugin::updateToolbar() {
// escape ampersand before settings as action title, otherwise the menu entry will interpret it as an
// accelerator
- title.replace('&', "&&");
+ title.tqreplace('&', "&&");
// -- Menus activation --
@@ -364,7 +364,7 @@ void RelLinksPlugin::updateToolbar() {
void RelLinksPlugin::guessRelations()
{
- m_part = dynamic_cast<KHTMLPart *>(parent());
+ m_part = dynamic_cast<KHTMLPart *>(tqparent());
if (!m_part || m_part->document().isNull() )
return;
@@ -394,7 +394,7 @@ void RelLinksPlugin::guessRelations()
TQString href=rx.cap(1)+ nval_str + rx.cap(3);
KURL ref( m_part->url(), href );
- TQString title = i18n("[Autodetected] %1").arg(ref.prettyURL());
+ TQString title = i18n("[Autodetected] %1").tqarg(ref.prettyURL());
DOM::Element e= m_part->document().createElement("link");
e.setAttribute("href",href);
element_map["next"][0] = e;
@@ -408,7 +408,7 @@ void RelLinksPlugin::guessRelations()
nval_str.prepend(zeros.left(lenval-nval_str.length()));
TQString href=rx.cap(1)+ nval_str + rx.cap(3);
KURL ref( m_part->url(), href );
- TQString title = i18n("[Autodetected] %1").arg(ref.prettyURL());
+ TQString title = i18n("[Autodetected] %1").tqarg(ref.prettyURL());
e= m_part->document().createElement("link");
e.setAttribute("href",href);
element_map["prev"][0] = e;
@@ -422,7 +422,7 @@ void RelLinksPlugin::guessRelations()
/** Menu links */
void RelLinksPlugin::goToLink(const TQString & rel, int id) {
// have the KHTML part open it
- KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent());
+ KHTMLPart *part = dynamic_cast<KHTMLPart *>(tqparent());
if (!part)
return;
@@ -561,17 +561,17 @@ void RelLinksPlugin::disableAll() {
TQString RelLinksPlugin::getLinkType(const TQString &lrel) {
// Relations to ignore...
- if (lrel.contains("stylesheet")
+ if (lrel.tqcontains("stylesheet")
|| lrel == "script"
|| lrel == "icon"
|| lrel == "shortcut icon"
|| lrel == "prefetch" )
- return TQString::null;
+ return TQString();
// ...known relations...
if (lrel == "top" || lrel == "origin" || lrel == "start")
return "home";
- if (lrel == "parent")
+ if (lrel == "tqparent")
return "up";
if (lrel == "first")
return "begin";
@@ -583,7 +583,7 @@ TQString RelLinksPlugin::getLinkType(const TQString &lrel) {
return "last";
if (lrel == "toc")
return "contents";
- if (lrel == "find")
+ if (lrel == "tqfind")
return "search";
if (lrel == "alternative stylesheet")
return "alternate stylesheet";
@@ -612,7 +612,7 @@ TQString RelLinksPlugin::transformRevToRel(const TQString &rev) {
return getLinkType("sibling");
//...unknown inverse relation => ignore for the moment
- return TQString::null;
+ return TQString();
}
#include "plugin_rellinks.moc"
diff --git a/konq-plugins/rellinks/plugin_rellinks.h b/konq-plugins/rellinks/plugin_rellinks.h
index 9c38795..c6e0942 100644
--- a/konq-plugins/rellinks/plugin_rellinks.h
+++ b/konq-plugins/rellinks/plugin_rellinks.h
@@ -30,7 +30,7 @@
This plugin create a toolbar similar to the Site Navigation Bar of Mozilla
*/
-// Qt includes
+// TQt includes
#include <tqmap.h>
// KDE includes
@@ -57,9 +57,10 @@ class TQTimer;
*/
class RelLinksPlugin : public KParts::Plugin {
Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor */
- RelLinksPlugin( TQObject *parent, const char *name, const TQStringList & );
+ RelLinksPlugin( TQObject *tqparent, const char *name, const TQStringList & );
/** Destructor */
virtual ~RelLinksPlugin();
diff --git a/konq-plugins/rsync/rsyncconfigdialog.cpp b/konq-plugins/rsync/rsyncconfigdialog.cpp
index ae89efa..f0e99a4 100644
--- a/konq-plugins/rsync/rsyncconfigdialog.cpp
+++ b/konq-plugins/rsync/rsyncconfigdialog.cpp
@@ -100,12 +100,12 @@
/*
* RsyncConfigDialog implementation
*/
-RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name,
+RsyncConfigDialog::RsyncConfigDialog(TQWidget* tqparent, const char* name,
const TQString& caption, const TQString& text,
const TQString& localfolder, const TQString& remotefolder,
int syncmode, bool modal)
: KDialogBase(KDialogBase::Plain, caption, KDialogBase::Cancel | KDialogBase::Ok,
- KDialogBase::Ok, parent, name, modal),
+ KDialogBase::Ok, tqparent, name, modal),
mAutoClose(true),
mAutoReset(false),
mCancelled(false),
@@ -113,7 +113,7 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name,
mAllowTextEdit(false),
mShown(false)
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
#endif
mShowTimer = new TQTimer(this);
@@ -122,19 +122,19 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name,
mCancelText = actionButton(KDialogBase::Cancel)->text();
TQFrame* mainWidget = plainPage();
- TQVBoxLayout* layout = new TQVBoxLayout(mainWidget, 10);
+ TQVBoxLayout* tqlayout = new TQVBoxLayout(mainWidget, 10);
mLabel = new TQLabel(TQString("<b>") + text + TQString("</b><br>")+i18n("Setting up synchronization for local folder")+TQString("<br><i>") + localfolder, mainWidget);
- layout->addWidget(mLabel);
+ tqlayout->addWidget(mLabel);
// Create an exclusive button group
- TQButtonGroup *layoutg = new TQButtonGroup( 1, TQGroupBox::Horizontal, i18n("Synchronization Method")+TQString(":"), mainWidget);
- layout->addWidget( layoutg );
- layoutg->setExclusive( TRUE );
+ TQButtonGroup *tqlayoutg = new TQButtonGroup( 1, Qt::Horizontal, i18n("Synchronization Method")+TQString(":"), mainWidget);
+ tqlayout->addWidget( tqlayoutg );
+ tqlayoutg->setExclusive( TRUE );
// Insert radiobuttons
- rsync_rb1 = new TQRadioButton(i18n("&Utilize rsync + ssh for upload to remote server\nExample: servername:/path/to/remote/folder"), layoutg);
- rsync_rb2 = new TQRadioButton(i18n("&Utilize rsync + ssh for download from remote server\nExample: servername:/path/to/remote/folder"), layoutg);
- rsync_rb3 = new TQRadioButton(i18n("&Utilize unison + ssh for bidirectional synchronization with remote server\nExample: ssh://servername//path/to/remote/folder"), layoutg);
+ rsync_rb1 = new TQRadioButton(i18n("&Utilize rsync + ssh for upload to remote server\nExample: servername:/path/to/remote/folder"), tqlayoutg);
+ rsync_rb2 = new TQRadioButton(i18n("&Utilize rsync + ssh for download from remote server\nExample: servername:/path/to/remote/folder"), tqlayoutg);
+ rsync_rb3 = new TQRadioButton(i18n("&Utilize unison + ssh for bidirectional synchronization with remote server\nExample: ssh://servername//path/to/remote/folder"), tqlayoutg);
if (syncmode == 1)
rsync_rb1->setChecked( TRUE );
@@ -143,15 +143,15 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name,
else if (syncmode == 3)
rsync_rb3->setChecked( TRUE );
- //(void)new TQRadioButton( "R&adiobutton 2", layoutg );
- //(void)new TQRadioButton( "Ra&diobutton 3", layoutg );
+ //(void)new TQRadioButton( "R&adiobutton 2", tqlayoutg );
+ //(void)new TQRadioButton( "Ra&diobutton 3", tqlayoutg );
// Create an exclusive button group
- TQButtonGroup *layoutm = new TQButtonGroup( 1, TQGroupBox::Horizontal, i18n("Remote Folder")+TQString(":"), mainWidget);
- layout->addWidget( layoutm );
- layoutg->setExclusive( TRUE );
+ TQButtonGroup *tqlayoutm = new TQButtonGroup( 1, Qt::Horizontal, i18n("Remote Folder")+TQString(":"), mainWidget);
+ tqlayout->addWidget( tqlayoutm );
+ tqlayoutg->setExclusive( TRUE );
- m_rsync_txt = new TQLineEdit(layoutm);
+ m_rsync_txt = new TQLineEdit(tqlayoutm);
if (remotefolder.isEmpty() == false) {
m_rsync_txt->setText(remotefolder);
}
diff --git a/konq-plugins/rsync/rsyncconfigdialog.h b/konq-plugins/rsync/rsyncconfigdialog.h
index 8e02d54..44ab118 100644
--- a/konq-plugins/rsync/rsyncconfigdialog.h
+++ b/konq-plugins/rsync/rsyncconfigdialog.h
@@ -37,13 +37,14 @@
class RsyncConfigDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- RsyncConfigDialog(TQWidget* parent = 0, const char* name = 0,
- const TQString& caption = TQString::null,
- const TQString& text = TQString::null,
- const TQString& localfolder = TQString::null,
- const TQString& remotefolder = TQString::null,
+ RsyncConfigDialog(TQWidget* tqparent = 0, const char* name = 0,
+ const TQString& caption = TQString(),
+ const TQString& text = TQString(),
+ const TQString& localfolder = TQString(),
+ const TQString& remotefolder = TQString(),
int syncmode = 1, bool modal = false);
/**
diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp
index 81a5253..b223a93 100644
--- a/konq-plugins/rsync/rsyncplugin.cpp
+++ b/konq-plugins/rsync/rsyncplugin.cpp
@@ -106,13 +106,13 @@ typedef KGenericFactory<RsyncPlugin> RsyncPluginFactory;
K_EXPORT_COMPONENT_FACTORY(librsyncplugin,
RsyncPluginFactory("rsyncplugin"))
-RsyncPlugin::RsyncPlugin (TQObject* parent, const char* name,
+RsyncPlugin::RsyncPlugin (TQObject* tqparent, const char* name,
const TQStringList&)
- :KParts::Plugin (parent, name),
+ :KParts::Plugin (tqparent, name),
m_pSyncNow(0),
m_pSyncSetup(0)
{
- m_part = ::qt_cast<KonqDirPart*>(parent);
+ m_part = ::tqqt_cast<KonqDirPart*>(tqparent);
if ( !m_part || !m_part->scrollWidget() )
return;
@@ -224,7 +224,7 @@ creates the unidirectional sync subprocess
bool RsyncPlugin::syncUnidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath) {
int fd[2];
int rc, flags;
- thisFn = TQString::null;
+ thisFn = TQString();
rc = open_pty_pair(fd);
if (rc == -1) {
@@ -361,7 +361,7 @@ creates the bidirectional sync subprocess
bool RsyncPlugin::syncBidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath) {
int fd[2];
int rc, flags;
- thisFn = TQString::null;
+ thisFn = TQString();
// Check for and remove the trailing slash in localfolder
if (localfolder.endsWith("/")) {
@@ -521,17 +521,17 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) {
buf.truncate(buf.length()-1);
myDebug( << "establishing: got " << buf << endl);
- while (childPid && ((pos = buf.find('\n')) >= 0 || buf.endsWith(":") || buf.endsWith("?"))) {
+ while (childPid && ((pos = buf.tqfind('\n')) >= 0 || buf.endsWith(":") || buf.endsWith("?"))) {
if (m_progressDialogExists == true) {
- qApp->processEvents();
+ tqApp->processEvents();
}
pos++;
TQString str = buf.left(pos);
buf = buf.mid(pos);
if (str == "\n")
continue;
- //if (str.contains("rsync error:")) {
- if (str.contains("rsync:") || str.contains("failed.") || (str.contains("Could not") && str.endsWith("."))) {
+ //if (str.tqcontains("rsync error:")) {
+ if (str.tqcontains("rsync:") || str.tqcontains("failed.") || (str.tqcontains("Could not") && str.endsWith("."))) {
KMessageBox::error(NULL, str);
}
else if (!str.isEmpty()) {
@@ -557,12 +557,12 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) {
} else if (!connectionPassword.isEmpty()) {
myDebug( << "sending cpass" << endl);
connectionAuth.password = connectionPassword+"\n";
- connectionPassword = TQString::null;
+ connectionPassword = TQString();
writeChild(connectionAuth.password.latin1(),connectionAuth.password.length());
} else {
myDebug( << "sending mpass" << endl);
connectionAuth.prompt = thisFn+buf;
- connectionAuth.password = TQString::null; // don't prefill
+ connectionAuth.password = TQString(); // don't prefill
TQCString thispass;
if (KPasswordDialog::getPassword (thispass, i18n("Remote authorization required") + TQString("\n") + i18n("Please input") + TQString(" ") + TQString(buf), NULL) != 1) {
shutdownConnection(true, false);
@@ -575,7 +575,7 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) {
myDebug( << "sending pass" << endl);
writeChild(connectionAuth.password.latin1(),connectionAuth.password.length());
}
- thisFn = TQString::null;
+ thisFn = TQString();
return 0;
}
else if (buf.endsWith("?")) {
@@ -585,25 +585,25 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) {
} else {
writeChild("no\n",3);
}
- thisFn = TQString::null;
+ thisFn = TQString();
return 0;
}
if (m_progressDialogExists == true) {
- if (str.contains("exit()") && str.contains("ICE default IO")) {
+ if (str.tqcontains("exit()") && str.tqcontains("ICE default IO")) {
if (m_progressDialogExists == true) {
m_progressDialog->progressBar()->setValue(m_progressDialog->progressBar()->totalSteps());
}
}
else {
- if (str.contains(", to-check=")) {
+ if (str.tqcontains(", to-check=")) {
// Parse the to-check output
TQString tocheck_out_cur;
TQString tocheck_out_tot;
- tocheck_out_cur = str.mid(str.find(", to-check=") + 11, str.length());
- tocheck_out_tot = tocheck_out_cur.mid(tocheck_out_cur.find("/") + 1, tocheck_out_cur.length());
- tocheck_out_cur = tocheck_out_cur.left(tocheck_out_cur.find("/"));
- tocheck_out_tot = tocheck_out_tot.left(tocheck_out_tot.find(")"));
+ tocheck_out_cur = str.mid(str.tqfind(", to-check=") + 11, str.length());
+ tocheck_out_tot = tocheck_out_cur.mid(tocheck_out_cur.tqfind("/") + 1, tocheck_out_cur.length());
+ tocheck_out_cur = tocheck_out_cur.left(tocheck_out_cur.tqfind("/"));
+ tocheck_out_tot = tocheck_out_tot.left(tocheck_out_tot.tqfind(")"));
m_progressDialog->progressBar()->setTotalSteps(tocheck_out_tot.toInt()-1);
m_progressDialog->progressBar()->setValue(tocheck_out_tot.toInt()-tocheck_out_cur.toInt()-2);
}
@@ -629,17 +629,17 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len,
buf.truncate(buf.length()-1);
myDebug( << "establishing: got " << buf << endl);
- while (childPid && (((pos = buf.find('\n')) >= 0) || buf.endsWith(":") || buf.endsWith("?") || buf.endsWith("]"))) {
+ while (childPid && (((pos = buf.tqfind('\n')) >= 0) || buf.endsWith(":") || buf.endsWith("?") || buf.endsWith("]"))) {
if (m_progressDialogExists == true) {
- qApp->processEvents();
+ tqApp->processEvents();
}
pos++;
TQString str = buf.left(pos);
buf = buf.mid(pos);
if (str == "\n")
continue;
- //if (str.contains("rsync error:")) {
- if (str.contains("rsync:") || str.contains("failed.") || (str.contains("Could not") && str.endsWith("."))) {
+ //if (str.tqcontains("rsync error:")) {
+ if (str.tqcontains("rsync:") || str.tqcontains("failed.") || (str.tqcontains("Could not") && str.endsWith("."))) {
KMessageBox::error(NULL, str);
}
else if (!str.isEmpty()) {
@@ -664,12 +664,12 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len,
} else if (!connectionPassword.isEmpty()) {
myDebug( << "sending cpass" << endl);
connectionAuth.password = connectionPassword+"\n";
- connectionPassword = TQString::null;
+ connectionPassword = TQString();
writeChild(connectionAuth.password.latin1(),connectionAuth.password.length());
} else {
myDebug( << "sending mpass" << endl);
connectionAuth.prompt = thisFn+buf;
- connectionAuth.password = TQString::null; // don't prefill
+ connectionAuth.password = TQString(); // don't prefill
TQCString thispass;
if (KPasswordDialog::getPassword (thispass, i18n("Remote authorization required") + TQString("\n") + i18n("Please input") + TQString(" ") + TQString(buf), NULL) != 1) {
slotUnisonCancelled();
@@ -682,11 +682,11 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len,
myDebug( << "sending pass" << endl);
writeChild(connectionAuth.password.latin1(),connectionAuth.password.length());
}
- thisFn = TQString::null;
+ thisFn = TQString();
return 0;
}
else if (buf.endsWith("?") || buf.endsWith("? []")) {
- buf.replace("[]", "");
+ buf.tqreplace("[]", "");
if (buf.endsWith("? []")) {
int rc = KMessageBox::questionYesNo(NULL, buf);
if (rc == KMessageBox::Yes) {
@@ -703,7 +703,7 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len,
writeChild("no\n",3);
}
}
- thisFn = TQString::null;
+ thisFn = TQString();
buf = "";
return 0;
}
@@ -717,11 +717,11 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len,
}
TQString file_name;
file_name = buf;
- file_name.replace("[]", "");
- file_name.replace(TQString("changed "), "");
+ file_name.tqreplace("[]", "");
+ file_name.tqreplace(TQString("changed "), "");
//file_name = file_name.simplifyWhiteSpace();
KDialogBase *dialog= new KDialogBase(i18n("User Intervention Required"), KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, KDialogBase::Yes, KDialogBase::Cancel, NULL, "warningYesNoCancel", true, true, i18n("Use &Local File"), i18n("Use &Remote File"), i18n("&Ignore"));
- int rc = KMessageBox::createKMessageBox(dialog, TQMessageBox::Warning, TQString("<b>") + i18n("WARNING: Both the local and remote file have been modified") + TQString("</b><p>") + i18n("Local") + TQString(": ") + localfolder + TQString("/") + file_name + TQString("<br>") + i18n("Remote") + TQString(": ") + remotepath + TQString("/") + file_name + TQString("<p>") + i18n("Please select the file to duplicate (the other will be overwritten)") + TQString("<br>") + i18n("Or, select Ignore to skip synchronization of this file for now"), TQStringList(), TQString::null, NULL, 1);
+ int rc = KMessageBox::createKMessageBox(dialog, TQMessageBox::Warning, TQString("<b>") + i18n("WARNING: Both the local and remote file have been modified") + TQString("</b><p>") + i18n("Local") + TQString(": ") + localfolder + TQString("/") + file_name + TQString("<br>") + i18n("Remote") + TQString(": ") + remotepath + TQString("/") + file_name + TQString("<p>") + i18n("Please select the file to duplicate (the other will be overwritten)") + TQString("<br>") + i18n("Or, select Ignore to skip synchronization of this file for now"), TQStringList(), TQString(), NULL, 1);
if (rc == KDialogBase::Yes) {
writeChild(">\n",3);
}
@@ -735,7 +735,7 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len,
}
if (m_progressDialogExists == true) {
- if (str.contains("exit()") && str.contains("ICE default IO")) {
+ if (str.tqcontains("exit()") && str.tqcontains("ICE default IO")) {
if (m_progressDialogExists == true) {
m_progressDialog->progressBar()->setFormat("%v / %m");
m_progressDialog->progressBar()->setTotalSteps(2);
@@ -822,7 +822,7 @@ TQString RsyncPlugin::findLocalFolderByName(TQString folderurl)
{
TQString folderurl_stripped;
folderurl_stripped = folderurl;
- folderurl_stripped.replace(TQString("file://"), TQString(""));
+ folderurl_stripped.tqreplace(TQString("file://"), TQString(""));
for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) {
if (TQString::compare((*i), folderurl_stripped) == 0) {
i++;
@@ -841,7 +841,7 @@ TQString RsyncPlugin::findSyncMethodByName(TQString folderurl)
{
TQString folderurl_stripped;
folderurl_stripped = folderurl;
- folderurl_stripped.replace(TQString("file://"), TQString(""));
+ folderurl_stripped.tqreplace(TQString("file://"), TQString(""));
for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) {
if (TQString::compare((*i), folderurl_stripped) == 0) {
i++;
@@ -860,7 +860,7 @@ TQString RsyncPlugin::findLoginSyncEnabledByName(TQString folderurl)
{
TQString folderurl_stripped;
folderurl_stripped = folderurl;
- folderurl_stripped.replace(TQString("file://"), TQString(""));
+ folderurl_stripped.tqreplace(TQString("file://"), TQString(""));
for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) {
if (TQString::compare((*i), folderurl_stripped) == 0) {
i++;
@@ -879,7 +879,7 @@ TQString RsyncPlugin::findLogoutSyncEnabledByName(TQString folderurl)
{
TQString folderurl_stripped;
folderurl_stripped = folderurl;
- folderurl_stripped.replace(TQString("file://"), TQString(""));
+ folderurl_stripped.tqreplace(TQString("file://"), TQString(""));
for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) {
if (TQString::compare((*i), folderurl_stripped) == 0) {
i++;
@@ -898,7 +898,7 @@ TQString RsyncPlugin::findTimedSyncEnabledByName(TQString folderurl)
{
TQString folderurl_stripped;
folderurl_stripped = folderurl;
- folderurl_stripped.replace(TQString("file://"), TQString(""));
+ folderurl_stripped.tqreplace(TQString("file://"), TQString(""));
for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) {
if (TQString::compare((*i), folderurl_stripped) == 0) {
i++;
@@ -917,7 +917,7 @@ int RsyncPlugin::deleteLocalFolderByName(TQString folderurl)
{
TQString folderurl_stripped;
folderurl_stripped = folderurl;
- folderurl_stripped.replace(TQString("file://"), TQString(""));
+ folderurl_stripped.tqreplace(TQString("file://"), TQString(""));
for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) {
if (TQString::compare((*i), folderurl_stripped) == 0) {
i=cfgfolderlist.remove(i);
@@ -937,7 +937,7 @@ int RsyncPlugin::addLocalFolderByName(TQString folderurl, TQString remoteurl, TQ
{
TQString folderurl_stripped;
folderurl_stripped = folderurl;
- folderurl_stripped.replace(TQString("file://"), TQString(""));
+ folderurl_stripped.tqreplace(TQString("file://"), TQString(""));
cfgfolderlist.append(folderurl);
cfgfolderlist.append(remoteurl);
cfgfolderlist.append(syncmethod);
diff --git a/konq-plugins/rsync/rsyncplugin.h b/konq-plugins/rsync/rsyncplugin.h
index 0adbfc0..6c58d0d 100644
--- a/konq-plugins/rsync/rsyncplugin.h
+++ b/konq-plugins/rsync/rsyncplugin.h
@@ -48,10 +48,11 @@ namespace KParts
class RsyncPlugin : public KParts::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- RsyncPlugin (TQObject* parent, const char* name, const TQStringList &);
+ RsyncPlugin (TQObject* tqparent, const char* name, const TQStringList &);
virtual ~RsyncPlugin();
protected:
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index b8cd24c..b4cf210 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -57,9 +57,9 @@ K_EXPORT_COMPONENT_FACTORY(libsearchbarplugin,
SearchBarPluginFactory("searchbarplugin"))
-SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name,
+SearchBarPlugin::SearchBarPlugin(TQObject *tqparent, const char *name,
const TQStringList &) :
- KParts::Plugin(parent, name),
+ KParts::Plugin(tqparent, name),
m_searchCombo(0),
m_searchMode(UseSearchProvider),
m_urlEnterLock(false),
@@ -94,7 +94,7 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name,
configurationChanged();
- KParts::MainWindow *mainWin = static_cast<KParts::MainWindow*>(parent);
+ KParts::MainWindow *mainWin = static_cast<KParts::MainWindow*>(TQT_TQWIDGET(tqparent));
//Grab the part manager. Don't know of any other way, and neither does Tronical, so..
KParts::PartManager *partMan = static_cast<KParts::PartManager*>(mainWin->child(0, "KParts::PartManager"));
@@ -132,13 +132,13 @@ TQChar delimiter()
bool SearchBarPlugin::eventFilter(TQObject *o, TQEvent *e)
{
- if( o==m_searchCombo->lineEdit() && e->type() == TQEvent::KeyPress )
+ if( TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(m_searchCombo->lineEdit()) && e->type() == TQEvent::KeyPress )
{
TQKeyEvent *k = (TQKeyEvent *)e;
TQString text = k->text();
if(!text.isEmpty())
{
- if(k->key() != Qt::Key_Return && k->key() != Key_Enter && k->key() != Key_Escape)
+ if(k->key() != TQt::Key_Return && k->key() != Key_Enter && k->key() != Key_Escape)
{
emit gsCompleteDelayed();
}
@@ -162,7 +162,7 @@ bool SearchBarPlugin::eventFilter(TQObject *o, TQEvent *e)
{
if(m_searchCombo->listBox()->isVisible())
{
- qApp->sendEvent(m_searchCombo->listBox(), e);
+ tqApp->sendEvent(m_searchCombo->listBox(), e);
return true;
}
}
@@ -174,7 +174,7 @@ bool SearchBarPlugin::eventFilter(TQObject *o, TQEvent *e)
the listbox was visible.
if(m_searchCombo->listBox()->isVisible())
{
- qApp->sendEvent(m_searchCombo->listBox(),e);
+ tqApp->sendEvent(m_searchCombo->listBox(),e);
}*/
}
if (k->key() == Key_Escape)
@@ -206,7 +206,7 @@ void SearchBarPlugin::nextSearchEntry()
}
else
{
- TQStringList::ConstIterator it = m_searchEngines.find(m_currentEngine);
+ TQStringList::ConstIterator it = m_searchEngines.tqfind(m_currentEngine);
it++;
if(it==m_searchEngines.end())
{
@@ -236,7 +236,7 @@ void SearchBarPlugin::previousSearchEntry()
}
else
{
- TQStringList::ConstIterator it = m_searchEngines.find(m_currentEngine);
+ TQStringList::ConstIterator it = m_searchEngines.tqfind(m_currentEngine);
if(it==m_searchEngines.begin())
{
m_searchMode = FindInThisPage;
@@ -273,7 +273,7 @@ void SearchBarPlugin::startSearch(const TQString &_search)
TQStringList list;
list << "kurisearchfilter" << "kuriikwsfilter";
- service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(m_currentEngine));
+ service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(m_currentEngine));
if (service) {
const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter();
data.setData( searchProviderPrefix + search );
@@ -281,11 +281,11 @@ void SearchBarPlugin::startSearch(const TQString &_search)
if(!service || !KURIFilter::self()->filterURI(data, list))
{
- data.setData( TQString::fromLatin1( "google" ) + delimiter() + search );
+ data.setData( TQString::tqfromLatin1( "google" ) + delimiter() + search );
KURIFilter::self()->filterURI( data, list );
}
- if(KApplication::keyboardMouseState() & Qt::ControlButton)
+ if(KApplication::keyboardMouseState() & TQt::ControlButton)
{
KParts::URLArgs args;
args.setNewTab(true);
@@ -318,7 +318,7 @@ void SearchBarPlugin::setIcon()
TQString hinttext;
if(m_searchMode == FindInThisPage)
{
- m_searchIcon = SmallIcon("find");
+ m_searchIcon = SmallIcon("tqfind");
hinttext = i18n("Find in This Page");
}
else
@@ -329,7 +329,7 @@ void SearchBarPlugin::setIcon()
TQStringList list;
list << "kurisearchfilter" << "kuriikwsfilter";
- service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(m_currentEngine));
+ service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(m_currentEngine));
if (service) {
const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter();
data.setData( searchProviderPrefix + "some keyword" );
@@ -353,7 +353,7 @@ void SearchBarPlugin::setIcon()
m_searchIcon = SmallIcon("google");
providername = "Google";
}
- hinttext = i18n("%1 Search").arg(providername);;
+ hinttext = i18n("%1 Search").tqarg(providername);;
}
static_cast<KLineEdit*>(m_searchCombo->lineEdit())->setClickMessage(hinttext);
@@ -363,8 +363,8 @@ void SearchBarPlugin::setIcon()
TQPainter p( &arrowmap );
p.drawPixmap(0, 2, m_searchIcon);
TQStyle::SFlags arrowFlags = TQStyle::Style_Default;
- m_searchCombo->style().drawPrimitive(TQStyle::PE_ArrowDown, &p, TQRect(arrowmap.width()-6,
- arrowmap.height()-6, 6, 5), m_searchCombo->colorGroup(), arrowFlags, TQStyleOption() );
+ m_searchCombo->tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, &p, TQRect(arrowmap.width()-6,
+ arrowmap.height()-6, 6, 5), m_searchCombo->tqcolorGroup(), arrowFlags, TQStyleOption() );
p.end();
m_searchIcon = arrowmap;
@@ -382,14 +382,14 @@ void SearchBarPlugin::showSelectionMenu()
list << "kurisearchfilter" << "kuriikwsfilter";
m_popupMenu = new TQPopupMenu(m_searchCombo, "search selection menu");
- m_popupMenu->insertItem(SmallIcon("find"), i18n("Find in This Page"), this, TQT_SLOT(useFindInThisPage()), 0, 999);
+ m_popupMenu->insertItem(SmallIcon("tqfind"), i18n("Find in This Page"), this, TQT_SLOT(useFindInThisPage()), 0, 999);
m_popupMenu->insertSeparator();
int i=-1;
for (TQStringList::ConstIterator it = m_searchEngines.begin(); it != m_searchEngines.end(); ++it )
{
i++;
- service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(*it));
+ service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(*it));
if(!service)
{
continue;
@@ -413,7 +413,7 @@ void SearchBarPlugin::showSelectionMenu()
}
m_popupMenu->insertSeparator();
- m_googleMenu = new KSelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, this, TQT_SLOT(selectGoogleSuggestMode()), m_popupMenu);
+ m_googleMenu = new KSelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, TQT_TQOBJECT(this), TQT_SLOT(selectGoogleSuggestMode()), TQT_TQOBJECT(m_popupMenu));
TQStringList google_modes;
google_modes << i18n("For Google Only") << i18n("For All Searches") << i18n("Never");
m_googleMenu->setItems(google_modes);
@@ -515,7 +515,7 @@ void SearchBarPlugin::configurationChanged()
void SearchBarPlugin::partChanged(KParts::Part *newPart)
{
- m_part = ::qt_cast<KHTMLPart*>(newPart);
+ m_part = ::tqqt_cast<KHTMLPart*>(newPart);
//Delay since when destroying tabs part 0 gets activated for a bit, before the proper part
TQTimer::singleShot(0, this, TQT_SLOT(updateComboVisibility()));
@@ -537,13 +537,17 @@ void SearchBarPlugin::updateComboVisibility()
void SearchBarPlugin::focusSearchbar()
{
+#ifdef USE_QT4
+ m_searchCombo->setFocus();
+#else // USE_QT4
TQFocusEvent::setReason( TQFocusEvent::Shortcut );
m_searchCombo->setFocus();
TQFocusEvent::resetReason();
+#endif // USE_QT4
}
-SearchBarCombo::SearchBarCombo(TQWidget *parent, const char *name) :
- KHistoryCombo(parent, name),
+SearchBarCombo::SearchBarCombo(TQWidget *tqparent, const char *name) :
+ KHistoryCombo(tqparent, name),
m_pluginActive(true)
{
connect(this, TQT_SIGNAL(cleared()), TQT_SLOT(historyCleared()));
@@ -586,7 +590,7 @@ int SearchBarCombo::findHistoryItem(const TQString &searchText)
void SearchBarCombo::mousePressEvent(TQMouseEvent *e)
{
- int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
+ int x0 = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
if(e->x() > x0 + 2 && e->x() < lineEdit()->x())
{
@@ -677,12 +681,12 @@ void SearchBarPlugin::gsJobFinished(KIO::Job* job)
if (((KIO::TransferJob*)job)->error() == 0)
{
TQString temp;
- temp = m_gsData.mid(m_gsData.find('(') + 1, m_gsData.findRev(')') - m_gsData.find('(') - 1);
- temp = temp.mid(temp.find('(') + 1, temp.find(')') - temp.find('(') - 1);
+ temp = m_gsData.mid(m_gsData.tqfind('(') + 1, m_gsData.tqfindRev(')') - m_gsData.tqfind('(') - 1);
+ temp = temp.mid(temp.tqfind('(') + 1, temp.tqfind(')') - temp.tqfind('(') - 1);
temp.remove('"');
TQStringList compList1 = TQStringList::split(',', temp);
- temp = m_gsData.mid(m_gsData.find(')') + 1, m_gsData.findRev(')') - m_gsData.find('(') - 1);
- temp = temp.mid(temp.find('(') + 1, temp.find(')') - temp.find('(') - 1);
+ temp = m_gsData.mid(m_gsData.tqfind(')') + 1, m_gsData.tqfindRev(')') - m_gsData.tqfind('(') - 1);
+ temp = temp.mid(temp.tqfind('(') + 1, temp.tqfind(')') - temp.tqfind('(') - 1);
temp.remove('"');
temp.remove(',');
temp.remove('s');
@@ -719,7 +723,7 @@ void SearchBarPlugin::gsSetCompletedText(const TQString& text)
currentText = m_searchCombo->currentText();
if (currentText == text.left(currentText.length()))
{
- m_searchCombo->lineEdit()->setText(text.left(text.find('(') - 1));
+ m_searchCombo->lineEdit()->setText(text.left(text.tqfind('(') - 1));
m_searchCombo->lineEdit()->setCursorPosition(currentText.length());
m_searchCombo->lineEdit()->setSelection(currentText.length(), m_searchCombo->currentText().length() - currentText.length());
}
diff --git a/konq-plugins/searchbar/searchbar.h b/konq-plugins/searchbar/searchbar.h
index b97f82c..3f032ed 100644
--- a/konq-plugins/searchbar/searchbar.h
+++ b/konq-plugins/searchbar/searchbar.h
@@ -42,12 +42,13 @@ class TQTimer;
class SearchBarCombo : public KHistoryCombo
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Constructor.
*/
- SearchBarCombo(TQWidget *parent, const char *name);
+ SearchBarCombo(TQWidget *tqparent, const char *name);
/**
* Returns the icon currently displayed in the combo box.
@@ -106,12 +107,13 @@ class SearchBarCombo : public KHistoryCombo
class SearchBarPlugin : public KParts::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
/** Possible search modes */
enum SearchModes { FindInThisPage = 0, UseSearchProvider };
- SearchBarPlugin(TQObject *parent, const char *name,
+ SearchBarPlugin(TQObject *tqparent, const char *name,
const TQStringList &);
virtual ~SearchBarPlugin();
diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
index 5e3b0b3..21dbcaf 100644
--- a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
+++ b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
@@ -24,8 +24,8 @@
#include <kglobal.h>
#include <klocale.h>
-BookmarkListItem::BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time )
- : KListViewItem( parent ), m_desc( desc )
+BookmarkListItem::BookmarkListItem( TQListView *tqparent, const TQString & url, const TQString & desc, time_t time )
+ : KListViewItem( tqparent ), m_desc( desc )
{
m_url = KURL::fromPathOrURL( url );
m_dateTime.setTime_t( time );
@@ -53,7 +53,7 @@ TQString BookmarkListItem::text( int column ) const
else if ( column == 1 )
return KGlobal::locale()->formatDateTime( m_dateTime );
- return TQString::null;
+ return TQString();
}
KURL BookmarkListItem::url() const
diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.h b/konq-plugins/sidebar/delicious/bookmarkListItem.h
index 5b4c8c7..3e37ea4 100644
--- a/konq-plugins/sidebar/delicious/bookmarkListItem.h
+++ b/konq-plugins/sidebar/delicious/bookmarkListItem.h
@@ -34,7 +34,7 @@ class TQString;
class BookmarkListItem: public KListViewItem
{
public:
- BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time );
+ BookmarkListItem( TQListView *tqparent, const TQString & url, const TQString & desc, time_t time );
KURL url() const;
TQDateTime date() const;
TQString desc() const;
diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp
index 612be03..929ded4 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.cpp
+++ b/konq-plugins/sidebar/delicious/mainWidget.cpp
@@ -42,8 +42,8 @@
#include <kconfig.h>
#include <kinputdialog.h>
-MainWidget::MainWidget( KConfig * config, TQWidget * parent )
- : MainWidget_base( parent ), m_config( config )
+MainWidget::MainWidget( KConfig * config, TQWidget * tqparent )
+ : MainWidget_base( tqparent ), m_config( config )
{
loadTags();
@@ -302,7 +302,7 @@ void MainWidget::slotRenameTag()
if ( tag )
{
TQString oldName = tag->name();
- TQString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).arg( oldName ) );
+ TQString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).tqarg( oldName ) );
if ( !newName.isEmpty() )
{
KURL url( "http://del.icio.us/api/tags/rename" );
@@ -334,7 +334,7 @@ void MainWidget::slotDeleteBookmark()
BookmarkListItem * bookmark = static_cast<BookmarkListItem *>( lvBookmarks->currentItem() );
if ( bookmark )
{
- int result = KMessageBox::warningContinueCancel( this, i18n( "Do you really want to remove the bookmark\n%1?" ).arg( bookmark->desc() ),
+ int result = KMessageBox::warningContinueCancel( this, i18n( "Do you really want to remove the bookmark\n%1?" ).tqarg( bookmark->desc() ),
i18n( "Delete Bookmark" ), KStdGuiItem::del() );
if ( result == KMessageBox::Continue )
diff --git a/konq-plugins/sidebar/delicious/mainWidget.h b/konq-plugins/sidebar/delicious/mainWidget.h
index 15920cd..e77cfc5 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.h
+++ b/konq-plugins/sidebar/delicious/mainWidget.h
@@ -38,8 +38,9 @@ class KConfig;
class MainWidget: public MainWidget_base
{
Q_OBJECT
+ TQ_OBJECT
public:
- MainWidget( KConfig * config, TQWidget * parent );
+ MainWidget( KConfig * config, TQWidget * tqparent );
~MainWidget();
/**
diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp
index 3ed6c09..23244b7 100644
--- a/konq-plugins/sidebar/delicious/plugin.cpp
+++ b/konq-plugins/sidebar/delicious/plugin.cpp
@@ -27,10 +27,10 @@
#include <klocale.h>
#include <kglobal.h>
-KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, TQObject *parent,
+KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, TQObject *tqparent,
TQWidget *widgetParent, TQString &desktopName_,
const char* name )
- : KonqSidebarPlugin( instance, parent, widgetParent, desktopName_, name ),
+ : KonqSidebarPlugin( instance, tqparent, widgetParent, desktopName_, name ),
DCOPObject( "sidebar-delicious" )
{
diff --git a/konq-plugins/sidebar/delicious/plugin.h b/konq-plugins/sidebar/delicious/plugin.h
index cd9f87a..4e220da 100644
--- a/konq-plugins/sidebar/delicious/plugin.h
+++ b/konq-plugins/sidebar/delicious/plugin.h
@@ -40,9 +40,10 @@ class TQString;
class KonqSidebarDelicious: public KonqSidebarPlugin, DCOPObject
{
Q_OBJECT
+// TQ_OBJECT
K_DCOP
public:
- KonqSidebarDelicious( KInstance * instance, TQObject * parent, TQWidget * widgetParent,
+ KonqSidebarDelicious( KInstance * instance, TQObject * tqparent, TQWidget * widgetParent,
TQString & desktopName_, const char * name = 0 );
~KonqSidebarDelicious();
virtual void * provides( const TQString & );
diff --git a/konq-plugins/sidebar/delicious/tagListItem.cpp b/konq-plugins/sidebar/delicious/tagListItem.cpp
index e7396a6..a8b98cd 100644
--- a/konq-plugins/sidebar/delicious/tagListItem.cpp
+++ b/konq-plugins/sidebar/delicious/tagListItem.cpp
@@ -21,8 +21,8 @@
#include "tagListItem.h"
-TagListItem::TagListItem( TQListView * parent, const TQString & tagName, int count )
- : TQCheckListItem( parent, tagName, TQCheckListItem::CheckBox ), m_name( tagName ), m_count( count )
+TagListItem::TagListItem( TQListView * tqparent, const TQString & tagName, int count )
+ : TQCheckListItem( tqparent, tagName, TQCheckListItem::CheckBox ), m_name( tagName ), m_count( count )
{
}
@@ -62,7 +62,7 @@ TQString TagListItem::text( int column ) const
else if ( column == 1 )
return TQString::number( m_count );
else
- return TQString::null;
+ return TQString();
}
TQString TagListItem::name() const
diff --git a/konq-plugins/sidebar/delicious/tagListItem.h b/konq-plugins/sidebar/delicious/tagListItem.h
index fe557de..f60e0b4 100644
--- a/konq-plugins/sidebar/delicious/tagListItem.h
+++ b/konq-plugins/sidebar/delicious/tagListItem.h
@@ -25,11 +25,12 @@
#include <tqobject.h>
#include <tqlistview.h>
-class TagListItem: public TQObject, public QCheckListItem
+class TagListItem: public TQObject, public TQCheckListItem
{
Q_OBJECT
+ TQ_OBJECT
public:
- TagListItem( TQListView * parent, const TQString & tagName, int count = 1 );
+ TagListItem( TQListView * tqparent, const TQString & tagName, int count = 1 );
int count() const;
TQString name() const;
void setName( const TQString & name );
diff --git a/konq-plugins/sidebar/delicious/widget.ui b/konq-plugins/sidebar/delicious/widget.ui
index daccbe9..e7a82af 100644
--- a/konq-plugins/sidebar/delicious/widget.ui
+++ b/konq-plugins/sidebar/delicious/widget.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>MainWidget_base</class>
<author>Lukáš Tinkl &lt;lukas@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>Form1</cstring>
</property>
@@ -17,14 +17,14 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QSplitter">
+ <widget class="TQSplitter">
<property name="name">
<cstring>splitter3</cstring>
</property>
<property name="orientation">
<enum>Vertical</enum>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox2</cstring>
</property>
@@ -35,7 +35,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>btnRefreshTags</cstring>
</property>
@@ -46,7 +46,7 @@
<string>Refresh the list of tags</string>
</property>
</widget>
- <widget class="QListView">
+ <widget class="TQListView">
<column>
<property name="text">
<string>Tag</string>
@@ -81,7 +81,7 @@
</widget>
</vbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox1</cstring>
</property>
@@ -92,7 +92,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton" row="1" column="0">
+ <widget class="TQPushButton" row="1" column="0">
<property name="name">
<cstring>btnRefreshBookmarks</cstring>
</property>
@@ -103,7 +103,7 @@
<string>Refresh the list of bookmarks according to the selected tags</string>
</property>
</widget>
- <widget class="QPushButton" row="1" column="1">
+ <widget class="TQPushButton" row="1" column="1">
<property name="name">
<cstring>btnNew</cstring>
</property>
@@ -158,7 +158,7 @@
</widget>
</vbox>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>
diff --git a/konq-plugins/sidebar/mediaplayer/controls.cpp b/konq-plugins/sidebar/mediaplayer/controls.cpp
index 6c3be21..63d91ac 100644
--- a/konq-plugins/sidebar/mediaplayer/controls.cpp
+++ b/konq-plugins/sidebar/mediaplayer/controls.cpp
@@ -23,15 +23,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "controls.h"
-L33tSlider::L33tSlider(TQWidget * parent, const char * name) :
- TQSlider(parent,name), pressed(false)
+L33tSlider::L33tSlider(TQWidget * tqparent, const char * name) :
+ TQSlider(tqparent,name), pressed(false)
{}
-L33tSlider::L33tSlider(Orientation o, TQWidget * parent, const char * name) :
- TQSlider(o,parent,name), pressed(false)
+L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * tqparent, const char * name) :
+ TQSlider(o,tqparent,name), pressed(false)
{}
L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value,
- Orientation o, TQWidget * parent, const char * name) :
- TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false)
+ Qt::Orientation o, TQWidget * tqparent, const char * name) :
+ TQSlider(minValue, maxValue, pageStep, value, o, tqparent,name), pressed(false)
{}
bool L33tSlider::currentlyPressed() const
@@ -47,7 +47,7 @@ void L33tSlider::setValue(int i)
void L33tSlider::mousePressEvent(TQMouseEvent*e)
{
- if (e->button()!=RightButton)
+ if (e->button()!=Qt::RightButton)
{
pressed=true;
TQSlider::mousePressEvent(e);
@@ -76,8 +76,8 @@ void L33tSlider::wheelEvent(TQWheelEvent *e)
}
SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver,
- const char *member, TQObject* parent, const char* name )
- : KAction( text, accel, parent, name )
+ const char *member, TQObject* tqparent, const char* name )
+ : KAction( text, accel, tqparent, name )
{
m_receiver = receiver;
m_member = member;
@@ -91,7 +91,7 @@ int SliderAction::plug( TQWidget *w, int index )
int id = KAction::getToolButtonID();
//Create it.
- m_slider=new L33tSlider(0, 1000, 100, 0, Horizontal, toolBar);
+ m_slider=new L33tSlider(0, 1000, 100, 0,Qt::Horizontal, toolBar);
m_slider->setMinimumWidth(10);
toolBar->insertWidget(id, 10, m_slider, index );
@@ -115,12 +115,12 @@ return;
/*
if (pos == KToolBar::Left || pos == KToolBar::Right)
{
- m_slider->setOrientation(Vertical);
+ m_slider->setOrientationQt::Vertical);
m_slider->setFixedWidth(m_slider->height());
}
else
{
- m_slider->setOrientation(Horizontal);
+ m_slider->setOrientationQt::Horizontal);
m_slider->resize(m_slider->height(), m_slider->height());
}
*/
diff --git a/konq-plugins/sidebar/mediaplayer/controls.h b/konq-plugins/sidebar/mediaplayer/controls.h
index 5f376dd..73a8340 100644
--- a/konq-plugins/sidebar/mediaplayer/controls.h
+++ b/konq-plugins/sidebar/mediaplayer/controls.h
@@ -38,14 +38,15 @@ class TQLabel;
* A slider that can be moved around while being
* changed internally
**/
-class L33tSlider : public QSlider
+class L33tSlider : public TQSlider
{
Q_OBJECT
+ TQ_OBJECT
public:
- L33tSlider(TQWidget * parent, const char * name=0);
- L33tSlider(Orientation, TQWidget * parent, const char * name=0);
+ L33tSlider(TQWidget * tqparent, const char * name=0);
+ L33tSlider(Qt::Orientation, TQWidget * tqparent, const char * name=0);
L33tSlider(int minValue, int maxValue, int pageStep, int value,
- Orientation, TQWidget * parent, const char * name=0);
+ Qt::Orientation, TQWidget * tqparent, const char * name=0);
bool currentlyPressed() const;
signals:
@@ -71,9 +72,10 @@ private:
class SliderAction : public KAction
{
Q_OBJECT
+ TQ_OBJECT
public:
SliderAction(const TQString& text, int accel, const TQObject *receiver,
- const char *member, TQObject* parent, const char* name );
+ const char *member, TQObject* tqparent, const char* name );
virtual int plug( TQWidget *w, int index = -1 );
virtual void unplug( TQWidget *w );
TQSlider* slider() const { return m_slider; }
diff --git a/konq-plugins/sidebar/mediaplayer/engine.cpp b/konq-plugins/sidebar/mediaplayer/engine.cpp
index e4590b6..8f01888 100644
--- a/konq-plugins/sidebar/mediaplayer/engine.cpp
+++ b/konq-plugins/sidebar/mediaplayer/engine.cpp
@@ -71,8 +71,8 @@ public:
KURL file;
};
-Engine::Engine(TQObject *parent)
- : TQObject(parent)
+Engine::Engine(TQObject *tqparent)
+ : TQObject(tqparent)
, d(new EnginePrivate)
{
}
diff --git a/konq-plugins/sidebar/mediaplayer/engine.h b/konq-plugins/sidebar/mediaplayer/engine.h
index 07e46f1..c1d129f 100644
--- a/konq-plugins/sidebar/mediaplayer/engine.h
+++ b/konq-plugins/sidebar/mediaplayer/engine.h
@@ -40,12 +40,13 @@ class SoundServerV2;
* Does almost everything related to multimedia.
* Most interfacing should be done with Player
**/
-class Engine : public QObject
+class Engine : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- Engine(TQObject *parent=0);
+ Engine(TQObject *tqparent=0);
~Engine();
Arts::PlayObject playObject() const;
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
index 2de09af..8ea041f 100644
--- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
+++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
@@ -27,8 +27,8 @@
#include <kdemacros.h>
#include "mediawidget.h"
-KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name):
- KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name)
+KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName_, const char* name):
+ KonqSidebarPlugin(instance,tqparent,widgetParent,desktopName_,name)
{
widget=new KSB_MediaWidget(widgetParent);
}
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.h b/konq-plugins/sidebar/mediaplayer/mediaplayer.h
index 0e74248..2213ef2 100644
--- a/konq-plugins/sidebar/mediaplayer/mediaplayer.h
+++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.h
@@ -27,8 +27,9 @@ class KSB_MediaWidget;
class KonqSidebar_MediaPlayer: public KonqSidebarPlugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0);
+ KonqSidebar_MediaPlayer(KInstance *instance,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0);
~KonqSidebar_MediaPlayer();
virtual void *provides(const TQString &);
void emitStatusBarText (const TQString &);
diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp
index ac37e9c..a95ae83 100644
--- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp
+++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp
@@ -32,9 +32,9 @@
#include <tqslider.h>
#include <tqtooltip.h>
-KSB_MediaWidget::KSB_MediaWidget(TQWidget *parent):KSB_MediaWidget_skel(parent)
+KSB_MediaWidget::KSB_MediaWidget(TQWidget *tqparent):KSB_MediaWidget_skel(tqparent)
{
- player = new Player(this);
+ player = new Player(TQT_TQOBJECT(this));
empty();
TQFont labelFont = time->font();
@@ -100,7 +100,7 @@ void KSB_MediaWidget::playerTimeout()
Position->setRange(0, range);
if (needLengthUpdate)
{
- int counter = player->lengthString().length() - (player->lengthString().find("/")+1);
+ int counter = player->lengthString().length() - (player->lengthString().tqfind("/")+1);
TQString length=player->lengthString().right(counter);
needLengthUpdate=false;
}
diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.h b/konq-plugins/sidebar/mediaplayer/mediawidget.h
index 69fa0f2..8e106a8 100644
--- a/konq-plugins/sidebar/mediaplayer/mediawidget.h
+++ b/konq-plugins/sidebar/mediaplayer/mediawidget.h
@@ -24,8 +24,9 @@
class KSB_MediaWidget: public KSB_MediaWidget_skel
{
Q_OBJECT
+ TQ_OBJECT
public:
- KSB_MediaWidget(TQWidget *parent);
+ KSB_MediaWidget(TQWidget *tqparent);
~KSB_MediaWidget(){;}
private:
diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui b/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui
index 8780a72..129f737 100644
--- a/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui
+++ b/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>KSB_MediaWidget_skel</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KSB_MediaWidget_skel</cstring>
</property>
@@ -12,9 +12,9 @@
<height>151</height>
</rect>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<vbox>
<property name="name">
@@ -26,11 +26,11 @@
<property name="spacing">
<number>0</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout6</cstring>
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<hbox>
<property name="name">
@@ -52,14 +52,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>Play</cstring>
</property>
@@ -71,7 +71,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -84,11 +84,11 @@
<pixmap>image0</pixmap>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>Pause</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -101,11 +101,11 @@
<pixmap>image1</pixmap>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>Stop</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -148,7 +148,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>Frame3</cstring>
</property>
@@ -166,9 +166,9 @@
<property name="frameShadow">
<enum>Raised</enum>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<hbox>
<property name="name">
@@ -190,14 +190,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>time</cstring>
</property>
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -224,7 +224,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>Frame4</cstring>
</property>
@@ -242,9 +242,9 @@
<property name="frameShadow">
<enum>Raised</enum>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<hbox>
<property name="name">
@@ -266,14 +266,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>currentFile</cstring>
</property>
@@ -291,7 +291,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -310,7 +310,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -336,5 +336,5 @@
<includes>
<include location="global" impldecl="in declaration">controls.h</include>
</includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui b/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui
index a88dfde..50d0222 100644
--- a/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui
+++ b/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>KSB_MediaWidget_skel</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KSB_MediaWidget_skel</cstring>
</property>
@@ -12,9 +12,9 @@
<height>151</height>
</rect>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<vbox>
<property name="name">
@@ -26,11 +26,11 @@
<property name="spacing">
<number>0</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout6</cstring>
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<hbox>
<property name="name">
@@ -52,14 +52,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>Play</cstring>
</property>
@@ -71,7 +71,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -84,11 +84,11 @@
<pixmap>image0</pixmap>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>Pause</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -101,11 +101,11 @@
<pixmap>image1</pixmap>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>Stop</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -137,7 +137,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QSlider">
+ <widget class="TQSlider">
<property name="name">
<cstring>Position</cstring>
</property>
@@ -148,7 +148,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>Frame3</cstring>
</property>
@@ -166,9 +166,9 @@
<property name="frameShadow">
<enum>Raised</enum>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<hbox>
<property name="name">
@@ -190,14 +190,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>time</cstring>
</property>
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -224,7 +224,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>Frame4</cstring>
</property>
@@ -242,9 +242,9 @@
<property name="frameShadow">
<enum>Raised</enum>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<hbox>
<property name="name">
@@ -266,14 +266,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>currentFile</cstring>
</property>
@@ -291,7 +291,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -310,7 +310,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -336,5 +336,5 @@
<includes>
<include location="global" impldecl="in declaration">controls.h</include>
</includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/konq-plugins/sidebar/mediaplayer/player.cpp b/konq-plugins/sidebar/mediaplayer/player.cpp
index 741a6b6..c11b2b0 100644
--- a/konq-plugins/sidebar/mediaplayer/player.cpp
+++ b/konq-plugins/sidebar/mediaplayer/player.cpp
@@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "engine.h"
#include "player.h"
-Player::Player(TQObject *parent)
- : TQObject(parent)
+Player::Player(TQObject *tqparent)
+ : TQObject(tqparent)
, position(0)
, unfinished(false)
{
diff --git a/konq-plugins/sidebar/mediaplayer/player.h b/konq-plugins/sidebar/mediaplayer/player.h
index c262ab6..c0a9159 100644
--- a/konq-plugins/sidebar/mediaplayer/player.h
+++ b/konq-plugins/sidebar/mediaplayer/player.h
@@ -33,13 +33,14 @@ class Engine;
/**
* This class has slots for all the common media player buttons
**/
-class Player : public QObject
+class Player : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
friend class KaboodlePart;
public:
- Player(TQObject *parent = 0);
+ Player(TQObject *tqparent = 0);
~Player();
/**
diff --git a/konq-plugins/sidebar/metabar/Doxyfile b/konq-plugins/sidebar/metabar/Doxyfile
index 323c79e..4dfd560 100644
--- a/konq-plugins/sidebar/metabar/Doxyfile
+++ b/konq-plugins/sidebar/metabar/Doxyfile
@@ -17,7 +17,7 @@ ABBREVIATE_BRIEF = "The $name class" \
is \
provides \
specifies \
- contains \
+ tqcontains \
represents \
a \
an \
@@ -124,7 +124,7 @@ FILE_PATTERNS = *.c \
*.tlh \
*.diff \
*.patch \
- *.moc \
+ *.tqmoc \
*.xpm \
*.dox
RECURSIVE = yes
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index 3d4850f..ebcf170 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -56,9 +56,9 @@ ActionListItem::ActionListItem(TQListBox *listbox, const TQString &action, const
setText(text);
}
-ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent, name)
+ConfigDialog::ConfigDialog(TQWidget *tqparent, const char *name) : TQDialog(tqparent, name)
{
- topWidgetName = parent->topLevelWidget()->name();
+ topWidgetName = tqparent->tqtopLevelWidget()->name();
config = new KConfig("metabarrc");
iconConfig = new KConfig(locate("data", "metabar/iconsrc"));
@@ -78,7 +78,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
TQWidget *general = new TQWidget;
TQGroupBox *entries_group = new TQGroupBox(2, Qt::Horizontal, i18n("Items"), general);
- entries_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+ entries_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
TQLabel *entries_label = new TQLabel(i18n("Open with:"), entries_group);
max_entries = new KIntSpinBox(entries_group);
@@ -98,7 +98,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
TQGroupBox *appearance_group = new TQGroupBox(1, Qt::Horizontal, i18n("Appearance"), general);
- appearance_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+ appearance_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
animate = new TQCheckBox(i18n("Animate resize"), appearance_group);
animate->setChecked(config->readBoolEntry("AnimateResize", false));
@@ -110,13 +110,13 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
showframe->setChecked(config->readBoolEntry("ShowFrame", true));
TQGroupBox *theme_group = new TQGroupBox(2, Qt::Horizontal, i18n("Themes"), general);
- theme_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+ theme_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
themes = new KComboBox(theme_group);
- themes->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred);
+ themes->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred);
install_theme = new KPushButton(i18n("Install New Theme..."), theme_group);
- install_theme->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+ install_theme->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
connect(install_theme, TQT_SIGNAL(clicked()), this, TQT_SLOT(installTheme()));
loadThemes();
@@ -144,7 +144,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
connect(link_down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkDown()));
link_list = new KListView(links);
- link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ link_list->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
link_list->setSorting(-1);
link_list->setItemsMovable(TRUE);
link_list->addColumn(i18n("Name"));
@@ -161,7 +161,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
tab->addTab(actionPage, i18n("Actions"));
tab->addTab(links, i18n("Links"));
- //layout
+ //tqlayout
TQGridLayout *general_layout = new TQGridLayout(general, 2, 2, 5, 5);
general_layout->addWidget(entries_group, 0, 0);
general_layout->addWidget(appearance_group, 0, 1);
@@ -222,7 +222,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), *it, text, SmallIcon("network"));
- TQListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, Qt::ExactMatch);
+ TQListBoxItem *avItem = actionSelector->availableListBox()->tqfindItem(text, TQt::ExactMatch);
if(avItem){
delete avItem;
}
@@ -236,7 +236,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), TQString(*it), text, SmallIcon(icon));
- TQListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, Qt::ExactMatch);
+ TQListBoxItem *avItem = actionSelector->availableListBox()->tqfindItem(text, TQt::ExactMatch);
if(avItem){
delete avItem;
}
@@ -320,7 +320,7 @@ void ConfigDialog::createLink()
TQLineEdit *url = new TQLineEdit("file:/", main);
KIconButton *icon = new KIconButton(main);
- icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+ icon->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
icon->setIconType(KIcon::Small, KIcon::Any);
icon->setStrictIconSize(true);
icon->setIcon("folder");
@@ -330,19 +330,19 @@ void ConfigDialog::createLink()
bottom_layout->addWidget(ok);
bottom_layout->addWidget(cancel);
- TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5);
- layout->addMultiCellWidget(icon, 0, 1, 0, 0);
- layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
- layout->addWidget(name, 0, 2);
- layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
- layout->addWidget(url, 1, 2);
+ TQGridLayout *tqlayout = new TQGridLayout(0, 2, 3, 0, 5);
+ tqlayout->addMultiCellWidget(icon, 0, 1, 0, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
+ tqlayout->addWidget(name, 0, 2);
+ tqlayout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
+ tqlayout->addWidget(url, 1, 2);
TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5);
- main_layout->addLayout(layout);
+ main_layout->addLayout(tqlayout);
main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
main_layout->addLayout(bottom_layout);
- main->resize(300, main->sizeHint().height());
+ main->resize(300, main->tqsizeHint().height());
if(main->exec() == TQDialog::Accepted){
TQString name_str = name->text();
@@ -403,7 +403,7 @@ void ConfigDialog::editLink(TQListViewItem *item)
TQLineEdit *url = new TQLineEdit(linkList[item]->url, main);
KIconButton *icon = new KIconButton(main);
- icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+ icon->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
icon->setIconType(KIcon::Small, KIcon::Any);
icon->setStrictIconSize(true);
icon->setIcon(linkList[item]->icon);
@@ -413,19 +413,19 @@ void ConfigDialog::editLink(TQListViewItem *item)
bottom_layout->addWidget(ok);
bottom_layout->addWidget(cancel);
- TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5);
- layout->addMultiCellWidget(icon, 0, 1, 0, 0);
- layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
- layout->addWidget(name, 0, 2);
- layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
- layout->addWidget(url, 1, 2);
+ TQGridLayout *tqlayout = new TQGridLayout(0, 2, 3, 0, 5);
+ tqlayout->addMultiCellWidget(icon, 0, 1, 0, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
+ tqlayout->addWidget(name, 0, 2);
+ tqlayout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
+ tqlayout->addWidget(url, 1, 2);
TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5);
- main_layout->addLayout(layout);
+ main_layout->addLayout(tqlayout);
main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
main_layout->addLayout(bottom_layout);
- main->resize(300, main->sizeHint().height());
+ main->resize(300, main->tqsizeHint().height());
if(main->exec() == TQDialog::Accepted){
TQString name_str = name->text();
@@ -576,7 +576,7 @@ void ConfigDialog::loadThemes()
theme_list.remove("..");
themes->insertStringList(theme_list);
- if(theme_list.find(theme) != theme_list.end()){
+ if(theme_list.tqfind(theme) != theme_list.end()){
foundTheme = true;
}
}
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h
index 94f5fee..8417d15 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.h
+++ b/konq-plugins/sidebar/metabar/src/configdialog.h
@@ -42,12 +42,13 @@ class LinkEntry{
TQString icon;
};
-class ConfigDialog : public QDialog
+class ConfigDialog : public TQDialog
{
Q_OBJECT
+ TQ_OBJECT
public:
- ConfigDialog(TQWidget *parent = 0, const char *name = 0);
+ ConfigDialog(TQWidget *tqparent = 0, const char *name = 0);
~ConfigDialog();
protected:
@@ -98,7 +99,7 @@ class ConfigDialog : public QDialog
void loadThemes();
};
-class ActionListItem : public QListBoxPixmap
+class ActionListItem : public TQListBoxPixmap
{
public:
ActionListItem(TQListBox *listbox, const TQString &action, const TQString &text, const TQPixmap &pixmap);
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index 6c3982e..5839a64 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -99,19 +99,19 @@ void DefaultPlugin::loadActions(DOM::HTMLElement node)
for(TQStringList::Iterator it = actions.begin(); it != actions.end(); ++it){
if((*it).startsWith("metabar/")){
if((*it).right((*it).length() - 8) == "share"){
- MetabarWidget::addEntry(innerHTML, i18n("Share"), "action://" + *it, "network", TQString::null, actionCount < maxActions ? TQString::null : TQString("hiddenaction"), actionCount >= maxActions);
+ MetabarWidget::addEntry(innerHTML, i18n("Share"), "action://" + *it, "network", TQString(), actionCount < maxActions ? TQString() : TQString("hiddenaction"), actionCount >= maxActions);
actionCount++;
}
}
else{
- DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8()));
+ DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->tqtopLevelWidget()->name()).append("/action/").append((*it).utf8()));
if(!action.isNull()){
if(action.call("enabled()")){
TQString text = action.call("plainText()");
TQString icon = iconConfig.readEntry(*it, action.call("icon()"));
- MetabarWidget::addEntry(innerHTML, text, "action://" + *it, icon, TQString::null, actionCount < maxActions ? TQString::null : TQString("hiddenaction"), actionCount >= maxActions);
+ MetabarWidget::addEntry(innerHTML, text, "action://" + *it, icon, TQString(), actionCount < maxActions ? TQString() : TQString("hiddenaction"), actionCount >= maxActions);
actionCount++;
}
}
@@ -156,7 +156,7 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node)
KDesktopFile desktop(url.path(), TRUE);
if(desktop.hasApplicationType ()){
- MetabarWidget::addEntry(innerHTML, i18n("Run %1").arg(desktop.readName()), "desktop://" + url.path(), desktop.readIcon());
+ MetabarWidget::addEntry(innerHTML, i18n("Run %1").tqarg(desktop.readName()), "desktop://" + url.path(), desktop.readIcon());
m_functions->show("open");
}
@@ -184,7 +184,7 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node)
nam.setNum(id);
bool hide = id >= max;
- MetabarWidget::addEntry(innerHTML, (*it)->name(), "exec://" + nam, (*it)->icon(), TQString::null, hide ? TQString("hiddenapp") : TQString::null, hide);
+ MetabarWidget::addEntry(innerHTML, (*it)->name(), "exec://" + nam, (*it)->icon(), TQString(), hide ? TQString("hiddenapp") : TQString(), hide);
runMap.insert(id, *it);
id++;
@@ -294,11 +294,11 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node)
innerHTML += "<ul class=\"info\"><b>" + i18n("Size") + ": </b>";
innerHTML += KIO::convertSize(size);
innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Files") + ": </b>";
- innerHTML += TQString().setNum(files);
+ innerHTML += TQString(TQString().setNum(files));
innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Folders") + ": </b>";
- innerHTML += TQString().setNum(dirs);
+ innerHTML += TQString(TQString().setNum(dirs));
innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Total Entries") + ": </b>";
- innerHTML += TQString().setNum(m_items.count());
+ innerHTML += TQString(TQString().setNum(m_items.count()));
innerHTML += "</ul>";
node.setInnerHTML(innerHTML);
}
@@ -364,12 +364,12 @@ void DefaultPlugin::slotSetPreview(const KFileItem *item, const TQPixmap &pix)
buffer.open(IO_WriteOnly);
pix.save(&buffer, "PNG");
- TQString src = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data));
+ TQString src = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
bool media = item->mimetype().startsWith("video/");
DOM::DOMString innerHTML;
- innerHTML += TQString("<ul style=\"height: %1px\"><a class=\"preview\"").arg(pix.height() + 15);
+ innerHTML += TQString("<ul style=\"height: %1px\"><a class=\"preview\"").tqarg(pix.height() + 15);
if(media){
innerHTML += " href=\"preview:///\"";
@@ -377,9 +377,9 @@ void DefaultPlugin::slotSetPreview(const KFileItem *item, const TQPixmap &pix)
innerHTML +="><img id=\"previewimage\" src=\"";
innerHTML += src;
innerHTML += "\" width=\"";
- innerHTML += TQString().setNum(pix.width());
+ innerHTML += TQString(TQString().setNum(pix.width()));
innerHTML += "\" height=\"";
- innerHTML += TQString().setNum(pix.height());
+ innerHTML += TQString(TQString().setNum(pix.height()));
innerHTML += "\" /></a></ul>";
if(media){
@@ -418,7 +418,7 @@ bool DefaultPlugin::handleRequest(const KURL &url)
if(protocol == "exec"){
int id = url.host().toInt();
- TQMap<int,KService::Ptr>::Iterator it = runMap.find(id);
+ TQMap<int,KService::Ptr>::Iterator it = runMap.tqfind(id);
if(it != runMap.end()){
KFileItem *item = m_items.getFirst();
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.h b/konq-plugins/sidebar/metabar/src/defaultplugin.h
index 319d771..7705728 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.h
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.h
@@ -32,6 +32,7 @@
class DefaultPlugin : public ProtocolPlugin
{
Q_OBJECT
+ TQ_OBJECT
public:
DefaultPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name = 0);
diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
index bbfb9e2..b90852d 100644
--- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
@@ -60,10 +60,10 @@ void HTTPPlugin::killJobs()
void HTTPPlugin::loadInformation(DOM::HTMLElement node)
{
/*DOM::DOMString innerHTML;
- innerHTML += "<form action=\"find:///\" method=\"GET\">";
+ innerHTML += "<form action=\"tqfind:///\" method=\"GET\">";
innerHTML += "<ul>";
innerHTML += i18n("Keyword");
- innerHTML += " <input onFocus=\"this.value = ''\" type=\"text\" name=\"find\" id=\"find_text\" value=\"";
+ innerHTML += " <input onFocus=\"this.value = ''\" type=\"text\" name=\"tqfind\" id=\"find_text\" value=\"";
innerHTML += i18n("Web search");
innerHTML += "\"></ul>";
innerHTML += "<ul><input type=\"submit\" id=\"find_button\" value=\"";
@@ -99,15 +99,15 @@ void HTTPPlugin::loadBookmarks(DOM::HTMLElement node)
bool HTTPPlugin::handleRequest(const KURL &url)
{
- if(url.protocol() == "find"){
- TQString keyword = url.queryItem("find");
+ if(url.protocol() == "tqfind"){
+ TQString keyword = url.queryItem("tqfind");
TQString type = url.queryItem("type");
if(!keyword.isNull() && !keyword.isEmpty()){
KURL url("http://www.google.com/search");
url.addQueryItem("q", keyword);
- DCOPRef ref(kapp->dcopClient()->appId(), m_html->view()->topLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), m_html->view()->tqtopLevelWidget()->name());
DCOPReply reply = ref.call("openURL", url.url());
}
diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.h b/konq-plugins/sidebar/metabar/src/httpplugin.h
index 0d7d3ab..a654816 100644
--- a/konq-plugins/sidebar/metabar/src/httpplugin.h
+++ b/konq-plugins/sidebar/metabar/src/httpplugin.h
@@ -31,6 +31,7 @@
class HTTPPlugin : public ProtocolPlugin
{
Q_OBJECT
+ TQ_OBJECT
public:
HTTPPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name = 0);
diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp
index 6a020f0..bc7d978 100644
--- a/konq-plugins/sidebar/metabar/src/metabar.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabar.cpp
@@ -7,8 +7,8 @@
#include "metabar.h"
#include "metabar.moc"
-Metabar::Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name):
- KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name)
+Metabar::Metabar(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name):
+ KonqSidebarPlugin(inst,tqparent,widgetParent,desktopName,name)
{
KImageIO::registerFormats();
KGlobal::locale()->insertCatalogue( "konqsidebar_metabar" );
diff --git a/konq-plugins/sidebar/metabar/src/metabar.h b/konq-plugins/sidebar/metabar/src/metabar.h
index d4bb63f..bb2387b 100644
--- a/konq-plugins/sidebar/metabar/src/metabar.h
+++ b/konq-plugins/sidebar/metabar/src/metabar.h
@@ -13,9 +13,10 @@
class Metabar : public KonqSidebarPlugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0);
+ Metabar(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name=0);
~Metabar();
virtual TQWidget *getWidget(){ return widget; }
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
index 1aaf9e8..d184f58 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
@@ -32,7 +32,7 @@
#define RESIZE_SPEED 5
#define RESIZE_STEP 2
-MetabarFunctions::MetabarFunctions(KHTMLPart *html, TQObject *parent, const char* name) : TQObject(parent, name), m_html(html)
+MetabarFunctions::MetabarFunctions(KHTMLPart *html, TQObject *tqparent, const char* name) : TQObject(tqparent, name), m_html(html)
{
timer = new TQTimer(this);
connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate()));
@@ -81,7 +81,7 @@ void MetabarFunctions::toggle(DOM::DOMString item)
DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
if(!node.isNull()){
- DOM::NodeList children = node.childNodes();
+ DOM::NodeList tqchildren = node.childNodes();
DOM::CSSStyleDeclaration style = node.style();
DOM::DOMString expanded = node.getAttribute("expanded");
@@ -106,7 +106,7 @@ void MetabarFunctions::toggle(DOM::DOMString item)
}
}
else{
- style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY);
+ style.setProperty("height", TQString("%1px").tqarg(height), CSS_PRIORITY);
}
}
}
@@ -117,7 +117,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item)
DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
if(!node.isNull()){
- DOM::NodeList children = node.childNodes();
+ DOM::NodeList tqchildren = node.childNodes();
DOM::CSSStyleDeclaration style = node.style();
DOM::DOMString expanded = node.getAttribute("expanded");
@@ -137,7 +137,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item)
}
}
else{
- style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY);
+ style.setProperty("height", TQString("%1px").tqarg(height), CSS_PRIORITY);
}
}
}
@@ -176,7 +176,7 @@ void MetabarFunctions::animate()
}
int change = currentHeight < height ? changeValue : -changeValue;
- style.setProperty("height", TQString("%1px").arg(currentHeight + change), CSS_PRIORITY);
+ style.setProperty("height", TQString("%1px").tqarg(currentHeight + change), CSS_PRIORITY);
doc.updateRendering();
}
}
@@ -187,9 +187,9 @@ void MetabarFunctions::show(DOM::DOMString item)
DOM::HTMLDocument doc = m_html->htmlDocument();
DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
if(!node.isNull()){
- DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(node.parentNode());
+ DOM::HTMLElement tqparent = static_cast<DOM::HTMLElement>(node.parentNode());
- DOM::CSSStyleDeclaration style = parent.style();
+ DOM::CSSStyleDeclaration style = tqparent.style();
style.setProperty("display", "block", CSS_PRIORITY);
}
}
@@ -199,9 +199,9 @@ void MetabarFunctions::hide(DOM::DOMString item)
DOM::HTMLDocument doc = m_html->htmlDocument();
DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
if(!node.isNull()){
- DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(node.parentNode());
+ DOM::HTMLElement tqparent = static_cast<DOM::HTMLElement>(node.parentNode());
- DOM::CSSStyleDeclaration style = parent.style();
+ DOM::CSSStyleDeclaration style = tqparent.style();
style.setProperty("display", "none", CSS_PRIORITY);
}
}
@@ -209,9 +209,9 @@ void MetabarFunctions::hide(DOM::DOMString item)
int MetabarFunctions::getHeight(DOM::HTMLElement &element)
{
int height = 0;
- DOM::NodeList children = element.childNodes();
- for(uint i = 0; i < children.length(); i++){
- DOM::HTMLElement node = static_cast<DOM::HTMLElement>(children.item(i));
+ DOM::NodeList tqchildren = element.childNodes();
+ for(uint i = 0; i < tqchildren.length(); i++){
+ DOM::HTMLElement node = static_cast<DOM::HTMLElement>(tqchildren.item(i));
DOM::CSSStyleDeclaration style = node.style();
DOM::DOMString css_height = style.getPropertyValue("height");
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.h b/konq-plugins/sidebar/metabar/src/metabarfunctions.h
index 1ccce3c..96742e5 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.h
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.h
@@ -29,12 +29,13 @@
#include <kurl.h>
#include <khtml_part.h>
-class MetabarFunctions : public QObject
+class MetabarFunctions : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- MetabarFunctions(KHTMLPart *html, TQObject *parent = 0, const char* name=0);
+ MetabarFunctions(KHTMLPart *html, TQObject *tqparent = 0, const char* name=0);
~MetabarFunctions();
void toggle(DOM::DOMString item);
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index bf074e8..965319e 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -73,7 +73,7 @@
#define EVENT_TYPE DOM::DOMString("click")
#define ACTIVATION 1
-MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(parent, name)
+MetabarWidget::MetabarWidget(TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
{
skip = false;
loadComplete = false;
@@ -94,14 +94,14 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
html->setCaretVisible(false);
html->setDNDEnabled(false);
html->setJavaEnabled(false);
- html->view()->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ html->view()->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
html->view()->hide();
connect(html->browserExtension(), TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(handleURLRequest(const KURL &, const KParts::URLArgs &)));
connect(html, TQT_SIGNAL(completed()), this, TQT_SLOT(loadCompleted()));
connect(html, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(slotShowPopup(const TQString&, const TQPoint &)));
- functions = new MetabarFunctions(html, this);
+ functions = new MetabarFunctions(html, TQT_TQOBJECT(this));
currentPlugin = 0;
defaultPlugin = new DefaultPlugin(html, functions);
@@ -114,14 +114,14 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
plugins.insert("http", httpPlugin);
plugins.insert("https", httpPlugin);
- TQVBoxLayout *layout = new TQVBoxLayout(this);
- layout->addWidget(html->view());
+ TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+ tqlayout->addWidget(html->view());
popup = new KPopupMenu(0);
- KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), this, TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
+ KAction *configAction = new KAction(i18n("Configure %1...").tqarg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
configAction->plug(popup);
- KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), this, TQT_SLOT(setTheme()), html->actionCollection(), "reload");
+ KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload");
reloadAction->plug(popup);
setTheme();
@@ -210,12 +210,12 @@ void MetabarWidget::setFileItems(const KFileItemList &items, bool check)
TQString MetabarWidget::getCurrentURL()
{
- DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name());
DCOPReply reply = ref.call("currentURL()");
if (reply.isValid()) {
TQString url;
- reply.get(url, "TQString");
+ reply.get(url, TQSTRING_OBJECT_NAME_STRING);
if(!url.isNull() && !url.isEmpty()){
return url;
@@ -226,19 +226,19 @@ TQString MetabarWidget::getCurrentURL()
void MetabarWidget::openURL(const TQString &url)
{
- DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name());
DCOPReply reply = ref.call("openURL", url);
}
void MetabarWidget::openTab(const TQString &url)
{
- DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name());
DCOPReply reply = ref.call("newTab", url);
}
void MetabarWidget::callAction(const TQString &action)
{
- DCOPRef ref(kapp->dcopClient()->appId(), TQString(this->topLevelWidget()->name()).append("/action/").append(action).utf8());
+ DCOPRef ref(kapp->dcopClient()->appId(), TQString(TQString(this->tqtopLevelWidget()->name()).append("/action/").append(action)).utf8());
if(ref.call("enabled()")){
ref.call("activate()");
}
@@ -289,7 +289,7 @@ void MetabarWidget::loadCompleted()
if(node.hasAttribute("image")){
TQString icon = node.getAttribute("image").string();
TQString url = getIconPath(icon);
- TQString style = TQString("background-image: url(%1);").arg(url);
+ TQString style = TQString("background-image: url(%1);").tqarg(url);
node.setAttribute("style", style);
}
@@ -308,7 +308,7 @@ void MetabarWidget::loadCompleted()
}
config->setGroup("General");
- TQString file = locate("data", TQString("metabar/themes/%1/default.css").arg(config->readEntry("Theme", "default")));
+ TQString file = locate("data", TQString("metabar/themes/%1/default.css").tqarg(config->readEntry("Theme", "default")));
if(file.isNull()){
file = locate("data", TQString("metabar/themes/default/default.css"));
}
@@ -319,7 +319,7 @@ void MetabarWidget::loadCompleted()
TQString tmp = stream.read();
cssfile.close();
- tmp.replace("./", KURL::fromPathOrURL(file).directory(false));
+ tmp.tqreplace("./", KURL::fromPathOrURL(file).directory(false));
html->setUserStyleSheet(tmp);
}
@@ -393,15 +393,15 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
skip = true; //needed to prevent some weired reload
DOM::DOMString innerHTML;
- innerHTML += TQString("<ul style=\"width: %1px; height: %1px\">").arg(image.width(), image.height());
+ innerHTML += TQString("<ul style=\"width: %1px; height: %1px\">").tqarg(image.width(), image.height());
innerHTML += "<object class=\"preview\" type=\"";
innerHTML += item->mimetype();
innerHTML += "\" data=\"";
innerHTML += item->url().url();
innerHTML += "\" width=\"";
- innerHTML += TQString().setNum(image.width());
+ innerHTML += TQString(TQString().setNum(image.width()));
innerHTML += "\" height=\"";
- innerHTML += TQString().setNum(image.height());
+ innerHTML += TQString(TQString().setNum(image.height()));
innerHTML += "\" /></ul>";
node.setInnerHTML(innerHTML);
}
@@ -419,8 +419,8 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
for(uint i = 0; i < list.length(); i++){
DOM::HTMLElement node = static_cast<DOM::HTMLElement>(list.item(i));
if(!node.isNull()){
- DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(node.parentNode());
- DOM::CSSStyleDeclaration style = parent.style();
+ DOM::HTMLElement tqparent = static_cast<DOM::HTMLElement>(node.parentNode());
+ DOM::CSSStyleDeclaration style = tqparent.style();
DOM::DOMString display = style.getPropertyValue("display");
DOM::DOMString newDisplay = display == "none" ? "block" : "none";
@@ -431,13 +431,13 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
}
if(element.id().string().startsWith("hidden")){
- TQString style = TQString("background-image: url(%1);").arg(getIconPath(showMore ? "1downarrow" : "1uparrow"));
+ TQString style = TQString("background-image: url(%1);").tqarg(getIconPath(showMore ? "1downarrow" : "1uparrow"));
element.setInnerText( showMore ? i18n("More") : i18n("Less") );
element.setAttribute("style", style);
}
- DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(element.parentNode().parentNode());
- functions->adjustSize(parent.id());
+ DOM::HTMLElement tqparent = static_cast<DOM::HTMLElement>(element.parentNode().parentNode());
+ functions->adjustSize(tqparent.id());
}
else if(protocol == "function"){
@@ -475,7 +475,7 @@ TQString MetabarWidget::getIconPath(const TQString &name)
buffer.open(IO_WriteOnly);
icon.save(&buffer, "PNG");
- return TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data));
+ return TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
}
void MetabarWidget::slotShowSharingDialog()
@@ -584,7 +584,7 @@ void MetabarWidget::setTheme()
loadComplete = false;
config->setGroup("General");
- TQString file = locate("data", TQString("metabar/themes/%1/layout.html").arg(config->readEntry("Theme", "default")));
+ TQString file = locate("data", TQString("metabar/themes/%1/tqlayout.html").tqarg(config->readEntry("Theme", "default")));
html->openURL(KURL(file));
}
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h
index e88a003..4f6d21b 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.h
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h
@@ -35,18 +35,19 @@
#include "protocolplugin.h"
#include "metabarfunctions.h"
-class MetabarWidget : public QWidget
+class MetabarWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- MetabarWidget(TQWidget *parent = 0, const char* name=0);
+ MetabarWidget(TQWidget *tqparent = 0, const char* name=0);
~MetabarWidget();
void setFileItems(const KFileItemList &items, bool check = true);
static TQString getIconPath(const TQString &name);
- static void addEntry(DOM::DOMString &html, const TQString name, const TQString url, const TQString icon, const TQString id = TQString::null, const TQString nameatt = TQString::null, bool hidden = false);
+ static void addEntry(DOM::DOMString &html, const TQString name, const TQString url, const TQString icon, const TQString id = TQString(), const TQString nameatt = TQString(), bool hidden = false);
private:
KFileItemList *currentItems;
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
index 99f5b31..333aab5 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
@@ -71,7 +71,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
TQBuffer buffer(data);
buffer.open(IO_WriteOnly);
pix.save(&buffer, "PNG");
- TQString icondata = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data));
+ TQString icondata = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
icon.setSrc(icondata);
}
@@ -81,7 +81,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
name.setInnerText(m_items.getFirst()->name());
}
else{
- name.setInnerText(i18n("%1 Elements").arg(m_items.count()));
+ name.setInnerText(i18n("%1 Elements").tqarg(m_items.count()));
}
}
@@ -105,7 +105,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
}
}
- type.setInnerText(i18n("%1 Folders, %2 Files").arg(dirs).arg(files));
+ type.setInnerText(i18n("%1 Folders, %2 Files").tqarg(dirs).tqarg(files));
}
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.h b/konq-plugins/sidebar/metabar/src/protocolplugin.h
index 7fb76b3..81ed149 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.h
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.h
@@ -28,8 +28,9 @@
#include "metabarfunctions.h"
-class ProtocolPlugin : public QObject{
+class ProtocolPlugin : public TQObject{
Q_OBJECT
+ TQ_OBJECT
public:
static ProtocolPlugin* activePlugin;
diff --git a/konq-plugins/sidebar/metabar/src/remoteplugin.h b/konq-plugins/sidebar/metabar/src/remoteplugin.h
index dc42bed..61a1b00 100644
--- a/konq-plugins/sidebar/metabar/src/remoteplugin.h
+++ b/konq-plugins/sidebar/metabar/src/remoteplugin.h
@@ -26,6 +26,7 @@
class RemotePlugin : public DefaultPlugin
{
Q_OBJECT
+ TQ_OBJECT
public:
RemotePlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name = 0);
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index 1b59527..c9ac8b4 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -37,7 +37,7 @@
#include <kstandarddirs.h>
-ServiceLoader::ServiceLoader(TQWidget *parent, const char *name) : TQObject(parent, name)
+ServiceLoader::ServiceLoader(TQWidget *tqparent, const char *name) : TQObject(tqparent, name)
{
popups.setAutoDelete(true);
}
@@ -52,7 +52,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
KURL url = item.url();
TQString mimeType = item.mimetype();
- TQString mimeGroup = mimeType.left(mimeType.find('/'));
+ TQString mimeGroup = mimeType.left(mimeType.tqfind('/'));
urlList.clear();
urlList.append(url);
@@ -96,7 +96,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
if(cfg.hasKey("X-KDE-Require")){
const TQStringList capabilities = cfg.readListEntry( "X-KDE-Require" );
- if (capabilities.contains( "Write" )){
+ if (capabilities.tqcontains( "Write" )){
continue;
}
}
@@ -123,7 +123,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
// if we have a mimetype, see if we have an exact or a type globbed match
if(!ok && (!mimeType.isEmpty() && *it == mimeType) ||
- (!mimeGroup.isEmpty() && ((*it).right(1) == "*" && (*it).left((*it).find('/')) == mimeGroup)))
+ (!mimeGroup.isEmpty() && ((*it).right(1) == "*" && (*it).left((*it).tqfind('/')) == mimeGroup)))
{
checkTheMimetypes = true;
}
@@ -132,7 +132,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
ok = true;
for(TQStringList::ConstIterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex){
- if( ((*itex).right(1) == "*" && (*itex).left((*itex).find('/')) == mimeGroup) ||
+ if( ((*itex).right(1) == "*" && (*itex).left((*itex).tqfind('/')) == mimeGroup) ||
((*itex) == mimeType))
{
ok = false;
@@ -154,7 +154,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
popup = popups[submenuName];
}
else{
- MetabarWidget::addEntry(html, submenuName, "servicepopup://" + idString, "1rightarrow", "popup" + idString, count < maxActions ? TQString::null : TQString("hiddenaction"), count >= maxActions);
+ MetabarWidget::addEntry(html, submenuName, "servicepopup://" + idString, "1rightarrow", "popup" + idString, count < maxActions ? TQString() : TQString("hiddenaction"), count >= maxActions);
popup = new KPopupMenu();
popups.insert(idString, popup);
@@ -168,11 +168,11 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
for (TQValueList<KDEDesktopMimeType::Service>::iterator it = list.begin(); it != list.end(); ++it){
if(usePopup){
- KAction *action = new KAction((*it).m_strName, (*it).m_strIcon, KShortcut(), this, TQT_SLOT(runAction()), popup, idString.utf8());
+ KAction *action = new KAction((*it).m_strName, (*it).m_strIcon, KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(runAction()), TQT_TQOBJECT(popup), idString.utf8());
action->plug(popup);
}
else{
- MetabarWidget::addEntry(html, (*it).m_strName, "service://" + idString, (*it).m_strIcon, TQString::null, count < maxActions ? TQString::null : TQString("hiddenaction"), count >= maxActions);
+ MetabarWidget::addEntry(html, (*it).m_strName, "service://" + idString, (*it).m_strIcon, TQString(), count < maxActions ? TQString() : TQString("hiddenaction"), count >= maxActions);
count++;
}
@@ -188,7 +188,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
void ServiceLoader::runAction()
{
- KDEDesktopMimeType::Service s = services[sender()->name()];
+ KDEDesktopMimeType::Service s = services[TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()];
if(!s.isEmpty()){
KDEDesktopMimeType::executeService(urlList, s);
}
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h
index 527ea97..31f1366 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.h
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.h
@@ -35,12 +35,13 @@
#include "metabarwidget.h"
-class ServiceLoader : public QObject
+class ServiceLoader : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- ServiceLoader(TQWidget *parent, const char *name = 0);
+ ServiceLoader(TQWidget *tqparent, const char *name = 0);
~ServiceLoader();
void loadServices(const KFileItem item, DOM::DOMString &html, int &count);
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.h b/konq-plugins/sidebar/metabar/src/settingsplugin.h
index c1d1cb8..9581e1e 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.h
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.h
@@ -29,6 +29,7 @@
class SettingsPlugin : public ProtocolPlugin
{
Q_OBJECT
+ TQ_OBJECT
public:
SettingsPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name = 0);
diff --git a/konq-plugins/sidebar/newsticker/configfeeds.cpp b/konq-plugins/sidebar/newsticker/configfeeds.cpp
index dd038b6..5fbc533 100644
--- a/konq-plugins/sidebar/newsticker/configfeeds.cpp
+++ b/konq-plugins/sidebar/newsticker/configfeeds.cpp
@@ -29,7 +29,7 @@
namespace KSB_News {
-ConfigFeeds::ConfigFeeds(TQWidget* parent, const char* name) : ConfigFeedsBase(parent, name)
+ConfigFeeds::ConfigFeeds(TQWidget* tqparent, const char* name) : ConfigFeedsBase(tqparent, name)
{
}
diff --git a/konq-plugins/sidebar/newsticker/configfeeds.h b/konq-plugins/sidebar/newsticker/configfeeds.h
index 127ba27..5ca80a7 100644
--- a/konq-plugins/sidebar/newsticker/configfeeds.h
+++ b/konq-plugins/sidebar/newsticker/configfeeds.h
@@ -41,9 +41,10 @@ namespace KSB_News {
class ConfigFeeds : public ConfigFeedsBase {
Q_OBJECT
+ TQ_OBJECT
public:
- ConfigFeeds(TQWidget* parent, const char* name = 0);
+ ConfigFeeds(TQWidget* tqparent, const char* name = 0);
};
diff --git a/konq-plugins/sidebar/newsticker/configfeedsbase.ui b/konq-plugins/sidebar/newsticker/configfeedsbase.ui
index 8389747..594e72b 100644
--- a/konq-plugins/sidebar/newsticker/configfeedsbase.ui
+++ b/konq-plugins/sidebar/newsticker/configfeedsbase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ConfigFeedsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>ConfigFeedsBase</cstring>
</property>
@@ -18,7 +18,7 @@
</widget>
</vbox>
</widget>
-<layoutdefaults spacing="6" margin="0"/>
+<tqlayoutdefaults spacing="6" margin="0"/>
<includehints>
<includehint>keditlistbox.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp
index db793bd..35ee14d 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.cpp
+++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp
@@ -37,17 +37,17 @@
namespace KSB_News {
- NoRSSWidget::NoRSSWidget(TQWidget *parent, const char *name)
- : TQWidget(parent, name) {
+ NoRSSWidget::NoRSSWidget(TQWidget *tqparent, const char *name)
+ : TQWidget(tqparent, name) {
TQVBoxLayout *topLayout = new TQVBoxLayout(this);
topLayout->addStretch();
KPushButton *btn = new KPushButton(i18n("&Configure"), this);
- btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
+ btn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnClicked()));
- topLayout->addWidget(btn, 0, Qt::AlignHCenter);
+ topLayout->addWidget(btn, 0, TQt::AlignHCenter);
topLayout->addStretch();
}
diff --git a/konq-plugins/sidebar/newsticker/norsswidget.h b/konq-plugins/sidebar/newsticker/norsswidget.h
index 91a8c61..70ee265 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.h
+++ b/konq-plugins/sidebar/newsticker/norsswidget.h
@@ -33,9 +33,10 @@ namespace KSB_News {
class NoRSSWidget : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
public:
- NoRSSWidget(TQWidget *parent = 0, const char *name = 0);
+ NoRSSWidget(TQWidget *tqparent = 0, const char *name = 0);
private slots:
void slotBtnClicked();
diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp
index a5c1261..e58d0c4 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.cpp
+++ b/konq-plugins/sidebar/newsticker/nspanel.cpp
@@ -35,8 +35,8 @@ namespace KSB_News {
////////////////////////////////////////////////////////////////
// ListBox including ToolTip for item
////////////////////////////////////////////////////////////////
- TTListBox::TTListBox(TQWidget *parent, const char *name, WFlags f)
- : KListBox(parent, name, f),
+ TTListBox::TTListBox(TQWidget *tqparent, const char *name, WFlags f)
+ : KListBox(tqparent, name, f),
TQToolTip(this) {
}
@@ -54,16 +54,16 @@ namespace KSB_News {
int textWidth = fm.width(text);
int widgetSpace = visibleWidth();
if ((textWidth > widgetSpace) || (contentsX() > 0))
- tip(itemRect(item), text);
+ tip(tqitemRect(item), text);
}
}
}
- NSPanel::NSPanel(TQObject *parent, const char *name, const TQString &key,
+ NSPanel::NSPanel(TQObject *tqparent, const char *name, const TQString &key,
DCOPRef *rssservice)
- :TQObject(parent, name)
+ :TQObject(tqparent, name)
,DCOPObject(TQString(TQString("sidebar-newsticker-")+key).latin1())
,m_listbox()
,m_pixmap()
diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h
index d46be5b..01cf1e2 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.h
+++ b/konq-plugins/sidebar/newsticker/nspanel.h
@@ -44,7 +44,7 @@ namespace KSB_News {
////////////////////////////////////////////////////////////////
class TTListBox : public KListBox, TQToolTip {
public:
- TTListBox (TQWidget *parent = 0, const char *name = 0, WFlags f = 0);
+ TTListBox (TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0);
void clear();
protected:
@@ -55,10 +55,11 @@ namespace KSB_News {
class NSPanel : public TQObject, public DCOPObject {
Q_OBJECT
+// TQ_OBJECT
K_DCOP
public:
- NSPanel(TQObject *parent, const char *name, const TQString &key,
+ NSPanel(TQObject *tqparent, const char *name, const TQString &key,
DCOPRef *rssservice);
~NSPanel();
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index 6c7e44b..9c29b7c 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -50,10 +50,10 @@
namespace KSB_News {
- NSStackTabWidget::NSStackTabWidget(TQWidget *parent, const char *name,
- TQPixmap appIcon) : TQWidget(parent, name) {
+ NSStackTabWidget::NSStackTabWidget(TQWidget *tqparent, const char *name,
+ TQPixmap appIcon) : TQWidget(tqparent, name) {
currentPage = 0;
- layout = new TQVBoxLayout(this);
+ tqlayout = new TQVBoxLayout(this);
pagesheader.setAutoDelete(TRUE);
pages.setAutoDelete(TRUE);
@@ -115,7 +115,7 @@ namespace KSB_News {
button->setText(KStringHandler::rPixelSqueeze(nsp->title(),
button->fontMetrics(),
button->width() - 4 ));
- button->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
+ button->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
TQSizePolicy::Preferred));
connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonClicked()));
TQToolTip::add(button, nsp->title());
@@ -132,8 +132,8 @@ namespace KSB_News {
pagesheader.insert(nsp, button);
pages.insert(nsp, sv);
- layout->addWidget(button);
- layout->addWidget(sv);
+ tqlayout->addWidget(button);
+ tqlayout->addWidget(sv);
button->show();
if (pages.count() == 1) {
currentPage = sv;
@@ -161,7 +161,7 @@ namespace KSB_News {
void NSStackTabWidget::updateTitle(NSPanel *nsp) {
- TQPushButton *pb = (TQPushButton *)pagesheader.find(nsp);
+ TQPushButton *pb = (TQPushButton *)pagesheader.tqfind(nsp);
if (! pb->pixmap())
pb->setText(nsp->title());
}
@@ -169,11 +169,11 @@ namespace KSB_News {
void NSStackTabWidget::updatePixmap(NSPanel *nsp) {
- TQPushButton *pb = (TQPushButton *)pagesheader.find(nsp);
+ TQPushButton *pb = (TQPushButton *)pagesheader.tqfind(nsp);
TQPixmap pixmap = nsp->pixmap();
if ((pixmap.width() > 88) || (pixmap.height() > 31)) {
TQImage image = pixmap.convertToImage();
- pixmap.convertFromImage(image.smoothScale(88, 31, TQImage::ScaleMin));
+ pixmap.convertFromImage(image.smoothScale(88, 31, TQ_ScaleMin));
}
pb->setPixmap(pixmap);
}
@@ -197,7 +197,7 @@ namespace KSB_News {
return;
// Find current ScrollView
- TQWidget *sv = pages.find(nsp);
+ TQWidget *sv = pages.tqfind(nsp);
// Change visible page
if (currentPage != sv) {
@@ -213,7 +213,7 @@ namespace KSB_News {
bool NSStackTabWidget::eventFilter(TQObject *obj, TQEvent *ev) {
if (ev->type() == TQEvent::MouseButtonPress
- && ((TQMouseEvent *)ev)->button() == TQMouseEvent::RightButton) {
+ && ((TQMouseEvent *)ev)->button() == Qt::RightButton) {
m_last_button_rightclicked = (TQPushButton *)obj;
popup->exec(TQCursor::pos());
return true;
@@ -352,7 +352,7 @@ namespace KSB_News {
bool NSStackTabWidget::isRegistered(const TQString &key) {
m_our_rsssources = SidebarSettings::sources();
- if (m_our_rsssources.findIndex(key) == -1)
+ if (m_our_rsssources.tqfindIndex(key) == -1)
return false;
else
return true;
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
index cf001a0..49650e7 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
@@ -47,9 +47,10 @@ namespace KSB_News {
class NSStackTabWidget : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
public:
- NSStackTabWidget(TQWidget *parent = 0, const char *name = 0,
+ NSStackTabWidget(TQWidget *tqparent = 0, const char *name = 0,
TQPixmap appIcon = TQPixmap());
void addStackTab(NSPanel *nsp, TQWidget *page);
void delStackTab(NSPanel *nsp);
@@ -73,7 +74,7 @@ namespace KSB_News {
private:
TQPtrDict<TQWidget> pages;
TQPtrDict<TQWidget> pagesheader;
- TQVBoxLayout *layout;
+ TQVBoxLayout *tqlayout;
TQWidget *currentPage;
KPopupMenu *popup, *helpmenu;
KAboutData *m_aboutdata;
diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
index ae9c51b..97f24e3 100644
--- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp
+++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
@@ -46,15 +46,15 @@
namespace KSB_News {
- KonqSidebar_News::KonqSidebar_News(KInstance *inst, TQObject *parent,
+ KonqSidebar_News::KonqSidebar_News(KInstance *inst, TQObject *tqparent,
TQWidget *widgetParent,
TQString &desktopName, const char* name)
- : KonqSidebarPlugin(inst, parent, widgetParent, desktopName, name),
+ : KonqSidebarPlugin(inst, tqparent, widgetParent, desktopName, name),
DCOPObject("sidebar-newsticker")
{
// get the application icon
// FIXME: as konqueror knows the icon there might be a possibility to
- // access the already present QPixmap
+ // access the already present TQPixmap
KDesktopFile desktopFile(desktopName, true);
TQString iconName = desktopFile.readIcon();
KIconLoader iconLoader;
@@ -191,7 +191,7 @@ namespace KSB_News {
if (NSPanel *nsp = getNSPanelByKey(key)) {
newswidget->delStackTab(nsp);
- delete nspanelptrlist.take(nspanelptrlist.findRef(nsp));
+ delete nspanelptrlist.take(nspanelptrlist.tqfindRef(nsp));
} else
kdWarning() << "removedSource called for non-existing id" << endl;
diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.h b/konq-plugins/sidebar/newsticker/sidebar_news.h
index b40dcab..1c92c0e 100644
--- a/konq-plugins/sidebar/newsticker/sidebar_news.h
+++ b/konq-plugins/sidebar/newsticker/sidebar_news.h
@@ -44,10 +44,11 @@ namespace KSB_News {
class KonqSidebar_News : public KonqSidebarPlugin, DCOPObject {
Q_OBJECT
+// TQ_OBJECT
K_DCOP
public:
- KonqSidebar_News(KInstance *instance, TQObject *parent,
+ KonqSidebar_News(KInstance *instance, TQObject *tqparent,
TQWidget *widgetParent, TQString &desktopName_,
const char* name=0);
~KonqSidebar_News();
diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp
index b6ad880..fb5d840 100644
--- a/konq-plugins/uachanger/uachangerplugin.cpp
+++ b/konq-plugins/uachanger/uachangerplugin.cpp
@@ -47,12 +47,12 @@ K_EXPORT_COMPONENT_FACTORY (libuachangerplugin, UAChangerPluginFactory (&aboutda
#define UA_PTOS(x) (*it)->property(x).toString()
-#define QFL1(x) TQString::fromLatin1(x)
+#define TQFL1(x) TQString::tqfromLatin1(x)
-UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name,
+UAChangerPlugin::UAChangerPlugin( TQObject* tqparent, const char* name,
const TQStringList & )
- :KParts::Plugin( parent, name ),
+ :KParts::Plugin( tqparent, name ),
m_bSettingsLoaded(false), m_part(0L), m_config(0L)
{
setInstance(UAChangerPlugin::instance());
@@ -65,9 +65,9 @@ UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name,
m_pUAMenu->setEnabled ( false );
- if ( parent && parent->inherits( "KHTMLPart" ) )
+ if ( tqparent && tqparent->inherits( "KHTMLPart" ) )
{
- m_part = static_cast<KHTMLPart*>(parent);
+ m_part = static_cast<KHTMLPart*>(tqparent);
connect( m_part, TQT_SIGNAL(started(KIO::Job*)), this,
TQT_SLOT(slotStarted(KIO::Job*)) );
}
@@ -101,13 +101,13 @@ void UAChangerPlugin::parseDescFiles()
TQStringList languageList = KGlobal::locale()->languageList();
if ( languageList.count() )
{
- TQStringList::Iterator it = languageList.find(QFL1("C"));
+ TQStringList::Iterator it = languageList.tqfind(TQFL1("C"));
if( it != languageList.end() )
{
- if( languageList.contains( QFL1("en") ) > 0 )
+ if( languageList.tqcontains( TQFL1("en") ) > 0 )
languageList.remove( it );
else
- (*it) = QFL1("en");
+ (*it) = TQFL1("en");
}
}
@@ -124,32 +124,32 @@ void UAChangerPlugin::parseDescFiles()
if ( (*it)->property("X-KDE-UA-DYNAMIC-ENTRY").toBool() )
{
- tmp.replace( QFL1("appSysName"), QFL1(utsn.sysname) );
- tmp.replace( QFL1("appSysRelease"), QFL1(utsn.release) );
- tmp.replace( QFL1("appMachineType"), QFL1(utsn.machine) );
- tmp.replace( QFL1("appLanguage"), languageList.join(QFL1(", ")) );
- tmp.replace( QFL1("appPlatform"), QFL1("X11") );
+ tmp.tqreplace( TQFL1("appSysName"), TQFL1(utsn.sysname) );
+ tmp.tqreplace( TQFL1("appSysRelease"), TQFL1(utsn.release) );
+ tmp.tqreplace( TQFL1("appMachineType"), TQFL1(utsn.machine) );
+ tmp.tqreplace( TQFL1("appLanguage"), languageList.join(TQFL1(", ")) );
+ tmp.tqreplace( TQFL1("appPlatform"), TQFL1("X11") );
}
- if ( m_lstIdentity.contains(tmp) )
+ if ( m_lstIdentity.tqcontains(tmp) )
continue; // Ignore dups!
m_lstIdentity << tmp;
- tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-SYSNAME")).arg(UA_PTOS("X-KDE-UA-SYSRELEASE"));
+ tmp = TQString("%1 %2").tqarg(UA_PTOS("X-KDE-UA-SYSNAME")).tqarg(UA_PTOS("X-KDE-UA-SYSRELEASE"));
if ( tmp.stripWhiteSpace().isEmpty() )
{
if(tag == "NN" || tag == "IE" || tag == "MOZ")
- tmp = i18n("Version %1").arg(UA_PTOS("X-KDE-UA-VERSION"));
+ tmp = i18n("Version %1").tqarg(UA_PTOS("X-KDE-UA-VERSION"));
else
- tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-NAME")).arg(UA_PTOS("X-KDE-UA-VERSION"));
+ tmp = TQString("%1 %2").tqarg(UA_PTOS("X-KDE-UA-NAME")).tqarg(UA_PTOS("X-KDE-UA-VERSION"));
}
else
{
if(tag == "NN" || tag == "IE" || tag == "MOZ")
- tmp = i18n("Version %1 on %2").arg(UA_PTOS("X-KDE-UA-VERSION")).arg(tmp);
+ tmp = i18n("Version %1 on %2").tqarg(UA_PTOS("X-KDE-UA-VERSION")).tqarg(tmp);
else
- tmp = i18n("%1 %2 on %3").arg(UA_PTOS("X-KDE-UA-NAME")).arg(UA_PTOS("X-KDE-UA-VERSION")).arg(tmp);
+ tmp = i18n("%1 %2 on %3").tqarg(UA_PTOS("X-KDE-UA-NAME")).tqarg(UA_PTOS("X-KDE-UA-VERSION")).tqarg(tmp);
}
m_lstAlias << tmp;
@@ -161,7 +161,7 @@ void UAChangerPlugin::parseDescFiles()
{
if ( m_lstAlias[(*e)] > tmp ) {
ualist.insert( e, m_lstAlias.count()-1 );
- tmp = TQString::null;
+ tmp = TQString();
}
++e;
}
@@ -212,7 +212,7 @@ void UAChangerPlugin::slotAboutToShow()
m_pUAMenu->popupMenu()->clear();
m_pUAMenu->popupMenu()->insertTitle(i18n("Identify As")); // imho title doesn't need colon..
- TQString host = m_currentURL.isLocalFile() ? QFL1("localhost") : m_currentURL.host();
+ TQString host = m_currentURL.isLocalFile() ? TQFL1("localhost") : m_currentURL.host();
m_currentUserAgent = KProtocolManager::userAgentForHost(host);
//kdDebug(90130) << "User Agent: " << m_currentUserAgent << endl;
@@ -267,7 +267,7 @@ void UAChangerPlugin::slotItemSelected( int id )
TQString host;
m_currentUserAgent = m_lstIdentity[id];
- host = m_currentURL.isLocalFile() ? QFL1("localhost") : filterHost( m_currentURL.host() );
+ host = m_currentURL.isLocalFile() ? TQFL1("localhost") : filterHost( m_currentURL.host() );
m_config->setGroup( host.lower() );
m_config->writeEntry( "UserAgent", m_currentUserAgent );
@@ -304,7 +304,7 @@ void UAChangerPlugin::slotDefault()
if (partList.count() == 1)
break;
- domains << partList.join(QFL1("."));
+ domains << partList.join(TQFL1("."));
partList.remove(partList.begin());
}
@@ -336,7 +336,7 @@ void UAChangerPlugin::slotDefault()
void UAChangerPlugin::updateIOSlaves ()
{
// Inform running http(s) io-slaves about the change...
- if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString::null))
+ if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString()))
kdWarning() << "UAChangerPlugin::updateIOSlaves: Unable to update running application!" << endl;
}
@@ -379,7 +379,7 @@ TQString UAChangerPlugin::findTLD (const TQString &hostname)
// it should be <surname>.name since people should not be able
// to set cookies for everyone with the same surname.
// Matches <surname>.name
- if( partList[1].lower() == QFL1("name") )
+ if( partList[1].lower() == TQFL1("name") )
{
break;
}
@@ -399,7 +399,7 @@ TQString UAChangerPlugin::findTLD (const TQString &hostname)
}
}
- domains.append(partList.join(QFL1(".")));
+ domains.append(partList.join(TQFL1(".")));
partList.remove(partList.begin()); // Remove part
}
diff --git a/konq-plugins/uachanger/uachangerplugin.h b/konq-plugins/uachanger/uachangerplugin.h
index 7732574..ef5abd4 100644
--- a/konq-plugins/uachanger/uachangerplugin.h
+++ b/konq-plugins/uachanger/uachangerplugin.h
@@ -41,9 +41,10 @@ namespace KIO
class UAChangerPlugin : public KParts::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- UAChangerPlugin( TQObject* parent, const char* name,
+ UAChangerPlugin( TQObject* tqparent, const char* name,
const TQStringList & );
~UAChangerPlugin();
diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp
index f669308..3ee1f91 100644
--- a/konq-plugins/validators/plugin_validators.cpp
+++ b/konq-plugins/validators/plugin_validators.cpp
@@ -44,9 +44,9 @@ static const KAboutData aboutdata("validatorsplugin", I18N_NOOP("Validate Web Pa
K_EXPORT_COMPONENT_FACTORY( libvalidatorsplugin,
PluginValidatorsFactory( &aboutdata ) )
-PluginValidators::PluginValidators( TQObject* parent, const char* name,
+PluginValidators::PluginValidators( TQObject* tqparent, const char* name,
const TQStringList & )
- : Plugin( parent, name ), m_configDialog(0), m_part(0)
+ : Plugin( tqparent, name ), m_configDialog(0), m_part(0)
{
setInstance(PluginValidatorsFactory::instance());
@@ -71,14 +71,14 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name,
m_menu->setEnabled( false );
- if ( parent && parent->inherits( "KHTMLPart" ))
+ if ( tqparent && tqparent->inherits( "KHTMLPart" ))
{
m_menu->insert( new KAction( i18n( "C&onfigure Validator..." ),
"configure", 0,
this, TQT_SLOT(slotConfigure()),
actionCollection(), "configure") );
- m_part = static_cast<KHTMLPart *>( parent );
+ m_part = static_cast<KHTMLPart *>( tqparent );
m_configDialog = new ValidatorsDialog( m_part->widget() );
setURLs();
@@ -90,7 +90,7 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name,
PluginValidators::~PluginValidators()
{
delete m_configDialog;
-// Dont' delete the action. KActionCollection as parent does the job already
+// Dont' delete the action. KActionCollection as tqparent does the job already
// and not deleting it at this point also ensures that in case we are not unplugged
// from the GUI yet and the ~KXMLGUIClient destructor will do so it won't hit a
// dead pointer. The kxmlgui factory keeps references to the actions, but it does not
@@ -140,8 +140,8 @@ void PluginValidators::slotConfigure()
void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl)
{
- // The parent is assumed to be a KHTMLPart
- if ( !parent()->inherits("KHTMLPart") )
+ // The tqparent is assumed to be a KHTMLPart
+ if ( !tqparent()->inherits("KHTMLPart") )
{
TQString title = i18n( "Cannot Validate Source" );
TQString text = i18n( "You cannot validate anything except web pages with "
@@ -181,10 +181,10 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl)
{
KMessageBox::sorry(
m_part->widget(),
- i18n("<qt>The selected URL cannot be verified because it contains "
+ i18n("<qt>The selected URL cannot be verified because it tqcontains "
"a password. Sending this URL to <b>%1</b> would put the security "
"of <b>%2</b> at risk.</qt>")
- .arg(validatorUrl.host()).arg(partUrl.host()));
+ .tqarg(validatorUrl.host()).tqarg(partUrl.host()));
return;
}
// Set entered URL as a parameter
diff --git a/konq-plugins/validators/plugin_validators.h b/konq-plugins/validators/plugin_validators.h
index 2363ddb..6743d99 100644
--- a/konq-plugins/validators/plugin_validators.h
+++ b/konq-plugins/validators/plugin_validators.h
@@ -41,8 +41,9 @@ class KURL;
class PluginValidators : public KParts::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- PluginValidators( TQObject* parent, const char* name,
+ PluginValidators( TQObject* tqparent, const char* name,
const TQStringList & );
virtual ~PluginValidators();
diff --git a/konq-plugins/validators/validatorsdialog.cpp b/konq-plugins/validators/validatorsdialog.cpp
index 864de55..bd0e4d9 100644
--- a/konq-plugins/validators/validatorsdialog.cpp
+++ b/konq-plugins/validators/validatorsdialog.cpp
@@ -29,8 +29,8 @@
#include "validatorsdialog.h"
#include "validatorsdialog.moc"
-ValidatorsDialog::ValidatorsDialog(TQWidget *parent, const char *name )
- : KDialogBase( parent, name, false, i18n("Configure"), Ok|Cancel, Ok, true )
+ValidatorsDialog::ValidatorsDialog(TQWidget *tqparent, const char *name )
+ : KDialogBase( tqparent, name, false, i18n("Configure"), Ok|Cancel, Ok, true )
{
setCaption(i18n("Configure Validating Servers"));
setMinimumWidth(300);
diff --git a/konq-plugins/validators/validatorsdialog.h b/konq-plugins/validators/validatorsdialog.h
index 4fe9714..345323a 100644
--- a/konq-plugins/validators/validatorsdialog.h
+++ b/konq-plugins/validators/validatorsdialog.h
@@ -28,9 +28,10 @@
class ValidatorsDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ValidatorsDialog(TQWidget *parent=0, const char *name=0 );
+ ValidatorsDialog(TQWidget *tqparent=0, const char *name=0 );
~ValidatorsDialog();
const TQString getWWWValidatorUrl() const {return m_WWWValidatorCB->currentText();}
diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp
index a28da2c..77ca40d 100644
--- a/konq-plugins/webarchiver/archivedialog.cpp
+++ b/konq-plugins/webarchiver/archivedialog.cpp
@@ -49,9 +49,9 @@
#define CONTENT_TYPE "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">"
-ArchiveDialog::ArchiveDialog(TQWidget *parent, const TQString &filename,
+ArchiveDialog::ArchiveDialog(TQWidget *tqparent, const TQString &filename,
KHTMLPart *part) :
- KDialogBase(parent, "WebArchiveDialog", false, i18n("Web Archiver"),
+ KDialogBase(tqparent, "WebArchiveDialog", false, i18n("Web Archiver"),
KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::User1 ),
m_bPreserveWS(false), m_tmpFile(0), m_url(part->url())
{
@@ -88,7 +88,7 @@ void ArchiveDialog::archive()
} else {
const TQString title = i18n( "Unable to Open Web-Archive" );
- const TQString text = i18n( "Unable to open \n %1 \n for writing." ).arg(m_tarBall->fileName());
+ const TQString text = i18n( "Unable to open \n %1 \n for writing." ).tqarg(m_tarBall->fileName());
KMessageBox::sorry( 0L, text, title );
}
}
@@ -144,7 +144,7 @@ void ArchiveDialog::setSavingState()
TQString fileName="index.html";
TQFile file(tmpFile.name());
file.open(IO_ReadOnly);
- m_tarBall->writeFile(fileName, TQString::null, TQString::null, file.size(), file.readAll());
+ m_tarBall->writeFile(fileName, TQString(), TQString(), file.size(), file.readAll());
#ifdef DEBUG_WAR
kdDebug(90110) << "HTML-file written: " << fileName << endl;
#endif
@@ -207,7 +207,7 @@ static bool hasChildNode(const DOM::Node &pNode, const TQString &nodeName)
}
catch (...)
{
- // No children, stop recursion here
+ // No tqchildren, stop recursion here
child = DOM::Node();
}
@@ -237,12 +237,12 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas
/* Don't save khtml internal tags '-konq..'
* Approximating it with <DIV>
*/
- text += "<DIV> <!-- -KONQ_BLOCK -->";
+ text += "<DIV> <!-- -KONTQ_BLOCK -->";
} else if (nodeName == "BASE") {
/* Skip BASE, everything is relative to index.html
* Saving SCRIPT but they can cause trouble!
*/
- } else if ((nodeName == "META") && hasAttribute(pNode, "HTTP-EQUIV", "CONTENT-TYPE")) {
+ } else if ((nodeName == "META") && hasAttribute(pNode, "HTTP-ETQUIV", "CONTENT-TYPE")) {
/* Skip content-type meta tag, we provide our own.
*/
} else {
@@ -284,7 +284,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas
((nodeName == "IMG" || nodeName == "INPUT" || nodeName == "SCRIPT") && attrName == "SRC") ||
((nodeName == "BODY" || nodeName == "TABLE" || nodeName == "TH" || nodeName == "TD") && attrName == "BACKGROUND")) {
// Some people use carriage return in file names and browsers support that!
- attrValue = handleLink(baseURL, attrValue.replace(TQRegExp("\\s"), ""));
+ attrValue = handleLink(baseURL, attrValue.tqreplace(TQRegExp("\\s"), ""));
}
/*
* ## Make recursion level configurable
@@ -346,7 +346,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas
}
catch (...)
{
- // No children, stop recursion here
+ // No tqchildren, stop recursion here
child = DOM::Node();
}
@@ -370,7 +370,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas
text ="";
}
if (nodeName.at(0)=='-') {
- text += "</DIV> <!-- -KONQ_BLOCK -->";
+ text += "</DIV> <!-- -KONTQ_BLOCK -->";
} else {
text += "</" + pNode.nodeName().string() + ">";
if (nodeName == "PRE") {
@@ -425,7 +425,7 @@ void ArchiveDialog::downloadNext()
TQString tarFileName;
// Only download file once
- if (m_downloadedURLDict.contains(url.url())) {
+ if (m_downloadedURLDict.tqcontains(url.url())) {
tarFileName = m_downloadedURLDict[url.url()];
#ifdef DEBUG_WAR
kdDebug(90110) << "File already downloaded: " << url.url()
@@ -477,7 +477,7 @@ void ArchiveDialog::finishedDownloadingURL( KIO::Job *job )
// Add file to Tar-Ball
TQFile file(m_tmpFile->name());
file.open(IO_ReadOnly);
- m_tarBall->writeFile(tarFileName, TQString::null, TQString::null, file.size(), file.readAll());
+ m_tarBall->writeFile(tarFileName, TQString(), TQString(), file.size(), file.readAll());
file.close();
m_tmpFile->unlink();
delete m_tmpFile;
@@ -512,7 +512,7 @@ TQString ArchiveDialog::getUniqueFileName(const TQString& fileName)
kdDebug(90110) << "getUniqueFileName(..): [" << fileName << "]" << endl;
#endif
- while (uniqueFileName.isEmpty() || m_linkDict.contains(uniqueFileName))
+ while (uniqueFileName.isEmpty() || m_linkDict.tqcontains(uniqueFileName))
uniqueFileName = TQString::number(id++) + fileName;
return uniqueFileName;
@@ -532,14 +532,14 @@ TQString ArchiveDialog::analyzeInternalCSS(const KURL& _url, const TQString& str
int endUrl = 0;
int length = string.length();
while (pos < length && pos >= 0) {
- pos = str.find("url(", pos);
+ pos = str.tqfind("url(", pos);
if (pos!=-1) {
pos += 4; // url(
if (str[pos]=='"' || str[pos]=='\'') // CSS 'feature'
pos++;
startUrl = pos;
- pos = str.find(")",startUrl);
+ pos = str.tqfind(")",startUrl);
endUrl = pos;
if (str[pos-1]=='"' || str[pos-1]=='\'') // CSS 'feature'
endUrl--;
@@ -555,7 +555,7 @@ TQString ArchiveDialog::analyzeInternalCSS(const KURL& _url, const TQString& str
kdDebug () << "url: " << url << endl;
#endif
- str = str.replace(startUrl, endUrl-startUrl, url);
+ str = str.tqreplace(startUrl, endUrl-startUrl, url);
pos++;
}
}
diff --git a/konq-plugins/webarchiver/archivedialog.h b/konq-plugins/webarchiver/archivedialog.h
index 6748328..d82b9b0 100644
--- a/konq-plugins/webarchiver/archivedialog.h
+++ b/konq-plugins/webarchiver/archivedialog.h
@@ -42,8 +42,9 @@ class TQListViewItem;
class ArchiveDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ArchiveDialog(TQWidget *parent, const TQString &targetFilename, KHTMLPart *part);
+ ArchiveDialog(TQWidget *tqparent, const TQString &targetFilename, KHTMLPart *part);
~ArchiveDialog();
void archive();
diff --git a/konq-plugins/webarchiver/archiveviewbase.ui b/konq-plugins/webarchiver/archiveviewbase.ui
index a2aceb2..8e5ca1e 100644
--- a/konq-plugins/webarchiver/archiveviewbase.ui
+++ b/konq-plugins/webarchiver/archiveviewbase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>ArchiveViewBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>ArchiveViewBase</cstring>
</property>
@@ -19,9 +19,9 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<grid>
<property name="name">
@@ -43,7 +43,7 @@
<string>Local File</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
@@ -51,7 +51,7 @@
<string>To:</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -119,7 +119,7 @@
</widget>
<customwidgets>
</customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kactivelabel.h</includehint>
<includehint>kactivelabel.h</includehint>
diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp
index c76f56c..280b0e2 100644
--- a/konq-plugins/webarchiver/plugin_webarchiver.cpp
+++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp
@@ -50,9 +50,9 @@ typedef KGenericFactory<PluginWebArchiver> PluginWebArchiverFactory;
K_EXPORT_COMPONENT_FACTORY( libwebarchiverplugin,
PluginWebArchiverFactory( "webarchiver" ) )
-PluginWebArchiver::PluginWebArchiver( TQObject* parent, const char* name,
+PluginWebArchiver::PluginWebArchiver( TQObject* tqparent, const char* name,
const TQStringList & )
- : Plugin( parent, name )
+ : Plugin( tqparent, name )
{
(void) new KAction( i18n("Archive &Web Page..."),
"webarchiver", 0,
@@ -67,9 +67,9 @@ PluginWebArchiver::~PluginWebArchiver()
void PluginWebArchiver::slotSaveToArchive()
{
// ## Unicode ok?
- if( !parent() || !parent()->inherits("KHTMLPart"))
+ if( !tqparent() || !tqparent()->inherits("KHTMLPart"))
return;
- KHTMLPart *part = static_cast<KHTMLPart *>( parent() );
+ KHTMLPart *part = static_cast<KHTMLPart *>( tqparent() );
TQString archiveName = TQString::fromUtf8(part->htmlDocument().title().string().utf8());
@@ -78,12 +78,12 @@ void PluginWebArchiver::slotSaveToArchive()
// Replace space with underscore, proposed Frank Pieczynski <pieczy@knuut.de>
- archiveName.replace( "\\s:", " ");
+ archiveName.tqreplace( "\\s:", " ");
archiveName = archiveName.simplifyWhiteSpace();
- archiveName.replace( "?", "");
- archiveName.replace( ":", "");
- archiveName.replace( "/", "");
- archiveName = archiveName.replace( TQRegExp("\\s+"), "_");
+ archiveName.tqreplace( "?", "");
+ archiveName.tqreplace( ":", "");
+ archiveName.tqreplace( "/", "");
+ archiveName = archiveName.tqreplace( TQRegExp("\\s+"), "_");
archiveName = KGlobalSettings::documentPath() + "/" + archiveName + ".war" ;
@@ -94,7 +94,7 @@ void PluginWebArchiver::slotSaveToArchive()
if (!(url.isValid())) {
const TQString title = i18n( "Invalid URL" );
- const TQString text = i18n( "The URL\n%1\nis not valid." ).arg(url.prettyURL());
+ const TQString text = i18n( "The URL\n%1\nis not valid." ).tqarg(url.prettyURL());
KMessageBox::sorry(part->widget(), text, title );
return;
}
@@ -102,7 +102,7 @@ void PluginWebArchiver::slotSaveToArchive()
const TQFile file(url.path());
if (file.exists()) {
const TQString title = i18n( "File Exists" );
- const TQString text = i18n( "Do you really want to overwrite:\n%1?" ).arg(url.prettyURL());
+ const TQString text = i18n( "Do you really want to overwrite:\n%1?" ).tqarg(url.prettyURL());
if (KMessageBox::Continue != KMessageBox::warningContinueCancel( part->widget(), text, title, i18n("Overwrite") ) ) {
return;
}
diff --git a/konq-plugins/webarchiver/plugin_webarchiver.h b/konq-plugins/webarchiver/plugin_webarchiver.h
index 530e15b..338eec8 100644
--- a/konq-plugins/webarchiver/plugin_webarchiver.h
+++ b/konq-plugins/webarchiver/plugin_webarchiver.h
@@ -28,9 +28,10 @@
class PluginWebArchiver : public KParts::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- PluginWebArchiver( TQObject* parent, const char* name,
+ PluginWebArchiver( TQObject* tqparent, const char* name,
const TQStringList & );
virtual ~PluginWebArchiver();
diff --git a/konq-plugins/webarchiver/webarchivecreator.h b/konq-plugins/webarchiver/webarchivecreator.h
index 8806390..dfeba5d 100644
--- a/konq-plugins/webarchiver/webarchivecreator.h
+++ b/konq-plugins/webarchiver/webarchivecreator.h
@@ -29,6 +29,7 @@ class KHTMLPart;
class WebArchiveCreator : public TQObject, public ThumbCreator
{
Q_OBJECT
+ TQ_OBJECT
public:
WebArchiveCreator();
virtual ~WebArchiveCreator();