Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 70 insertions, 70 deletions

diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp
index ab77c40a0..2c8de18f8 100644
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@@ -17,10 +17,10 @@
 */
 
 #include "web_module.h"
-#include <qfileinfo.h>
-#include <qhbox.h>
-#include <qspinbox.h>
-#include <qtimer.h>
+#include <tqfileinfo.h>
+#include <tqhbox.h>
+#include <tqspinbox.h>
+#include <tqtimer.h>
 
 #include <dom/html_inline.h>
 #include <kdebug.h>
@@ -32,34 +32,34 @@
 #include <kstandarddirs.h>
 
 
-KonqSideBarWebModule::KonqSideBarWebModule(KInstance *instance, QObject *parent, QWidget *widgetParent, QString &desktopName, const char* name)
+KonqSideBarWebModule::KonqSideBarWebModule(KInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name)
 	: KonqSidebarPlugin(instance, parent, widgetParent, desktopName, name)
 {
 	_htmlPart = new KHTMLSideBar(universalMode());
-	connect(_htmlPart, SIGNAL(reload()), this, SLOT(reload()));
-	connect(_htmlPart, SIGNAL(completed()), this, SLOT(pageLoaded()));
+	connect(_htmlPart, TQT_SIGNAL(reload()), this, TQT_SLOT(reload()));
+	connect(_htmlPart, TQT_SIGNAL(completed()), this, TQT_SLOT(pageLoaded()));
 	connect(_htmlPart,
-		SIGNAL(setWindowCaption(const QString&)),
+		TQT_SIGNAL(setWindowCaption(const TQString&)),
 		this,
-		SLOT(setTitle(const QString&)));
+		TQT_SLOT(setTitle(const TQString&)));
 	connect(_htmlPart,
-		SIGNAL(openURLRequest(const QString&, KParts::URLArgs)),
+		TQT_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)),
 		this,
-		SLOT(urlClicked(const QString&, KParts::URLArgs)));
+		TQT_SLOT(urlClicked(const TQString&, KParts::URLArgs)));
 	connect(_htmlPart->browserExtension(),
-		SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
+		TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
 		this,
-		SLOT(formClicked(const KURL&, const KParts::URLArgs&)));
+		TQT_SLOT(formClicked(const KURL&, const KParts::URLArgs&)));
 	connect(_htmlPart,
-		SIGNAL(setAutoReload()), this, SLOT( setAutoReload() ));
+		TQT_SIGNAL(setAutoReload()), this, TQT_SLOT( setAutoReload() ));
 	connect(_htmlPart,
-		SIGNAL(openURLNewWindow(const QString&, KParts::URLArgs)),
+		TQT_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)),
 		this,
-		SLOT(urlNewWindow(const QString&, KParts::URLArgs)));
+		TQT_SLOT(urlNewWindow(const TQString&, KParts::URLArgs)));
 	connect(_htmlPart,
-		SIGNAL(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)),
+		TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
 		this,
-		SIGNAL(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)));
+		TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
 
 	_desktopName = desktopName;
 
@@ -69,7 +69,7 @@ KonqSideBarWebModule::KonqSideBarWebModule(KInstance *instance, QObject *parent,
 	_url = ksc.readPathEntry("URL");
 	_htmlPart->openURL(_url );
 	// Must load this delayed
-	QTimer::singleShot(0, this, SLOT(loadFavicon()));
+	TQTimer::singleShot(0, this, TQT_SLOT(loadFavicon()));
 }
 
 
@@ -79,18 +79,18 @@ KonqSideBarWebModule::~KonqSideBarWebModule() {
 }
 
 
