diff options
Diffstat (limited to 'kexi/plugins/macros/kexipart')
-rw-r--r-- | kexi/plugins/macros/kexipart/keximacrodesignview.cpp | 90 | ||||
-rw-r--r-- | kexi/plugins/macros/kexipart/keximacrodesignview.h | 11 | ||||
-rw-r--r-- | kexi/plugins/macros/kexipart/keximacroerror.cpp | 22 | ||||
-rw-r--r-- | kexi/plugins/macros/kexipart/keximacroerror.h | 9 | ||||
-rw-r--r-- | kexi/plugins/macros/kexipart/keximacroerrorbase.ui | 32 | ||||
-rw-r--r-- | kexi/plugins/macros/kexipart/keximacropart.cpp | 22 | ||||
-rw-r--r-- | kexi/plugins/macros/kexipart/keximacropart.h | 17 | ||||
-rw-r--r-- | kexi/plugins/macros/kexipart/keximacroproperty.cpp | 242 | ||||
-rw-r--r-- | kexi/plugins/macros/kexipart/keximacroproperty.h | 44 | ||||
-rw-r--r-- | kexi/plugins/macros/kexipart/keximacrotextview.cpp | 20 | ||||
-rw-r--r-- | kexi/plugins/macros/kexipart/keximacrotextview.h | 5 | ||||
-rw-r--r-- | kexi/plugins/macros/kexipart/keximacroview.cpp | 34 | ||||
-rw-r--r-- | kexi/plugins/macros/kexipart/keximacroview.h | 7 |
13 files changed, 281 insertions, 274 deletions
diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp index 030be0cb..4d480365 100644 --- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp @@ -18,8 +18,8 @@ #include "keximacrodesignview.h" #include "keximacroproperty.h" -#include <qtimer.h> -#include <qdom.h> +#include <tqtimer.h> +#include <tqdom.h> #include <kdebug.h> #include <kexidialogbase.h> @@ -107,8 +107,8 @@ class KexiMacroDesignView::Private }; -KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, QWidget *parent, ::KoMacro::Macro* const macro) - : KexiMacroView(mainwin, parent, macro, "KexiMacroDesignView") +KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro) + : KexiMacroView(mainwin, tqparent, macro, "KexiMacroDesignView") , d( new Private() ) { // The table's data-model. @@ -123,19 +123,19 @@ KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, QWidget *paren KexiDB::Field::NoOptions, // options 0, // length 0, // precision - QVariant(), // default value + TQVariant(), // default value i18n("Action"), // caption - QString::null, // description + TQString(), // description 0 // width ); d->tabledata->addColumn(actioncol); - QValueVector<QString> items; + TQValueVector<TQString> items; items.append(""); // empty means no action // Append the list of actions provided by Kexi. - QStringList actionnames = KoMacro::Manager::self()->actionNames(); - QStringList::ConstIterator it, end( actionnames.constEnd() ); + TQStringList actionnames = KoMacro::Manager::self()->actionNames(); + TQStringList::ConstIterator it, end( actionnames.constEnd() ); for( it = actionnames.constBegin(); it != end; ++it) { KSharedPtr<KoMacro::Action> action = KoMacro::Manager::self()->action(*it); items.append( action->text() ); @@ -151,16 +151,16 @@ KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, QWidget *paren KexiDB::Field::NoOptions, // options 0, // length 0, // precision - QVariant(), // default value + TQVariant(), // default value i18n("Comment"), // caption - QString::null, // description + TQString(), // description 0 // width ) ); // Create the tableview. - QHBoxLayout* layout = new QHBoxLayout(this); + TQHBoxLayout* tqlayout = new TQHBoxLayout(this); d->datatable = new KexiDataTable(mainWin(), this, "Macro KexiDataTable", false /*not db aware*/); - layout->addWidget(d->datatable); + tqlayout->addWidget(d->datatable); d->tableview = d->datatable->tableView(); d->tableview->setSpreadSheetMode(); d->tableview->setColumnStretchEnabled( true, COLUMN_ID_COMMENT ); //last column occupies the rest of the area @@ -173,14 +173,14 @@ KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, QWidget *paren d->propertyset = new KexiDataAwarePropertySet(this, d->tableview); // Connect signals the KexiDataTable provides to local slots. - connect(d->tabledata, SIGNAL(aboutToChangeCell(KexiTableItem*,int,QVariant&,KexiDB::ResultInfo*)), - this, SLOT(beforeCellChanged(KexiTableItem*,int,QVariant&,KexiDB::ResultInfo*))); - connect(d->tabledata, SIGNAL(rowUpdated(KexiTableItem*)), - this, SLOT(rowUpdated(KexiTableItem*))); - connect(d->tabledata, SIGNAL(rowInserted(KexiTableItem*,uint,bool)), - this, SLOT(rowInserted(KexiTableItem*,uint,bool))); - connect(d->tabledata, SIGNAL(rowDeleted()), - this, SLOT(rowDeleted())); + connect(d->tabledata, TQT_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)), + this, TQT_SLOT(beforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*))); + connect(d->tabledata, TQT_SIGNAL(rowUpdated(KexiTableItem*)), + this, TQT_SLOT(rowUpdated(KexiTableItem*))); + connect(d->tabledata, TQT_SIGNAL(rowInserted(KexiTableItem*,uint,bool)), + this, TQT_SLOT(rowInserted(KexiTableItem*,uint,bool))); + connect(d->tabledata, TQT_SIGNAL(rowDeleted()), + this, TQT_SLOT(rowDeleted())); // Everything is ready. So, update the data now. updateData(); @@ -207,7 +207,7 @@ void KexiMacroDesignView::updateData() } // Set the MacroItem's - QStringList actionnames = KoMacro::Manager::self()->actionNames(); + TQStringList actionnames = KoMacro::Manager::self()->actionNames(); KoMacro::MacroItem::List macroitems = macro()->items(); KoMacro::MacroItem::List::ConstIterator it(macroitems.constBegin()), end(macroitems.constEnd()); for(uint idx = 0; it != end; ++it, idx++) { @@ -259,12 +259,12 @@ KoProperty::Set* KexiMacroDesignView::propertySet() return d->propertyset->currentPropertySet(); } -void KexiMacroDesignView::beforeCellChanged(KexiTableItem* item, int colnum, QVariant& newvalue, KexiDB::ResultInfo* result) +void KexiMacroDesignView::beforeCellChanged(KexiTableItem* item, int colnum, TQVariant& newvalue, KexiDB::ResultInfo* result) { Q_UNUSED(result); kdDebug() << "KexiMacroDesignView::beforeCellChanged() colnum=" << colnum << " newvalue=" << newvalue.toString() << endl; - int rowindex = d->tabledata->findRef(item); + int rowindex = d->tabledata->tqfindRef(item); if(rowindex < 0) { kdWarning() << "KexiMacroDesignView::beforeCellChanged() No such item" << endl; return; @@ -286,11 +286,11 @@ void KexiMacroDesignView::beforeCellChanged(KexiTableItem* item, int colnum, QVa // Handle the column that should be changed switch(colnum) { case COLUMN_ID_ACTION: { // The "Action" column - QString actionname; + TQString actionname; bool ok; int selectedindex = newvalue.toInt(&ok); if(ok && selectedindex > 0) { - QStringList actionnames = KoMacro::Manager::self()->actionNames(); + TQStringList actionnames = KoMacro::Manager::self()->actionNames(); actionname = actionnames[ selectedindex - 1 ]; // first item is empty } KSharedPtr<KoMacro::Action> action = KoMacro::Manager::self()->action(actionname); @@ -311,7 +311,7 @@ void KexiMacroDesignView::beforeCellChanged(KexiTableItem* item, int colnum, QVa void KexiMacroDesignView::rowUpdated(KexiTableItem* item) { - int rowindex = d->tabledata->findRef(item); + int rowindex = d->tabledata->tqfindRef(item); kdDebug() << "KexiMacroDesignView::rowUpdated() rowindex=" << rowindex << endl; //propertySetSwitched(); //propertySetReloaded(true); @@ -347,7 +347,7 @@ void KexiMacroDesignView::rowDeleted() macroitems.remove( macroitems.at(rowindex) ); } -bool KexiMacroDesignView::updateSet(KoProperty::Set* set, KSharedPtr<KoMacro::MacroItem> macroitem, const QString& variablename) +bool KexiMacroDesignView::updateSet(KoProperty::Set* set, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& variablename) { kdDebug() << "KexiMacroDesignView::updateSet() variablename=" << variablename << endl; KoProperty::Property* property = KexiMacroProperty::createProperty(macroitem, variablename); @@ -382,8 +382,8 @@ void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, KShare // if there exists no such propertyset yet, create one. set = new KoProperty::Set(d->propertyset, action->name()); d->propertyset->insert(row, set, true); - connect(set, SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), - this, SLOT(propertyChanged(KoProperty::Set&, KoProperty::Property&))); + connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), + this, TQT_SLOT(propertyChanged(KoProperty::Set&, KoProperty::Property&))); } // The caption. @@ -392,8 +392,8 @@ void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, KShare set->addProperty(prop); // Display the list of variables. - QStringList varnames = action->variableNames(); - for(QStringList::Iterator it = varnames.begin(); it != varnames.end(); ++it) { + TQStringList varnames = action->variableNames(); + for(TQStringList::Iterator it = varnames.begin(); it != varnames.end(); ++it) { if(updateSet(set, macroitem, *it)) { KSharedPtr<KoMacro::Variable> variable = macroitem->variable(*it, true); kdDebug()<<"KexiMacroDesignView::updateProperties() name=" << *it << " variable=" << variable->variant().toString() << endl; @@ -418,7 +418,7 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop d->reloadsProperties = true; const int row = d->propertyset->currentRow(); - const QCString name = property.name(); + const TQCString name = property.name(); kdDebug() << "KexiMacroDesignView::propertyChanged() name=" << name << " row=" << row << endl; //TODO reload is only needed if something changed! @@ -433,26 +433,26 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop updateProperties(row, &set, macroitem); } // It's needed to call the reload delayed cause in KoProperty::Editor - // QTimer::singleShot(10, this, SLOT(selectItemLater())); may lead + // TQTimer::singleShot(10, this, TQT_SLOT(selectItemLater())); may lead // to crashes if we are to fast. - QTimer::singleShot(50, this, SLOT(reloadPropertyLater())); + TQTimer::singleShot(50, this, TQT_SLOT(reloadPropertyLater())); } d->reloadsProperties = false; */ /* - QStringList dirtyvarnames = macroitem->setVariable(name, KSharedPtr<KoMacro::Variable>(pv)); + TQStringList dirtyvarnames = macroitem->setVariable(name, KSharedPtr<KoMacro::Variable>(pv)); bool dirty = false; bool reload = false; - for(QStringList::Iterator it = dirtyvarnames.begin(); it != dirtyvarnames.end(); ++it) { + for(TQStringList::Iterator it = dirtyvarnames.begin(); it != dirtyvarnames.end(); ++it) { KSharedPtr<KoMacro::Variable> variable = macroitem->variable(*it); if(! variable.data()) { kdDebug() << "KexiMacroDesignView::propertyChanged() name=" << name << " it=" << *it << " skipped cause such a variable is not known." << endl; continue; } - if(! set.contains( (*it).latin1() )) { + if(! set.tqcontains( (*it).latin1() )) { // If there exist no such property yet, we need to add it. if(updateSet(&set, macroitem, *it)) reload = true; // we like to reload the whole set @@ -461,12 +461,12 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop kdDebug() << "KexiMacroDesignView::propertyChanged() set existing property=" << *it << endl; KoProperty::Property& p = set.property((*it).latin1()); - KoMacro::Variable::List children = variable->children(); - if(children.count() > 0) { - QStringList keys, names; - KoMacro::Variable::List::Iterator childit(children.begin()), childend(children.end()); + KoMacro::Variable::List tqchildren = variable->tqchildren(); + if(tqchildren.count() > 0) { + TQStringList keys, names; + KoMacro::Variable::List::Iterator childit(tqchildren.begin()), childend(tqchildren.end()); for(; childit != childend; ++childit) { - const QString s = (*childit)->variant().toString(); + const TQString s = (*childit)->variant().toString(); keys << s; names << s; } @@ -480,8 +480,8 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop // need to reload the whole set. for(KoProperty::Set::Iterator setit = set; setit.current(); ++setit) { if(setit.currentKey() == name) continue; // don't remove ourself - if(setit.currentKey().left(5) == QCString("this:")) continue; // don't remove internal properties - if(setit.currentKey() == QCString("newrow")) continue; // also an internal used property + if(setit.currentKey().left(5) == TQCString("this:")) continue; // don't remove internal properties + if(setit.currentKey() == TQCString("newrow")) continue; // also an internal used property if(action.data() && action->hasVariable(setit.currentKey())) continue; // the property is still valid reload = true; // we like to reload the whole set } diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.h b/kexi/plugins/macros/kexipart/keximacrodesignview.h index c3eca2d2..e982f1bd 100644 --- a/kexi/plugins/macros/kexipart/keximacrodesignview.h +++ b/kexi/plugins/macros/kexipart/keximacrodesignview.h @@ -41,6 +41,7 @@ class KexiTableItem; class KexiMacroDesignView : public KexiMacroView { Q_OBJECT + TQ_OBJECT public: /** @@ -48,10 +49,10 @@ class KexiMacroDesignView : public KexiMacroView * * \param mainwin The \a KexiMainWindow instance this \a KexiViewBase * belongs to. - * \param parent The parent widget this widget should be displayed in. + * \param tqparent The tqparent widget this widget should be displayed in. * \param macro The \a KoMacro::Macro instance this view is for. */ - KexiMacroDesignView(KexiMainWindow *mainwin, QWidget *parent, ::KoMacro::Macro* const macro); + KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro); /** * Destructor. @@ -75,7 +76,7 @@ class KexiMacroDesignView : public KexiMacroView * Called before a cell changed in the internaly used * \a KexiTableView . */ - void beforeCellChanged(KexiTableItem*, int, QVariant&, KexiDB::ResultInfo*); + void beforeCellChanged(KexiTableItem*, int, TQVariant&, KexiDB::ResultInfo*); /** * Called if the passed \p item got updated. @@ -90,7 +91,7 @@ class KexiMacroDesignView : public KexiMacroView /** * Called if a row got inserted. */ - void rowInserted(KexiTableItem* item, uint row, bool repaint); + void rowInserted(KexiTableItem* item, uint row, bool tqrepaint); /** * Called if a property in the \a KoProperty got changed. @@ -117,7 +118,7 @@ class KexiMacroDesignView : public KexiMacroView * Update the \a KoProperty::Set set with the passed \a KoMacro::MacroItem * \p item and the variablename \p variablename . */ - bool updateSet(KoProperty::Set* set, KSharedPtr<KoMacro::MacroItem> item, const QString& variablename); + bool updateSet(KoProperty::Set* set, KSharedPtr<KoMacro::MacroItem> item, const TQString& variablename); /** * Update the properties of the \a KoProperty::Set \p set at diff --git a/kexi/plugins/macros/kexipart/keximacroerror.cpp b/kexi/plugins/macros/kexipart/keximacroerror.cpp index 15f4df3f..f6422be9 100644 --- a/kexi/plugins/macros/kexipart/keximacroerror.cpp +++ b/kexi/plugins/macros/kexipart/keximacroerror.cpp @@ -24,7 +24,7 @@ #include <core/kexiproject.h> #include <core/keximainwindow.h> -#include <qtimer.h> +#include <tqtimer.h> /** * \internal d-pointer class to be more flexible on future extension of the @@ -44,7 +44,7 @@ class KexiMacroError::Private }; KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Context> context) - : KexiMacroErrorBase(mainwin, "KexiMacroError" , /*WFlags*/ Qt::WDestructiveClose) + : KexiMacroErrorBase(mainwin, "KexiMacroError" , /*WFlags*/ TQt::WDestructiveClose) , d(new Private(mainwin, context)) { //setText(i18n("Execution failed")); //caption @@ -53,14 +53,14 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Cont KoMacro::Exception* exception = context->exception(); iconlbl->setPixmap(KGlobal::instance()->iconLoader()->loadIcon("messagebox_critical", KIcon::Small, 32)); - errorlbl->setText(i18n("<qt>Failed to execute the macro \"%1\".<br>%2</qt>").arg( context->macro()->name() ).arg( exception->errorMessage() )); + errorlbl->setText(i18n("<qt>Failed to execute the macro \"%1\".<br>%2</qt>").tqarg( context->macro()->name() ).tqarg( exception->errorMessage() )); int i = 1; KoMacro::MacroItem::List items = context->macro()->items(); for (KoMacro::MacroItem::List::ConstIterator mit = items.begin(); mit != items.end(); mit++) { KListViewItem* listviewitem = new KListViewItem(errorlist); - listviewitem->setText(0,QString("%1").arg(i++)); + listviewitem->setText(0,TQString("%1").tqarg(i++)); listviewitem->setText(1,i18n("Action")); KSharedPtr<KoMacro::MacroItem> macroitem = *mit; @@ -86,8 +86,8 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Cont } } - connect(designerbtn, SIGNAL(clicked()), this, SLOT(designbtnClicked())); - connect(continuebtn, SIGNAL(clicked()), this, SLOT(continuebtnClicked())); + connect(designerbtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(designbtnClicked())); + connect(continuebtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(continuebtnClicked())); } KexiMacroError::~KexiMacroError() @@ -98,16 +98,16 @@ KexiMacroError::~KexiMacroError() void KexiMacroError::designbtnClicked() { if(! d->mainwin->project()) { - kdWarning() << QString("KexiMacroError::designbtnClicked(): No project open.") << endl; + kdWarning() << TQString("KexiMacroError::designbtnClicked(): No project open.") << endl; return; } // We need to determinate the KexiPart::Item which should be opened. KSharedPtr<KoMacro::Macro> macro = d->context->macro(); - const QString name = macro->name(); + const TQString name = macro->name(); KexiPart::Item* item = d->mainwin->project()->itemForMimeType("kexi/macro", name); if(! item) { - kdWarning() << QString("KexiMacroError::designbtnClicked(): No such macro \"%1\"").arg(name) << endl; + kdWarning() << TQString("KexiMacroError::designbtnClicked(): No such macro \"%1\"").tqarg(name) << endl; return; } @@ -115,7 +115,7 @@ void KexiMacroError::designbtnClicked() bool openingCancelled; if(! d->mainwin->openObject(item, Kexi::DesignViewMode, openingCancelled)) { if(! openingCancelled) { - kdWarning() << QString("KexiMacroError::designbtnClicked(): Open macro \"%1\" in designview failed.").arg(name) << endl; + kdWarning() << TQString("KexiMacroError::designbtnClicked(): Open macro \"%1\" in designview failed.").tqarg(name) << endl; return; } } @@ -125,6 +125,6 @@ void KexiMacroError::designbtnClicked() void KexiMacroError::continuebtnClicked() { - QTimer::singleShot(200, d->context, SLOT(activateNext())); + TQTimer::singleShot(200, d->context, TQT_SLOT(activateNext())); close(); } diff --git a/kexi/plugins/macros/kexipart/keximacroerror.h b/kexi/plugins/macros/kexipart/keximacroerror.h index 641859b7..d902d6a4 100644 --- a/kexi/plugins/macros/kexipart/keximacroerror.h +++ b/kexi/plugins/macros/kexipart/keximacroerror.h @@ -22,9 +22,9 @@ #ifndef KEXIMACROERROR_H #define KEXIMACROERROR_H -#include <qwidget.h> -#include <qlabel.h> -#include <qpushbutton.h> +#include <tqwidget.h> +#include <tqlabel.h> +#include <tqpushbutton.h> #include <klistview.h> #include <klocale.h> @@ -50,13 +50,14 @@ class KexiMainWindow; class KexiMacroError : public KexiMacroErrorBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor. * - * @param mainwin The parent @a KexiMainWindow instance. + * @param mainwin The tqparent @a KexiMainWindow instance. * @param context The @a KoMacro::Context where the error happened. */ KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Context> context); diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui index 74e47cfc..cc3b6754 100644 --- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui +++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KexiMacroErrorBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KexiMacroErrorBase</cstring> </property> @@ -25,23 +25,23 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <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="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>iconlbl</cstring> </property> @@ -53,7 +53,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>48</width> <height>48</height> @@ -65,11 +65,11 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>errorlbl</cstring> </property> @@ -87,7 +87,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -152,15 +152,15 @@ <number>1</number> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>designerbtn</cstring> </property> @@ -174,7 +174,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>continuebtn</cstring> </property> @@ -182,7 +182,7 @@ <string>Continue</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelbtn</cstring> </property> @@ -206,7 +206,7 @@ <slot>close()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kexi/plugins/macros/kexipart/keximacropart.cpp b/kexi/plugins/macros/kexipart/keximacropart.cpp index c4f020e4..1fddbd78 100644 --- a/kexi/plugins/macros/kexipart/keximacropart.cpp +++ b/kexi/plugins/macros/kexipart/keximacropart.cpp @@ -25,8 +25,8 @@ //#include "keximainwindow.h" //#include "kexiproject.h" -#include <qdom.h> -#include <qstringlist.h> +#include <tqdom.h> +#include <tqstringlist.h> #include <kgenericfactory.h> #include <kexipartitem.h> //#include <kxmlguiclient.h> @@ -54,8 +54,8 @@ class KexiMacroPart::Private public: }; -KexiMacroPart::KexiMacroPart(QObject *parent, const char *name, const QStringList &l) - : KexiPart::Part(parent, name, l) +KexiMacroPart::KexiMacroPart(TQObject *tqparent, const char *name, const TQStringList &l) + : KexiPart::Part(tqparent, name, l) , d( new Private() ) { //kdDebug() << "KexiMacroPart::KexiMacroPart() Ctor" << endl; @@ -83,7 +83,7 @@ KexiMacroPart::~KexiMacroPart() delete d; } -bool KexiMacroPart::execute(KexiPart::Item* item, QObject* sender) +bool KexiMacroPart::execute(KexiPart::Item* item, TQObject* sender) { KexiDialogBase* dialog = new KexiDialogBase(m_mainWin); dialog->setId( item->identifier() ); @@ -123,9 +123,9 @@ void KexiMacroPart::initInstanceActions() //createSharedAction(Kexi::DesignViewMode, i18n("Execute Macro"), "exec", 0, "data_execute"); } -KexiViewBase* KexiMacroPart::createView(QWidget* parent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode, QMap<QString,QString>*) +KexiViewBase* KexiMacroPart::createView(TQWidget* tqparent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode, TQMap<TQString,TQString>*) { - const QString itemname = item.name(); + const TQString itemname = item.name(); //kdDebug() << "KexiMacroPart::createView() itemname=" << itemname << endl; if(! itemname.isNull()) { @@ -140,14 +140,14 @@ KexiViewBase* KexiMacroPart::createView(QWidget* parent, KexiDialogBase* dialog, KexiMainWindow *win = dialog->mainWin(); if(win && win->project() && win->project()->dbConnection()) { if(viewMode == Kexi::DesignViewMode) { - return new KexiMacroDesignView(win, parent, macro); + return new KexiMacroDesignView(win, tqparent, macro); } if(viewMode == Kexi::TextViewMode) { - return new KexiMacroTextView(win, parent, macro); + return new KexiMacroTextView(win, tqparent, macro); } if(viewMode == Kexi::DataViewMode) { // Called if the macro should be executed. - return new KexiMacroView(win, parent, macro); + return new KexiMacroView(win, tqparent, macro); } } } @@ -156,7 +156,7 @@ KexiViewBase* KexiMacroPart::createView(QWidget* parent, KexiDialogBase* dialog, return 0; } -QString KexiMacroPart::i18nMessage(const QCString& englishMessage) const +TQString KexiMacroPart::i18nMessage(const TQCString& englishMessage) const { if(englishMessage=="Design of object \"%1\" has been modified.") { return i18n("Design of macro \"%1\" has been modified."); diff --git a/kexi/plugins/macros/kexipart/keximacropart.h b/kexi/plugins/macros/kexipart/keximacropart.h index 8d2d7af2..0ea70c06 100644 --- a/kexi/plugins/macros/kexipart/keximacropart.h +++ b/kexi/plugins/macros/kexipart/keximacropart.h @@ -18,7 +18,7 @@ #ifndef KEXIMACROPART_H #define KEXIMACROPART_H -//#include <qcstring.h> +//#include <tqcstring.h> #include <kexi.h> #include <kexipart.h> @@ -30,17 +30,18 @@ class KexiMacroPart : public KexiPart::Part { Q_OBJECT + TQ_OBJECT public: /** * Constructor. * - * \param parent The parent QObject this part is child of. + * \param tqparent The tqparent TQObject this part is child of. * \param name The name this part has. * \param args Optional list of arguments passed to this part. */ - KexiMacroPart(QObject *parent, const char *name, const QStringList& args); + KexiMacroPart(TQObject *tqparent, const char *name, const TQStringList& args); /** * Destructor. @@ -51,28 +52,28 @@ class KexiMacroPart : public KexiPart::Part * Implementation of the KexiPart::Part::action method used to * provide scripts as KAction's to the outside world. */ - virtual bool execute(KexiPart::Item* item, QObject* sender = 0); + virtual bool execute(KexiPart::Item* item, TQObject* sender = 0); /** * \return the i18n message for the passed \p englishMessage string. */ - virtual QString i18nMessage(const QCString& englishMessage) const; + virtual TQString i18nMessage(const TQCString& englishMessage) const; protected: /** * Create a new view. * - * \param parent The parent QWidget the new view is displayed in. + * \param tqparent The tqparent TQWidget the new view is displayed in. * \param dialog The \a KexiDialogBase the view is child of. * \param item The \a KexiPart::Item this view is for. * \param viewMode The viewmode we like to have a view for. */ - virtual KexiViewBase* createView(QWidget *parent, + virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode = Kexi::DesignViewMode, - QMap<QString,QString>* staticObjectArgs = 0); + TQMap<TQString,TQString>* staticObjectArgs = 0); /** * Initialize the part's actions. diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp index 2fdafd28..578ba69b 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp +++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp @@ -17,10 +17,10 @@ #include "keximacroproperty.h" -#include <qlayout.h> -#include <qlineedit.h> -#include <qlistbox.h> -#include <qpainter.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqlistbox.h> +#include <tqpainter.h> #include <kcombobox.h> #include <kpushbutton.h> @@ -50,11 +50,11 @@ class KexiMacroProperty::Private KSharedPtr<KoMacro::MacroItem> macroitem; /** The name the variable @a KoMacro::Variable is known as in the @a KoMacro::MacroItem defined above. */ - QString name; + TQString name; }; -KexiMacroProperty::KexiMacroProperty(KoProperty::Property* parent, KSharedPtr<KoMacro::MacroItem> macroitem, const QString& name) - : KoProperty::CustomProperty(parent) +KexiMacroProperty::KexiMacroProperty(KoProperty::Property* tqparent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) + : KoProperty::CustomProperty(tqparent) , d( new Private() ) { d->macroitem = macroitem; @@ -86,7 +86,7 @@ void KexiMacroProperty::init() } //TESTCASE!!!!!!!!!!!!!!!!!!!!!! - //if(! variable->isEnabled()) qFatal( QString("############## VARIABLE=%1").arg(variable->name()).latin1() ); + //if(! variable->isEnabled()) qFatal( TQString("############## VARIABLE=%1").tqarg(variable->name()).latin1() ); Q_ASSERT(! d->name.isNull()); m_property->setName( d->name.latin1() ); @@ -96,12 +96,12 @@ void KexiMacroProperty::init() m_property->setType( KEXIMACRO_PROPERTYEDITORTYPE ); // use our own propertytype } -KoProperty::Property* KexiMacroProperty::parentProperty() const +KoProperty::Property* KexiMacroProperty::tqparentProperty() const { return m_property; } -void KexiMacroProperty::setValue(const QVariant &value, bool rememberOldValue) +void KexiMacroProperty::setValue(const TQVariant &value, bool rememberOldValue) { Q_UNUSED(rememberOldValue); kdDebug()<<"KexiMacroProperty::setValue name="<<d->name<<" value="<<value<<" rememberOldValue="<<rememberOldValue<<endl; @@ -119,11 +119,11 @@ void KexiMacroProperty::setValue(const QVariant &value, bool rememberOldValue) emit valueChanged(); } -QVariant KexiMacroProperty::value() const +TQVariant KexiMacroProperty::value() const { KSharedPtr<KoMacro::Variable> variable = d->macroitem->variable(d->name, true); Q_ASSERT( variable.data() != 0 ); - return variable.data() ? variable->variant() : QVariant(); + return variable.data() ? variable->variant() : TQVariant(); } bool KexiMacroProperty::handleValue() const @@ -136,7 +136,7 @@ KSharedPtr<KoMacro::MacroItem> KexiMacroProperty::macroItem() const return d->macroitem; } -QString KexiMacroProperty::name() const +TQString KexiMacroProperty::name() const { return d->name; } @@ -146,7 +146,7 @@ KSharedPtr<KoMacro::Variable> KexiMacroProperty::variable() const return d->macroitem->variable(d->name, true/*checkaction*/); } -KoProperty::Property* KexiMacroProperty::createProperty(KSharedPtr<KoMacro::MacroItem> macroitem, const QString& name) +KoProperty::Property* KexiMacroProperty::createProperty(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) { KoProperty::Property* property = new KoProperty::Property(); KexiMacroProperty* customproperty = new KexiMacroProperty(property, macroitem, name); @@ -164,8 +164,8 @@ KoProperty::Property* KexiMacroProperty::createProperty(KSharedPtr<KoMacro::Macr * KexiMacroPropertyFactory */ -KexiMacroPropertyFactory::KexiMacroPropertyFactory(QObject* parent) - : KoProperty::CustomPropertyFactory(parent) +KexiMacroPropertyFactory::KexiMacroPropertyFactory(TQObject* tqparent) + : KoProperty::CustomPropertyFactory(tqparent) { } @@ -173,23 +173,23 @@ KexiMacroPropertyFactory::~KexiMacroPropertyFactory() { } -KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoProperty::Property* parent) +KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoProperty::Property* tqparent) { - kdDebug()<<"KexiMacroPropertyFactory::createCustomProperty parent="<<parent->name()<<endl; + kdDebug()<<"KexiMacroPropertyFactory::createCustomProperty tqparent="<<tqparent->name()<<endl; - KoProperty::CustomProperty* customproperty = parent->customProperty(); - KexiMacroProperty* parentcustomproperty = dynamic_cast<KexiMacroProperty*>(customproperty); - if(! parentcustomproperty) { - kdWarning() << "KexiMacroPropertyFactory::createCustomProperty() parent=" << parent->name() << " has an invalid customproperty." << endl; + KoProperty::CustomProperty* customproperty = tqparent->customProperty(); + KexiMacroProperty* tqparentcustomproperty = dynamic_cast<KexiMacroProperty*>(customproperty); + if(! tqparentcustomproperty) { + kdWarning() << "KexiMacroPropertyFactory::createCustomProperty() tqparent=" << tqparent->name() << " has an invalid customproperty." << endl; return 0; } - KSharedPtr<KoMacro::MacroItem> macroitem = parentcustomproperty->macroItem(); + KSharedPtr<KoMacro::MacroItem> macroitem = tqparentcustomproperty->macroItem(); Q_ASSERT( macroitem.data() != 0 ); - const QString name = parentcustomproperty->name(); + const TQString name = tqparentcustomproperty->name(); Q_ASSERT(! name.isEmpty()); - KexiMacroProperty* macroproperty = new KexiMacroProperty(parent, macroitem, name); + KexiMacroProperty* macroproperty = new KexiMacroProperty(tqparent, macroitem, name); if(! macroproperty->variable().data()) { delete macroproperty; macroproperty = 0; return 0; @@ -218,26 +218,26 @@ void KexiMacroPropertyFactory::initFactory() */ /** -* @internal implementation of a QListBoxItem to display the items of the +* @internal implementation of a TQListBoxItem to display the items of the * combobox used within @a KexiMacroPropertyWidget to handle variables * within a @a ListBox instance. */ -class ListBoxItem : public QListBoxText +class ListBoxItem : public TQListBoxText { public: - ListBoxItem(QListBox* listbox) - : QListBoxText(listbox), m_enabled(true) {} - ListBoxItem(QListBox* listbox, const QString& text, QListBoxItem* after) - : QListBoxText(listbox, text, after), m_enabled(true) {} + ListBoxItem(TQListBox* listbox) + : TQListBoxText(listbox), m_enabled(true) {} + ListBoxItem(TQListBox* listbox, const TQString& text, TQListBoxItem* after) + : TQListBoxText(listbox, text, after), m_enabled(true) {} virtual ~ListBoxItem() {} void setEnabled(bool enabled) { m_enabled = enabled; } - virtual int width(const QListBox* lb) const { - Q_ASSERT( dynamic_cast<KComboBox*>( lb->parent() ) ); - return static_cast<KComboBox*>( lb->parent() )->lineEdit()->width() + 2; + virtual int width(const TQListBox* lb) const { + Q_ASSERT( dynamic_cast<KComboBox*>( lb->tqparent() ) ); + return static_cast<KComboBox*>( lb->tqparent() )->lineEdit()->width() + 2; } - virtual int height(const QListBox* lb) const { - Q_ASSERT( dynamic_cast<KComboBox*>( lb->parent() ) ); - return m_enabled ? static_cast<KComboBox*>( lb->parent() )->height() + 2 : 0; + virtual int height(const TQListBox* lb) const { + Q_ASSERT( dynamic_cast<KComboBox*>( lb->tqparent() ) ); + return m_enabled ? static_cast<KComboBox*>( lb->tqparent() )->height() + 2 : 0; } private: bool m_enabled; @@ -245,13 +245,13 @@ class ListBoxItem : public QListBoxText /** * @internal implementation of a @a ListBoxItem to provide an editable -* @a KoProperty::Widget as QListBoxItem in a @a ListBox instance. +* @a KoProperty::Widget as TQListBoxItem in a @a ListBox instance. */ class EditListBoxItem : public ListBoxItem { public: - EditListBoxItem(QListBox* listbox, KexiMacroProperty* macroproperty) + EditListBoxItem(TQListBox* listbox, KexiMacroProperty* macroproperty) : ListBoxItem(listbox) , m_macroproperty(macroproperty) , m_prop(0) @@ -265,11 +265,11 @@ class EditListBoxItem : public ListBoxItem delete m_prop; } - virtual QString text() const { + virtual TQString text() const { KSharedPtr<KoMacro::Variable> variable = m_macroproperty->variable(); Q_ASSERT( variable.data() ); //kdDebug()<<"EditListBoxItem::text() text="<<variable->toString()<<endl; - Q_ASSERT( variable->toString() != QString::null ); + Q_ASSERT( variable->toString() != TQString() ); return variable->toString(); } @@ -279,13 +279,13 @@ class EditListBoxItem : public ListBoxItem KSharedPtr<KoMacro::Action> action() const { return m_macroproperty->macroItem()->action(); } protected: - virtual void paint(QPainter* p) { + virtual void paint(TQPainter* p) { if(! m_widget) return; - Q_ASSERT( dynamic_cast<KComboBox*>( listBox()->parent() ) ); + Q_ASSERT( dynamic_cast<KComboBox*>( listBox()->tqparent() ) ); const int w = width(listBox()); const int h = height(listBox()); m_widget->setFixedSize(w - 2, h - 2); - p->drawPixmap(0, 0, QPixmap::grabWidget(m_widget), 1, 1, w - 1, h - 1); + p->drawPixmap(0, 0, TQPixmap::grabWidget(m_widget), 1, 1, w - 1, h - 1); } private: @@ -297,22 +297,22 @@ class EditListBoxItem : public ListBoxItem kdWarning() << "EditListBoxItem::EditListBoxItem() Skipped cause there exists no action for macroproperty=" << m_macroproperty->name() << endl; return; } - KoProperty::Property* parentproperty = m_macroproperty->parentProperty(); - if(! parentproperty) { - kdWarning() << "EditListBoxItem::EditListBoxItem() No parentproperty defined" << endl; + KoProperty::Property* tqparentproperty = m_macroproperty->tqparentProperty(); + if(! tqparentproperty) { + kdWarning() << "EditListBoxItem::EditListBoxItem() No tqparentproperty defined" << endl; return; } KSharedPtr<KoMacro::Variable> variable = m_macroproperty->variable(); if(! variable.data()) { - kdWarning() << "EditListBoxItem::EditListBoxItem() No variable defined for property=" << parentproperty->name() << endl; + kdWarning() << "EditListBoxItem::EditListBoxItem() No variable defined for property=" << tqparentproperty->name() << endl; return; } - QVariant variant = variable->variant(); + TQVariant variant = variable->variant(); KSharedPtr<KoMacro::Variable> actionvariable = action->variable(m_macroproperty->name()); if(actionvariable.data()) { - QVariant actionvariant = actionvariable->variant(); + TQVariant actionvariant = actionvariable->variant(); Q_ASSERT( ! actionvariant.isNull() ); Q_ASSERT( variant.canCast(actionvariant.type()) ); variant.cast( actionvariant.type() ); //preserve type. @@ -320,38 +320,38 @@ class EditListBoxItem : public ListBoxItem int type = KoProperty::Auto; switch(variant.type()) { - case QVariant::UInt: - case QVariant::Int: { + case TQVariant::UInt: + case TQVariant::Int: { type = KoProperty::Integer; } break; - case QVariant::CString: - case QVariant::String: { + case TQVariant::CString: + case TQVariant::String: { type = KoProperty::String; } break; default: { - kdWarning() << "EditListBoxItem::EditListBoxItem() name=" << variable->name() << " type=" << QVariant::typeToName(variant.type()) << endl; + kdWarning() << "EditListBoxItem::EditListBoxItem() name=" << variable->name() << " type=" << TQVariant::typeToName(variant.type()) << endl; } break; } - QString name = variable->name(); + TQString name = variable->name(); Q_ASSERT(! name.isNull()); //if(name.isNull()) name = "aaaaaaaaaaaaaaaaa";//TESTCASE m_prop = new KoProperty::Property( name.latin1(), // name variant, // value variable->text(), // caption - QString::null, // description + TQString(), // description type, // type - 0 //parentproperty // parent + 0 //tqparentproperty // tqparent ); m_widget = KoProperty::FactoryManager::self()->createWidgetForProperty(m_prop); Q_ASSERT( m_widget != 0 ); - //m_widget->reparent(listBox()->viewport(), 0, QPoint(0,0)); - m_widget->reparent(listBox(), 0, QPoint(1,1)); - //layout->addWidget(m_widget, 1); + //m_widget->reparent(listBox()->viewport(), 0, TQPoint(0,0)); + m_widget->reparent(listBox(), 0, TQPoint(1,1)); + //tqlayout->addWidget(m_widget, 1); m_widget->setMinimumHeight(5); - m_widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + m_widget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); } private: @@ -361,14 +361,14 @@ class EditListBoxItem : public ListBoxItem }; /** -* @internal implementation of a @a QListBox for the combobox used within +* @internal implementation of a @a TQListBox for the combobox used within * @a KexiMacroPropertyWidget to handle different variable-states. */ -class ListBox : public QListBox +class ListBox : public TQListBox { public: - ListBox(KComboBox* parent, KexiMacroProperty* macroproperty) - : QListBox(parent) + ListBox(KComboBox* tqparent, KexiMacroProperty* macroproperty) + : TQListBox(tqparent) , m_macroproperty(macroproperty) , m_edititem(0) { @@ -388,74 +388,74 @@ class ListBox : public QListBox m_edititem = new EditListBoxItem(this, m_macroproperty); Q_ASSERT( m_edititem->widget() != 0 ); - const QString name = m_macroproperty->name(); - KoMacro::Variable::List children; + const TQString name = m_macroproperty->name(); + KoMacro::Variable::List tqchildren; { - KoMacro::Variable::List actionchildren; + KoMacro::Variable::List actiontqchildren; KSharedPtr<KoMacro::Variable> itemvar = m_macroproperty->macroItem()->variable(name,false); //kdDebug() << "KexiMacroProperty::ListBox::update() itemvar="<<(itemvar.data() ? "name:"+itemvar->name()+" value:"+itemvar->toString() : "NULL")<<endl; if(itemvar.data()) - actionchildren = itemvar->children(); + actiontqchildren = itemvar->tqchildren(); KSharedPtr<KoMacro::Action> action = m_edititem->action(); KSharedPtr<KoMacro::Variable> actionvar = action.data() ? action->variable(name) : KSharedPtr<KoMacro::Variable>(); //kdDebug() << "KexiMacroProperty::ListBox::update() actionvar="<<(actionvar.data() ? "name:"+actionvar->name()+" value:"+actionvar->toString() : "NULL")<<endl; if(actionvar.data()) - actionchildren += actionvar->children(); + actiontqchildren += actionvar->tqchildren(); - KoMacro::Variable::List::ConstIterator it(actionchildren.constBegin()), end(actionchildren.constEnd()); + KoMacro::Variable::List::ConstIterator it(actiontqchildren.constBegin()), end(actiontqchildren.constEnd()); for(; it != end; ++it) { if(name == (*it)->name()) { - KoMacro::Variable::List list = (*it)->children(); + KoMacro::Variable::List list = (*it)->tqchildren(); KoMacro::Variable::List::ConstIterator listit(list.constBegin()), listend(list.constEnd()); for(; listit != listend; ++listit) - children.append( *listit ); + tqchildren.append( *listit ); } } - if(children.count() <= 0) - children = actionchildren; + if(tqchildren.count() <= 0) + tqchildren = actiontqchildren; } /* - kdDebug() << "KexiMacroProperty::ListBox::update() name="<<name<<" childcount="<<children.count()<<endl; - KoMacro::Variable::List::ConstIterator listit(children.constBegin()), listend(children.constEnd()); + kdDebug() << "KexiMacroProperty::ListBox::update() name="<<name<<" childcount="<<tqchildren.count()<<endl; + KoMacro::Variable::List::ConstIterator listit(tqchildren.constBegin()), listend(tqchildren.constEnd()); for(; listit != listend; ++listit) { - kdDebug()<<" child name="<<(*listit)->name()<<" value="<<(*listit)->toString()<<" childcount="<<(*listit)->children().count()<<endl; + kdDebug()<<" child name="<<(*listit)->name()<<" value="<<(*listit)->toString()<<" childcount="<<(*listit)->tqchildren().count()<<endl; } */ - if(children.count() > 0) { - KoMacro::Variable::List::Iterator childit(children.begin()), childend(children.end()); + if(tqchildren.count() > 0) { + KoMacro::Variable::List::Iterator childit(tqchildren.begin()), childend(tqchildren.end()); for(; childit != childend; ++childit) { - const QString n = (*childit)->name(); + const TQString n = (*childit)->name(); //if(! n.startsWith("@")) continue; - const QVariant v = (*childit)->variant(); + const TQVariant v = (*childit)->variant(); //kdDebug() << " child name=" << n << " value=" << v << endl; switch( v.type() ) { - /* case QVariant::Map: { - const QMap<QString,QVariant> map = v.toMap(); - for(QMap<QString,QVariant>::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it) + /* case TQVariant::Map: { + const TQMap<TQString,TQVariant> map = v.toMap(); + for(TQMap<TQString,TQVariant>::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it) m_items.append(it.key()); } break; */ - case QVariant::List: { - const QValueList<QVariant> list = v.toList(); - for(QValueList<QVariant>::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it) { - const QString s = (*it).toString().stripWhiteSpace(); + case TQVariant::List: { + const TQValueList<TQVariant> list = v.toList(); + for(TQValueList<TQVariant>::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it) { + const TQString s = (*it).toString().stripWhiteSpace(); if(! s.isEmpty()) m_items.append(s); } } break; - case QVariant::StringList: { - const QStringList list = v.toStringList(); - for(QStringList::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it) + case TQVariant::StringList: { + const TQStringList list = v.toStringList(); + for(TQStringList::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it) if(! (*it).isEmpty()) m_items.append(*it); } break; default: { - const QString s = v.toString().stripWhiteSpace(); + const TQString s = v.toString().stripWhiteSpace(); if(! s.isEmpty()) m_items.append(s); } break; @@ -463,30 +463,30 @@ class ListBox : public QListBox } } - QListBoxItem* item = m_edititem; + TQListBoxItem* item = m_edititem; const uint count = m_items.count(); for(uint i = 0; i < count; i++) item = new ListBoxItem(this, m_items[i], item); } EditListBoxItem* editItem() const { return m_edititem; } - QStringList items() const { return m_items; } + TQStringList items() const { return m_items; } virtual void hide () { - QListBox::hide(); + TQListBox::hide(); for(uint i = 0; i < count(); i++) static_cast<ListBoxItem*>( item(i) )->setEnabled(false); } virtual void show() { update(); adjustSize(); - QListBox::show(); + TQListBox::show(); } private: KexiMacroProperty* m_macroproperty; EditListBoxItem* m_edititem; - QStringList m_items; + TQStringList m_items; }; /** @@ -501,13 +501,13 @@ class KexiMacroPropertyWidget::Private ListBox* listbox; }; -KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, QWidget* parent) - : KoProperty::Widget(property, parent) +KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, TQWidget* tqparent) + : KoProperty::Widget(property, tqparent) , d( new Private() ) { kdDebug() << "KexiMacroPropertyWidget::KexiMacroPropertyWidget() Ctor" << endl; - QHBoxLayout* layout = new QHBoxLayout(this, 0, 0); + TQHBoxLayout* tqlayout = new TQHBoxLayout(this, 0, 0); d->macroproperty = dynamic_cast<KexiMacroProperty*>( property->customProperty() ); if(! d->macroproperty) { @@ -516,18 +516,18 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, } d->combobox = new KComboBox(this); - layout->addWidget(d->combobox); + tqlayout->addWidget(d->combobox); d->listbox = new ListBox(d->combobox, d->macroproperty); d->combobox->setEditable(true); d->combobox->setListBox(d->listbox); - d->combobox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + d->combobox->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); d->combobox->setMinimumHeight(5); - d->combobox->setInsertionPolicy(QComboBox::NoInsertion); + d->combobox->setInsertionPolicy(TQComboBox::NoInsertion); d->combobox->setMinimumSize(10, 0); // to allow the combo to be resized to a small size d->combobox->setAutoCompletion(false); d->combobox->setContextMenuEnabled(false); - QVariant value = d->macroproperty->value(); + TQVariant value = d->macroproperty->value(); int index = d->listbox->items().findIndex( value.toString() ); if(index >= 0) { d->combobox->setCurrentItem(index + 1); @@ -543,14 +543,14 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, d->combobox->setFocusProxy( d->listbox->editItem()->widget() ); setFocusWidget( d->combobox->lineEdit() ); - connect(d->combobox, SIGNAL(textChanged(const QString&)), - this, SLOT(slotComboBoxChanged())); - connect(d->combobox, SIGNAL(activated(int)), - this, SLOT(slotComboBoxActivated())); - connect(d->listbox->editItem()->widget(), SIGNAL(valueChanged(Widget*)), - this, SLOT(slotWidgetValueChanged())); - connect(d->macroproperty, SIGNAL(valueChanged()), - this, SLOT(slotPropertyValueChanged())); + connect(d->combobox, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotComboBoxChanged())); + connect(d->combobox, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotComboBoxActivated())); + connect(d->listbox->editItem()->widget(), TQT_SIGNAL(valueChanged(Widget*)), + this, TQT_SLOT(slotWidgetValueChanged())); + connect(d->macroproperty, TQT_SIGNAL(valueChanged()), + this, TQT_SLOT(slotPropertyValueChanged())); } KexiMacroPropertyWidget::~KexiMacroPropertyWidget() @@ -559,23 +559,23 @@ KexiMacroPropertyWidget::~KexiMacroPropertyWidget() delete d; } -QVariant KexiMacroPropertyWidget::value() const +TQVariant KexiMacroPropertyWidget::value() const { kdDebug()<<"KexiMacroPropertyWidget::value() value="<<d->macroproperty->value()<<endl; return d->macroproperty->value(); - /* QVariant value = d->combobox->currentText(); + /* TQVariant value = d->combobox->currentText(); value.cast( d->macroproperty->value().type() ); return value; */ } -void KexiMacroPropertyWidget::setValue(const QVariant& value, bool emitChange) +void KexiMacroPropertyWidget::setValue(const TQVariant& value, bool emitChange) { kdDebug()<<"KexiMacroPropertyWidget::setValue() value="<<value<<" emitChange="<<emitChange<<endl; if(! emitChange) d->combobox->blockSignals(true); - const QString s = value.toString(); + const TQString s = value.toString(); d->combobox->setCurrentText( s.isNull() ? "" : s ); if(emitChange) @@ -593,7 +593,7 @@ void KexiMacroPropertyWidget::setReadOnlyInternal(bool readOnly) void KexiMacroPropertyWidget::slotComboBoxChanged() { kdDebug()<<"KexiMacroPropertyWidget::slotComboBoxChanged()"<<endl; - const QVariant v = d->combobox->currentText(); + const TQVariant v = d->combobox->currentText(); d->macroproperty->setValue(v, true); //emit valueChanged(this); } @@ -602,7 +602,7 @@ void KexiMacroPropertyWidget::slotComboBoxActivated() { Q_ASSERT( d->listbox->editItem()->widget() ); const int index = d->combobox->currentItem(); - QString text = (index == 0) + TQString text = (index == 0) ? d->listbox->editItem()->widget()->value().toString() : d->combobox->text(index); kdDebug()<<"KexiMacroPropertyWidget::slotComboBoxActivated() index="<<index<<" text="<<text<<endl; @@ -618,7 +618,7 @@ void KexiMacroPropertyWidget::slotWidgetValueChanged() void KexiMacroPropertyWidget::slotPropertyValueChanged() { Q_ASSERT( d->listbox->editItem()->widget() ); - const QVariant v = d->macroproperty->value(); + const TQVariant v = d->macroproperty->value(); kdDebug()<<"KexiMacroPropertyWidget::slotPropertyValueChanged() value="<<v<<endl; d->listbox->editItem()->widget()->setValue(v, true); } diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.h b/kexi/plugins/macros/kexipart/keximacroproperty.h index 19f7b7ac..b1c256e9 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.h +++ b/kexi/plugins/macros/kexipart/keximacroproperty.h @@ -36,35 +36,36 @@ class KexiMacroPropertyWidget; * more control about the handling of our macro-properties. */ class KexiMacroProperty - : public QObject + : public TQObject , public KoProperty::CustomProperty { Q_OBJECT + TQ_OBJECT friend class KexiMacroPropertyWidget; public: /** Constructor. */ - explicit KexiMacroProperty(KoProperty::Property* parent, KSharedPtr<KoMacro::MacroItem> macroitem, const QString& name); + explicit KexiMacroProperty(KoProperty::Property* tqparent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); /** Destructor. */ virtual ~KexiMacroProperty(); - /** @return the parent @a KoProperty::Property instance. */ - KoProperty::Property* parentProperty() const; + /** @return the tqparent @a KoProperty::Property instance. */ + KoProperty::Property* tqparentProperty() const; /** This function is called by @ref KoProperty::Property::setValue() when a custom property is set. You don't have to modify the property value, it is done by Property class. - You just have to update child or parent properties value (m_property->parent()->setValue()). + You just have to update child or tqparent properties value (m_property->tqparent()->setValue()). Note that, when calling Property::setValue, you <b>need</b> to set useCustomProperty (3rd parameter) to false, or there will be infinite recursion. */ - virtual void setValue(const QVariant &value, bool rememberOldValue); + virtual void setValue(const TQVariant &value, bool rememberOldValue); /** This function is called by @ref KoProperty::Property::value() when a custom property is set and @ref handleValue() is true. - You should return property's value, taken from parent's value.*/ - virtual QVariant value() const; + You should return property's value, taken from tqparent's value.*/ + virtual TQVariant value() const; /** Tells whether CustomProperty should be used to get the property's value. You should return true for child properties, and false for others. */ @@ -75,8 +76,8 @@ class KexiMacroProperty KSharedPtr<KoMacro::MacroItem> macroItem() const; /** \return the name the property has in the \a KoMacro::MacroItem - above. Is QString::null if there was no item provided. */ - QString name() const; + above. Is TQString() if there was no item provided. */ + TQString name() const; /** \return the \a KoMacro::Variable which has the name @a name() in the item @a macroItem() . If such a variable doesn't exists NULL @@ -85,7 +86,7 @@ class KexiMacroProperty /** Factory function to create a new @a KoProperty::Property instance that will use a @a KexiMacroProperty as container. */ - static KoProperty::Property* createProperty(KSharedPtr<KoMacro::MacroItem> macroitem, const QString& name); + static KoProperty::Property* createProperty(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); signals: @@ -110,18 +111,18 @@ class KexiMacroPropertyFactory : public KoProperty::CustomPropertyFactory { public: /** Constructor. */ - explicit KexiMacroPropertyFactory(QObject* parent); + explicit KexiMacroPropertyFactory(TQObject* tqparent); /** Destructor. */ virtual ~KexiMacroPropertyFactory(); - /** @return a new instance of custom property for @p parent. + /** @return a new instance of custom property for @p tqparent. Implement this for property types you want to support. - Use parent->type() to get type of the property. */ - virtual KoProperty::CustomProperty* createCustomProperty(KoProperty::Property* parent); + Use tqparent->type() to get type of the property. */ + virtual KoProperty::CustomProperty* createCustomProperty(KoProperty::Property* tqparent); /** @return a new instance of custom property for @p property. Implement this for property editor types you want to support. - Use parent->type() to get type of the property. */ + Use tqparent->type() to get type of the property. */ virtual KoProperty::Widget* createCustomWidget(KoProperty::Property* property); /** Initializes this factory. The factory may register itself at @@ -139,21 +140,22 @@ class KexiMacroPropertyFactory : public KoProperty::CustomPropertyFactory class KexiMacroPropertyWidget : public KoProperty::Widget { Q_OBJECT + TQ_OBJECT public: /** Constructor. */ - explicit KexiMacroPropertyWidget(KoProperty::Property* property, QWidget* parent = 0); + explicit KexiMacroPropertyWidget(KoProperty::Property* property, TQWidget* tqparent = 0); /** Destructor. */ virtual ~KexiMacroPropertyWidget(); /** @return the value this widget has. */ - virtual QVariant value() const; + virtual TQVariant value() const; /** Set the value @p value this widget has. If @p emitChange is true, the @p KoProperty::Widget::valueChanged signal will be emitted. */ - virtual void setValue(const QVariant& value, bool emitChange=true); + virtual void setValue(const TQVariant& value, bool emitChange=true); - //virtual void drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value); + //virtual void drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value); protected: @@ -165,7 +167,7 @@ class KexiMacroPropertyWidget : public KoProperty::Widget /** Called if the text in the KComboBox changed. */ void slotComboBoxChanged(); - /** Called if an item in the QListBox of the KComboBox got activated. */ + /** Called if an item in the TQListBox of the KComboBox got activated. */ void slotComboBoxActivated(); /** Called if the @a KoProperty::Widget of the EditListBoxItem got changed. */ diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp index 95c94a47..deec9633 100644 --- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp @@ -41,17 +41,17 @@ class KexiMacroTextView::Private }; -KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, QWidget *parent, ::KoMacro::Macro* const macro) - : KexiMacroView(mainwin, parent, macro, "KexiMacroTextView") +KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro) + : KexiMacroView(mainwin, tqparent, macro, "KexiMacroTextView") , d( new Private() ) { - QHBoxLayout* layout = new QHBoxLayout(this); + TQHBoxLayout* tqlayout = new TQHBoxLayout(this); d->editor = new KTextEdit(this); - d->editor->setTextFormat(Qt::PlainText); - d->editor->setWordWrap(QTextEdit::NoWrap); - layout->addWidget(d->editor); + d->editor->setTextFormat(TQt::PlainText); + d->editor->setWordWrap(TQTextEdit::NoWrap); + tqlayout->addWidget(d->editor); - connect(d->editor, SIGNAL(textChanged()), this, SLOT(editorChanged())); + connect(d->editor, TQT_SIGNAL(textChanged()), this, TQT_SLOT(editorChanged())); } KexiMacroTextView::~KexiMacroTextView() @@ -66,13 +66,13 @@ void KexiMacroTextView::editorChanged() bool KexiMacroTextView::loadData() { - QString data; + TQString data; if(! loadDataBlock(data)) { kexipluginsdbg << "KexiMacroTextView::loadData(): no DataBlock" << endl; return false; } - kdDebug() << QString("KexiMacroTextView::loadData()\n%1").arg(data) << endl; + kdDebug() << TQString("KexiMacroTextView::loadData()\n%1").tqarg(data) << endl; //d->editor->blockSignals(true); d->editor->setText(data); //d->editor->blockSignals(false); @@ -82,7 +82,7 @@ bool KexiMacroTextView::loadData() tristate KexiMacroTextView::storeData(bool /*dontAsk*/) { - kexipluginsdbg << QString("KexiMacroTextView::storeData() %1 [%2]\n%3").arg(parentDialog()->partItem()->name()).arg(parentDialog()->id()).arg(d->editor->text()) << endl; + kexipluginsdbg << TQString("KexiMacroTextView::storeData() %1 [%2]\n%3").tqarg(tqparentDialog()->partItem()->name()).tqarg(tqparentDialog()->id()).tqarg(d->editor->text()) << endl; return storeDataBlock( d->editor->text() ); } diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.h b/kexi/plugins/macros/kexipart/keximacrotextview.h index 66a2229c..5101c30b 100644 --- a/kexi/plugins/macros/kexipart/keximacrotextview.h +++ b/kexi/plugins/macros/kexipart/keximacrotextview.h @@ -32,6 +32,7 @@ namespace KoMacro { class KexiMacroTextView : public KexiMacroView { Q_OBJECT + TQ_OBJECT public: /** @@ -39,10 +40,10 @@ class KexiMacroTextView : public KexiMacroView * * \param mainwin The \a KexiMainWindow instance this \a KexiViewBase * belongs to. - * \param parent The parent widget this widget should be displayed in. + * \param tqparent The tqparent widget this widget should be displayed in. * \param macro The \a KoMacro::Macro instance this view is for. */ - KexiMacroTextView(KexiMainWindow *mainwin, QWidget *parent, ::KoMacro::Macro* const macro); + KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro); /** * Destructor. diff --git a/kexi/plugins/macros/kexipart/keximacroview.cpp b/kexi/plugins/macros/kexipart/keximacroview.cpp index 35200829..507764a7 100644 --- a/kexi/plugins/macros/kexipart/keximacroview.cpp +++ b/kexi/plugins/macros/kexipart/keximacroview.cpp @@ -17,7 +17,7 @@ #include "keximacroview.h" -#include <qdom.h> +#include <tqdom.h> #include <kdebug.h> #include <kexidialogbase.h> @@ -62,12 +62,12 @@ class KexiMacroView::Private }; -KexiMacroView::KexiMacroView(KexiMainWindow *mainwin, QWidget *parent, KoMacro::Macro* const macro, const char* name) - : KexiViewBase(mainwin, parent, (name ? name : "KexiMacroView")) +KexiMacroView::KexiMacroView(KexiMainWindow *mainwin, TQWidget *tqparent, KoMacro::Macro* const macro, const char* name) + : KexiViewBase(mainwin, tqparent, (name ? name : "KexiMacroView")) , d( new Private(macro) ) { //kdDebug() << "KexiMacroView::KexiMacroView() Ctor" << endl; - plugSharedAction( "data_execute", this, SLOT(execute()) ); + plugSharedAction( "data_execute", this, TQT_SLOT(execute()) ); } KexiMacroView::~KexiMacroView() @@ -98,16 +98,16 @@ bool KexiMacroView::loadData() { d->macro->clearItems(); - QString data; + TQString data; if(! loadDataBlock(data)) { kexipluginsdbg << "KexiMacroView::loadData(): no DataBlock" << endl; return false; } - QString errmsg; + TQString errmsg; int errline, errcol; - QDomDocument domdoc; + TQDomDocument domdoc; bool parsed = domdoc.setContent(data, false, &errmsg, &errline, &errcol); if(! parsed) { @@ -115,8 +115,8 @@ bool KexiMacroView::loadData() return false; } - kexipluginsdbg << QString("KexiMacroView::loadData()\n%1").arg(domdoc.toString()) << endl; - QDomElement macroelem = domdoc.namedItem("macro").toElement(); + kexipluginsdbg << TQString("KexiMacroView::loadData()\n%1").tqarg(domdoc.toString()) << endl; + TQDomElement macroelem = domdoc.namedItem("macro").toElement(); if(macroelem.isNull()) { kexipluginsdbg << "KexiMacroView::loadData() Macro domelement is null" << endl; return false; @@ -139,7 +139,7 @@ KexiDB::SchemaData* KexiMacroView::storeNewData(const KexiDB::SchemaData& sdata, if(! storeData()) { kexipluginsdbg << "KexiMacroView::storeNewData() Failed to store the data." << endl; //failure: remove object's schema data to avoid garbage - KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection(); + KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection(); conn->removeObject( schema->id() ); delete schema; return 0; @@ -150,21 +150,21 @@ KexiDB::SchemaData* KexiMacroView::storeNewData(const KexiDB::SchemaData& sdata, tristate KexiMacroView::storeData(bool /*dontAsk*/) { - QDomDocument domdoc("macros"); - QDomElement macroelem = d->macro->toXML(); + TQDomDocument domdoc("macros"); + TQDomElement macroelem = d->macro->toXML(); domdoc.appendChild(macroelem); - const QString xml = domdoc.toString(2); - const QString name = QString("%1 [%2]").arg(parentDialog()->partItem()->name()).arg(parentDialog()->id()); - kexipluginsdbg << QString("KexiMacroView::storeData %1\n%2").arg(name).arg(xml) << endl; + const TQString xml = domdoc.toString(2); + const TQString name = TQString("%1 [%2]").tqarg(tqparentDialog()->partItem()->name()).tqarg(tqparentDialog()->id()); + kexipluginsdbg << TQString("KexiMacroView::storeData %1\n%2").tqarg(name).tqarg(xml) << endl; return storeDataBlock(xml); } -void KexiMacroView::execute(QObject* sender) +void KexiMacroView::execute(TQObject* sender) { KSharedPtr<KoMacro::Context> context = d->macro->execute(sender); if(context->hadException()) { KexiMacroError* error = new KexiMacroError( - mainWin(), // The parent KexiMainWindow + mainWin(), // The tqparent KexiMainWindow context // The KoMacro::Context where the error occured. ); error->exec(); diff --git a/kexi/plugins/macros/kexipart/keximacroview.h b/kexi/plugins/macros/kexipart/keximacroview.h index beed842e..0c44419b 100644 --- a/kexi/plugins/macros/kexipart/keximacroview.h +++ b/kexi/plugins/macros/kexipart/keximacroview.h @@ -42,6 +42,7 @@ class KexiTableItem; class KexiMacroView : public KexiViewBase { Q_OBJECT + TQ_OBJECT public: /** @@ -49,10 +50,10 @@ class KexiMacroView : public KexiViewBase * * \param mainwin The \a KexiMainWindow instance this \a KexiViewBase * belongs to. - * \param parent The parent widget this widget should be displayed in. + * \param tqparent The tqparent widget this widget should be displayed in. * \param macro The \a KoMacro::Macro instance this view is for. */ - KexiMacroView(KexiMainWindow *mainwin, QWidget *parent, ::KoMacro::Macro* const macro, const char* name = 0); + KexiMacroView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro, const char* name = 0); /** * Destructor. @@ -94,7 +95,7 @@ class KexiMacroView : public KexiViewBase * This slot will be invoked if Kexi's menuitem Data=>Execute * got activated and will execute the Macro. */ - void execute(QObject* sender = 0); + void execute(TQObject* sender = 0); protected: |