From c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:31 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 94844816550ad672ccfcdc25659c625546239998. --- .../macros/kexipart/keximacrodesignview.cpp | 10 +++--- kexi/plugins/macros/kexipart/keximacrodesignview.h | 2 +- kexi/plugins/macros/kexipart/keximacroerror.cpp | 8 ++--- kexi/plugins/macros/kexipart/keximacroerrorbase.ui | 12 +++---- kexi/plugins/macros/kexipart/keximacroproperty.cpp | 42 +++++++++++----------- kexi/plugins/macros/kexipart/keximacrotextview.cpp | 8 ++--- kexi/plugins/macros/kexipart/keximacroview.cpp | 6 ++-- 7 files changed, 44 insertions(+), 44 deletions(-) (limited to 'kexi/plugins/macros/kexipart') diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp index 5406e8ca..b7e89e9a 100644 --- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp @@ -158,9 +158,9 @@ KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *pare ) ); // Create the tableview. - TQHBoxLayout* layout = new TQHBoxLayout(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 @@ -461,10 +461,10 @@ 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) { + KoMacro::Variable::List tqchildren = variable->tqchildren(); + if(tqchildren.count() > 0) { TQStringList keys, names; - KoMacro::Variable::List::Iterator childit(children.begin()), childend(children.end()); + KoMacro::Variable::List::Iterator childit(tqchildren.begin()), childend(tqchildren.end()); for(; childit != childend; ++childit) { const TQString s = (*childit)->variant().toString(); keys << s; diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.h b/kexi/plugins/macros/kexipart/keximacrodesignview.h index 520d1799..3529ea0c 100644 --- a/kexi/plugins/macros/kexipart/keximacrodesignview.h +++ b/kexi/plugins/macros/kexipart/keximacrodesignview.h @@ -91,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. diff --git a/kexi/plugins/macros/kexipart/keximacroerror.cpp b/kexi/plugins/macros/kexipart/keximacroerror.cpp index 25ec569f..f6422be9 100644 --- a/kexi/plugins/macros/kexipart/keximacroerror.cpp +++ b/kexi/plugins/macros/kexipart/keximacroerror.cpp @@ -53,14 +53,14 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, KSharedPtrexception(); iconlbl->setPixmap(KGlobal::instance()->iconLoader()->loadIcon("messagebox_critical", KIcon::Small, 32)); - errorlbl->setText(i18n("Failed to execute the macro \"%1\".
%2").arg( context->macro()->name() ).arg( exception->errorMessage() )); + errorlbl->setText(i18n("Failed to execute the macro \"%1\".
%2").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,TQString("%1").arg(i++)); + listviewitem->setText(0,TQString("%1").tqarg(i++)); listviewitem->setText(1,i18n("Action")); KSharedPtr macroitem = *mit; @@ -107,7 +107,7 @@ void KexiMacroError::designbtnClicked() const TQString name = macro->name(); KexiPart::Item* item = d->mainwin->project()->itemForMimeType("kexi/macro", name); if(! item) { - kdWarning() << TQString("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() << TQString("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; } } diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui index 05d7ba72..d44b8aee 100644 --- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui +++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui @@ -27,7 +27,7 @@ - layout4 + tqlayout4 @@ -35,7 +35,7 @@ - layout8 + tqlayout8 @@ -53,7 +53,7 @@ 0 - + 48 48 @@ -65,7 +65,7 @@ - + AlignVCenter|AlignLeft @@ -87,7 +87,7 @@ - + WordBreak|AlignVCenter @@ -154,7 +154,7 @@ - layout1 + tqlayout1 diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp index 73827383..e67794be 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp +++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp @@ -17,7 +17,7 @@ #include "keximacroproperty.h" -#include +#include #include #include #include @@ -86,7 +86,7 @@ void KexiMacroProperty::init() } //TESTCASE!!!!!!!!!!!!!!!!!!!!!! - //if(! variable->isEnabled()) qFatal( TQString("############## 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() ); @@ -349,9 +349,9 @@ class EditListBoxItem : public ListBoxItem Q_ASSERT( m_widget != 0 ); //m_widget->reparent(listBox()->viewport(), 0, TQPoint(0,0)); m_widget->reparent(listBox(), 0, TQPoint(1,1)); - //layout->addWidget(m_widget, 1); + //tqlayout->addWidget(m_widget, 1); m_widget->setMinimumHeight(5); - m_widget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_widget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); } private: @@ -389,45 +389,45 @@ class ListBox : public TQListBox Q_ASSERT( m_edititem->widget() != 0 ); const TQString name = m_macroproperty->name(); - KoMacro::Variable::List children; + KoMacro::Variable::List tqchildren; { - KoMacro::Variable::List actionchildren; + KoMacro::Variable::List actiontqchildren; KSharedPtr itemvar = m_macroproperty->macroItem()->variable(name,false); //kdDebug() << "KexiMacroProperty::ListBox::update() itemvar="<<(itemvar.data() ? "name:"+itemvar->name()+" value:"+itemvar->toString() : "NULL")<children(); + actiontqchildren = itemvar->tqchildren(); KSharedPtr action = m_edititem->action(); KSharedPtr actionvar = action.data() ? action->variable(name) : KSharedPtr(); //kdDebug() << "KexiMacroProperty::ListBox::update() actionvar="<<(actionvar.data() ? "name:"+actionvar->name()+" value:"+actionvar->toString() : "NULL")<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="<macroproperty = dynamic_cast( property->customProperty() ); if(! d->macroproperty) { @@ -516,11 +516,11 @@ 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(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + d->combobox->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); d->combobox->setMinimumHeight(5); d->combobox->setInsertionPolicy(TQComboBox::NoInsertion); d->combobox->setMinimumSize(10, 0); // to allow the combo to be resized to a small size diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp index 540dcc39..e35ee5b2 100644 --- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp @@ -45,11 +45,11 @@ KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *parent, : KexiMacroView(mainwin, parent, macro, "KexiMacroTextView") , d( new Private() ) { - TQHBoxLayout* layout = new TQHBoxLayout(this); + TQHBoxLayout* tqlayout = new TQHBoxLayout(this); d->editor = new KTextEdit(this); d->editor->setTextFormat(TQt::PlainText); d->editor->setWordWrap(TQTextEdit::NoWrap); - layout->addWidget(d->editor); + tqlayout->addWidget(d->editor); connect(d->editor, TQT_SIGNAL(textChanged()), this, TQT_SLOT(editorChanged())); } @@ -72,7 +72,7 @@ bool KexiMacroTextView::loadData() return false; } - kdDebug() << TQString("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 << TQString("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(parentDialog()->partItem()->name()).tqarg(parentDialog()->id()).tqarg(d->editor->text()) << endl; return storeDataBlock( d->editor->text() ); } diff --git a/kexi/plugins/macros/kexipart/keximacroview.cpp b/kexi/plugins/macros/kexipart/keximacroview.cpp index 19e789f0..e9f9cd33 100644 --- a/kexi/plugins/macros/kexipart/keximacroview.cpp +++ b/kexi/plugins/macros/kexipart/keximacroview.cpp @@ -115,7 +115,7 @@ bool KexiMacroView::loadData() return false; } - kexipluginsdbg << TQString("KexiMacroView::loadData()\n%1").arg(domdoc.toString()) << endl; + 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; @@ -154,8 +154,8 @@ tristate KexiMacroView::storeData(bool /*dontAsk*/) TQDomElement macroelem = d->macro->toXML(); domdoc.appendChild(macroelem); const TQString xml = domdoc.toString(2); - const TQString name = TQString("%1 [%2]").arg(parentDialog()->partItem()->name()).arg(parentDialog()->id()); - kexipluginsdbg << TQString("KexiMacroView::storeData %1\n%2").arg(name).arg(xml) << endl; + const TQString name = TQString("%1 [%2]").tqarg(parentDialog()->partItem()->name()).tqarg(parentDialog()->id()); + kexipluginsdbg << TQString("KexiMacroView::storeData %1\n%2").tqarg(name).tqarg(xml) << endl; return storeDataBlock(xml); } -- cgit v1.2.1