-QWidget *KonqSideBarWebModule::getWidget() {
+TQWidget *KonqSideBarWebModule::getWidget() {
 	return _htmlPart->widget();
 }
 
 void KonqSideBarWebModule::setAutoReload(){
 	KDialogBase dlg(0, "", true, i18n("Set Refresh Timeout (0 disables)"),
 			KDialogBase::Ok|KDialogBase::Cancel);
-	QHBox *hbox = dlg.makeHBoxMainWidget();
+	TQHBox *hbox = dlg.makeHBoxMainWidget();
 	
-	QSpinBox *mins = new QSpinBox( 0, 120, 1, hbox );
+	TQSpinBox *mins = new TQSpinBox( 0, 120, 1, hbox );
 	mins->setSuffix( i18n(" min") );
-	QSpinBox *secs = new QSpinBox( 0, 59, 1, hbox );
+	TQSpinBox *secs = new TQSpinBox( 0, 59, 1, hbox );
 	secs->setSuffix( i18n(" sec") );
 
 	if( reloadTimeout > 0 )	{
@@ -99,7 +99,7 @@ void KonqSideBarWebModule::setAutoReload(){
 		mins->setValue( ( seconds - secs->value() ) / 60 );
 	}
 	
-	if( dlg.exec() == QDialog::Accepted ) {
+	if( dlg.exec() == TQDialog::Accepted ) {
 		int msec = ( mins->value() * 60 + secs->value() ) * 1000;
 		reloadTimeout = msec;
 		KSimpleConfig ksc(_desktopName);
@@ -109,7 +109,7 @@ void KonqSideBarWebModule::setAutoReload(){
 	}
 }
 
-void *KonqSideBarWebModule::provides(const QString &) {
+void *KonqSideBarWebModule::provides(const TQString &) {
 	return 0L;
 }
 
@@ -118,13 +118,13 @@ void KonqSideBarWebModule::handleURL(const KURL &) {
 }
 
 
-void KonqSideBarWebModule::urlNewWindow(const QString& url, KParts::URLArgs args)
+void KonqSideBarWebModule::urlNewWindow(const TQString& url, KParts::URLArgs args)
 {
 	emit createNewWindow(KURL(url), args);
 }
 
 
-void KonqSideBarWebModule::urlClicked(const QString& url, KParts::URLArgs args) 
+void KonqSideBarWebModule::urlClicked(const TQString& url, KParts::URLArgs args) 
 {
 	emit openURLRequest(KURL(url), args);
 }
@@ -138,7 +138,7 @@ void KonqSideBarWebModule::formClicked(const KURL& url, const KParts::URLArgs& a
 
 
 void KonqSideBarWebModule::loadFavicon() {
-	QString icon = KonqPixmapProvider::iconForURL(_url.url());
+	TQString icon = KonqPixmapProvider::iconForURL(_url.url());
 	if (icon.isEmpty()) {
 		KonqFavIconMgr::downloadHostIcon(_url);
 		icon = KonqPixmapProvider::iconForURL(_url.url());
@@ -161,7 +161,7 @@ void KonqSideBarWebModule::reload() {
 }
 
 
-void KonqSideBarWebModule::setTitle(const QString& title) {
+void KonqSideBarWebModule::setTitle(const TQString& title) {
 	if (!title.isEmpty()) {
 		emit setCaption(title);
 
@@ -176,27 +176,27 @@ void KonqSideBarWebModule::setTitle(const QString& title) {
 
 void KonqSideBarWebModule::pageLoaded() {
 	if( reloadTimeout > 0 ) {
-		QTimer::singleShot( reloadTimeout, this, SLOT( reload() ) );
+		TQTimer::singleShot( reloadTimeout, this, TQT_SLOT( reload() ) );
 	}
 }
 
 
 extern "C" {
-	KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(KInstance *instance, QObject *parent, QWidget *widget, QString &desktopName, const char *name) {
+	KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(KInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) {
 		return new KonqSideBarWebModule(instance, parent, widget, desktopName, name);
 	}
 }
 
 
 extern "C" {
-	KDE_EXPORT bool add_konqsidebar_web(QString* fn, QString* param, QMap<QString,QString> *map) {
+	KDE_EXPORT bool add_konqsidebar_web(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) {
 		Q_UNUSED(param);
 		KGlobal::dirs()->addResourceType("websidebardata", KStandardDirs::kde_default("data") + "konqsidebartng/websidebar");
 		KURL url;
 		url.setProtocol("file");
-		QStringList paths = KGlobal::dirs()->resourceDirs("websidebardata");
-		for (QStringList::Iterator i = paths.begin(); i != paths.end(); ++i) {
-			if (QFileInfo(*i + "websidebar.html").exists()) {
+		TQStringList paths = KGlobal::dirs()->resourceDirs("websidebardata");
+		for (TQStringList::Iterator i = paths.begin(); i != paths.end(); ++i) {
+			if (TQFileInfo(*i + "websidebar.html").exists()) {
 				url.setPath(*i + "websidebar.html");
 				break;
 			}
diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h
index 58650b309..eb10414a9 100644
--- a/konqueror/sidebar/web_module/web_module.h
+++ b/konqueror/sidebar/web_module/web_module.h
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <konqsidebarplugin.h>
 #include <kpopupmenu.h>
-#include <qobject.h>
+#include <tqobject.h>
 
 
 // A wrapper for KHTMLPart to make it behave the way we want it to.
@@ -41,9 +41,9 @@ class KHTMLSideBar : public KHTMLPart
 
 			setFormNotification(KHTMLPart::Only);
 			connect(this,
-				SIGNAL(formSubmitNotification(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)),
+				TQT_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
 				this,
-				SLOT(formProxy(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&))
+				TQT_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))
 				);
 
 
@@ -51,36 +51,36 @@ class KHTMLSideBar : public KHTMLPart
 					"link context menu");
 			if (!universal) {
 				_linkMenu->insertItem(i18n("&Open Link"),
-						this, SLOT(loadPage()));
+						this, TQT_SLOT(loadPage()));
 				_linkMenu->insertItem(i18n("Open in New &Window"),
-						this, SLOT(loadNewWindow()));
+						this, TQT_SLOT(loadNewWindow()));
 			} else {
 				_linkMenu->insertItem(i18n("Open in New &Window"),
-						this, SLOT(loadPage()));
+						this, TQT_SLOT(loadPage()));
 			}
 			_menu = new KPopupMenu(widget(), "context menu");
 			_menu->insertItem(SmallIcon("reload"), i18n("&Reload"),
-					this, SIGNAL(reload()));
-			_menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"),                                                  this, SIGNAL(setAutoReload()));
+					this, TQT_SIGNAL(reload()));
+			_menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"),                                                  this, TQT_SIGNAL(setAutoReload()));
 
 			connect(this,
-				SIGNAL(popupMenu(const QString&,const QPoint&)),
+				TQT_SIGNAL(popupMenu(const TQString&,const TQPoint&)),
 				this,
-				SLOT(showMenu(const QString&, const QPoint&)));
+				TQT_SLOT(showMenu(const TQString&, const TQPoint&)));
 
 		}
 		virtual ~KHTMLSideBar() {}
 
 	signals:
-		void submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&);
-		void openURLRequest(const QString& url, KParts::URLArgs args);
-		void openURLNewWindow(const QString& url, KParts::URLArgs args);
+		void submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&);
+		void openURLRequest(const TQString& url, KParts::URLArgs args);
+		void openURLNewWindow(const TQString& url, KParts::URLArgs args);
 		void reload();
 		void setAutoReload();
 
 	protected:
-		virtual void urlSelected( const QString &url, int button,
-				int state, const QString &_target,
+		virtual void urlSelected( const TQString &url, int button,
+				int state, const TQString &_target,
 				KParts::URLArgs args = KParts::URLArgs()) {
 			if (button == LeftButton ){
 				if (_target.lower() == "_self") {
@@ -116,7 +116,7 @@ class KHTMLSideBar : public KHTMLPart
 						KParts::URLArgs());
 		}
 
-		void showMenu(const QString& url, const QPoint& pos) {
+		void showMenu(const TQString& url, const TQPoint& pos) {
 			if (url.isEmpty()) {
 				_menu->popup(pos);
 			} else {
@@ -126,15 +126,15 @@ class KHTMLSideBar : public KHTMLPart
 		}
 
 		void formProxy(const char *action,
-				const QString& url,
-				const QByteArray& formData,
-				const QString& target,
-				const QString& contentType,
-				const QString& boundary) {
-			QString t = target.lower();
-			QString u;
-
-			if (QCString(action).lower() != "post") {
+				const TQString& url,
+				const TQByteArray& formData,
+				const TQString& target,
+				const TQString& contentType,
+				const TQString& boundary) {
+			TQString t = target.lower();
+			TQString u;
+
+			if (TQCString(action).lower() != "post") {
 				// GET
 				KURL kurl = completeURL(url);
 				kurl.setQuery(formData.data());
@@ -157,7 +157,7 @@ class KHTMLSideBar : public KHTMLPart
 		}
 	private:
 		KPopupMenu *_menu, *_linkMenu;
-		QString _lastUrl;
+		TQString _lastUrl;
 };
 
 
@@ -166,28 +166,28 @@ class KonqSideBarWebModule : public KonqSidebarPlugin
 {
 	Q_OBJECT
 	public:
-		KonqSideBarWebModule(KInstance *instance, QObject *parent,
-			       	QWidget *widgetParent, QString &desktopName,
+		KonqSideBarWebModule(KInstance *instance, TQObject *parent,
+			       	TQWidget *widgetParent, TQString &desktopName,
 			       	const char *name);
 		virtual ~KonqSideBarWebModule();
 
-		virtual QWidget *getWidget();
-		virtual void *provides(const QString &);
+		virtual TQWidget *getWidget();
+		virtual void *provides(const TQString &);
 
 	signals:
-		void submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&);
+		void submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&);
 		void openURLRequest(const KURL &url, const KParts::URLArgs &args);
 		void createNewWindow(const KURL &url, const KParts::URLArgs &args);
 	protected:
 		virtual void handleURL(const KURL &url);
 
 	private slots:
-		void urlClicked(const QString& url, KParts::URLArgs args);
+		void urlClicked(const TQString& url, KParts::URLArgs args);
 		void formClicked(const KURL& url, const KParts::URLArgs& args);
-		void urlNewWindow(const QString& url, KParts::URLArgs args);
+		void urlNewWindow(const TQString& url, KParts::URLArgs args);
 		void pageLoaded();
 		void loadFavicon();
-		void setTitle(const QString&);
+		void setTitle(const TQString&);
 		void setAutoReload();
 		void reload();
 
@@ -195,7 +195,7 @@ class KonqSideBarWebModule : public KonqSidebarPlugin
 		KHTMLSideBar *_htmlPart;
 		KURL _url;
 		int reloadTimeout;
-		QString _desktopName;
+		TQString _desktopName;
 };
 
 #endif