From f008adb5a77e094eaf6abf3fc0f36958e66896a5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 25 Jun 2011 05:28:35 +0000 Subject: TQt4 port koffice This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kexi/plugins/relations/kexirelationmaindlg.cpp | 20 ++++++++++---------- kexi/plugins/relations/kexirelationmaindlg.h | 9 +++++---- kexi/plugins/relations/kexirelationpartimpl.cpp | 14 +++++++------- kexi/plugins/relations/kexirelationpartimpl.h | 13 +++++++------ 4 files changed, 29 insertions(+), 27 deletions(-) (limited to 'kexi/plugins/relations') diff --git a/kexi/plugins/relations/kexirelationmaindlg.cpp b/kexi/plugins/relations/kexirelationmaindlg.cpp index 6b14fffa..ded97e1c 100644 --- a/kexi/plugins/relations/kexirelationmaindlg.cpp +++ b/kexi/plugins/relations/kexirelationmaindlg.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include @@ -32,8 +32,8 @@ #include "kexirelationwidget.h" #include "kexirelationview.h" -KexiRelationMainDlg::KexiRelationMainDlg(KexiMainWindow *mainWin, QWidget *parent, const char *name) - : KexiViewBase(mainWin, parent, name) +KexiRelationMainDlg::KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name) + : KexiViewBase(mainWin, tqparent, name) { kdDebug() << "KexiRelationMainDlg()" << endl; // setIcon(SmallIcon("relation")); @@ -46,13 +46,13 @@ KexiRelationMainDlg::KexiRelationMainDlg(KexiMainWindow *mainWin, QWidget *paren addActionProxyChild( m_rel ); // addActionProxyChild( m_view->relationView() ); - QVBoxLayout *g = new QVBoxLayout(this); + TQVBoxLayout *g = new TQVBoxLayout(this); g->addWidget(m_rel); //show all tables KexiDB::Connection *conn = mainWin->project()->dbConnection(); - QStringList tables = conn->tableNames(); - for (QStringList::ConstIterator it = tables.constBegin(); it!=tables.constEnd(); ++it) { + TQStringList tables = conn->tableNames(); + for (TQStringList::ConstIterator it = tables.constBegin(); it!=tables.constEnd(); ++it) { m_rel->addTable( *it ); } } @@ -61,18 +61,18 @@ KexiRelationMainDlg::~KexiRelationMainDlg() { } -QSize KexiRelationMainDlg::sizeHint() const +TQSize KexiRelationMainDlg::tqsizeHint() const { - return QSize(600,300); + return TQSize(600,300); } -QWidget* +TQWidget* KexiRelationMainDlg::mainWidget() { return m_rel; } -QString KexiRelationMainDlg::itemIcon() +TQString KexiRelationMainDlg::itemIcon() { return "relation"; } diff --git a/kexi/plugins/relations/kexirelationmaindlg.h b/kexi/plugins/relations/kexirelationmaindlg.h index 791d6544..4dbc7698 100644 --- a/kexi/plugins/relations/kexirelationmaindlg.h +++ b/kexi/plugins/relations/kexirelationmaindlg.h @@ -28,16 +28,17 @@ class KexiRelationWidget; class KexiRelationMainDlg : public KexiViewBase { Q_OBJECT + TQ_OBJECT public: - KexiRelationMainDlg(KexiMainWindow *mainWin, QWidget *parent, const char *name = 0); + KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0); ~KexiRelationMainDlg(); - virtual QSize sizeHint() const; + virtual TQSize tqsizeHint() const; - virtual QWidget* mainWidget(); + virtual TQWidget* mainWidget(); - virtual QString itemIcon(); + virtual TQString itemIcon(); private: KexiRelationWidget *m_rel; diff --git a/kexi/plugins/relations/kexirelationpartimpl.cpp b/kexi/plugins/relations/kexirelationpartimpl.cpp index a2a7c213..9d08527b 100644 --- a/kexi/plugins/relations/kexirelationpartimpl.cpp +++ b/kexi/plugins/relations/kexirelationpartimpl.cpp @@ -28,8 +28,8 @@ #include #include -KexiRelationPartImpl::KexiRelationPartImpl(QObject *parent, const char *name, const QStringList &args) - : KexiInternalPart(parent, name, args) +KexiRelationPartImpl::KexiRelationPartImpl(TQObject *tqparent, const char *name, const TQStringList &args) + : KexiInternalPart(tqparent, name, args) { kdDebug() << "KexiRelationPartImpl()" << endl; } @@ -38,11 +38,11 @@ KexiRelationPartImpl::~KexiRelationPartImpl() { } -/*QWidget * +/*TQWidget * KexiRelationPartImpl::createWidget(const char* , KexiMainWindow* mainWin, - QWidget *parent, const char *objName) + TQWidget *tqparent, const char *objName) { - return new KexiRelationWidget(mainWin, parent, objName); + return new KexiRelationWidget(mainWin, tqparent, objName); }*/ /*KexiDialogBase * @@ -62,14 +62,14 @@ KexiRelationPartImpl::createDialog(KexiMainWindow* mainWin, const char *) }*/ KexiViewBase * -KexiRelationPartImpl::createView(KexiMainWindow* mainWin, QWidget *parent, const char *) +KexiRelationPartImpl::createView(KexiMainWindow* mainWin, TQWidget *tqparent, const char *) { // kdDebug() << "KexiRelationPartImpl::createDialog()" << endl; // KexiDialogBase * dlg = new KexiDialogBase(mainWin, i18n("Relations")); // dlg->setIcon(SmallIcon("relation")); // dlg->setDocID( mainWin->generatePrivateDocID() ); - KexiRelationMainDlg *view = new KexiRelationMainDlg(mainWin, parent, "relations"); + KexiRelationMainDlg *view = new KexiRelationMainDlg(mainWin, tqparent, "relations"); // dlg->addView(view); // dlg->show(); // dlg->registerDialog(); diff --git a/kexi/plugins/relations/kexirelationpartimpl.h b/kexi/plugins/relations/kexirelationpartimpl.h index b5b5438e..58ee5674 100644 --- a/kexi/plugins/relations/kexirelationpartimpl.h +++ b/kexi/plugins/relations/kexirelationpartimpl.h @@ -25,20 +25,21 @@ class KexiRelationPartImpl : public KexiInternalPart { Q_OBJECT + TQ_OBJECT public: - KexiRelationPartImpl(QObject *parent, const char *name, const QStringList &args); + KexiRelationPartImpl(TQObject *tqparent, const char *name, const TQStringList &args); virtual ~KexiRelationPartImpl(); protected: -// virtual QWidget *createWidget(const char* widgetClass, KexiMainWindow* mainWin, -// QWidget *parent, const char *objName=0); +// virtual TQWidget *createWidget(const char* widgetClass, KexiMainWindow* mainWin, +// TQWidget *tqparent, const char *objName=0); - virtual KexiViewBase *createView(KexiMainWindow* mainWin, QWidget *parent, + virtual KexiViewBase *createView(KexiMainWindow* mainWin, TQWidget *tqparent, const char *objName=0); - //virtual KexiDialogBase *createWindow(KexiMainWindow *parent); - //virtual QWidget *createWidget(QWidget *parent, KexiMainWindow *win); + //virtual KexiDialogBase *createWindow(KexiMainWindow *tqparent); + //virtual TQWidget *createWidget(TQWidget *tqparent, KexiMainWindow *win); }; #endif -- cgit v1.2.1