summaryrefslogtreecommitdiffstats
path: root/kexi/plugins/queries
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:56:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:56:31 -0600
commitc9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 (patch)
tree1ee1912ac4bb966475f0db0f2a78678661b4b4a5 /kexi/plugins/queries
parent94844816550ad672ccfcdc25659c625546239998 (diff)
downloadkoffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.tar.gz
koffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 94844816550ad672ccfcdc25659c625546239998.
Diffstat (limited to 'kexi/plugins/queries')
-rw-r--r--kexi/plugins/queries/kexiaddparamwidget.ui12
-rw-r--r--kexi/plugins/queries/kexiparameterlisteditor.ui2
-rw-r--r--kexi/plugins/queries/kexiquerydesignerguieditor.cpp42
-rw-r--r--kexi/plugins/queries/kexiquerydesignerguieditor.h8
-rw-r--r--kexi/plugins/queries/kexiquerydesignersql.cpp44
-rw-r--r--kexi/plugins/queries/kexiquerydesignersqlhistory.cpp50
-rw-r--r--kexi/plugins/queries/kexiquerydesignersqlhistory.h2
-rw-r--r--kexi/plugins/queries/kexiqueryview.cpp2
8 files changed, 81 insertions, 81 deletions
diff --git a/kexi/plugins/queries/kexiaddparamwidget.ui b/kexi/plugins/queries/kexiaddparamwidget.ui
index 01a3ee3c..a1f28a79 100644
--- a/kexi/plugins/queries/kexiaddparamwidget.ui
+++ b/kexi/plugins/queries/kexiaddparamwidget.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<vbox>
<property name="name">
@@ -37,7 +37,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<hbox>
<property name="name">
@@ -50,7 +50,7 @@
<property name="text">
<string>kexi_</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -73,7 +73,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -82,7 +82,7 @@
</spacer>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<vbox>
<property name="name">
@@ -105,7 +105,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<vbox>
<property name="name">
diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui
index 26b7d0f2..e7526413 100644
--- a/kexi/plugins/queries/kexiparameterlisteditor.ui
+++ b/kexi/plugins/queries/kexiparameterlisteditor.ui
@@ -53,7 +53,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
index 6425d97c..e215ab90 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -20,7 +20,7 @@
#include "kexiquerydesignerguieditor.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpainter.h>
#include <tqdom.h>
#include <tqregexp.h>
@@ -193,8 +193,8 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor(
addChildView(d->relations);
addChildView(d->dataTable);
setViewWidget(d->dataTable, true);
- d->relations->setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding);
- d->head->setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding);
+ d->relations->tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding);
+ d->head->tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding);
updateGeometry();
d->spl->setSizes(TQValueList<int>()<< 800<<400);
}
@@ -388,7 +388,7 @@ KexiQueryDesignerGuiEditor::buildSchema(TQString *errMsg)
d->dataTable->dataAwareObject()->setCursorPosition(i,0);
if (errMsg)
*errMsg = i18n("Select column for table \"%1\"")
- .arg(it.current()->at(COLUMN_ID_TABLE).toString());
+ .tqarg(it.current()->at(COLUMN_ID_TABLE).toString());
return false;
}
@@ -410,7 +410,7 @@ KexiQueryDesignerGuiEditor::buildSchema(TQString *errMsg)
true/*allowRelationalOperator*/);
if (!criteriaExpr) {//for sanity
if (errMsg)
- *errMsg = i18n("Invalid criteria \"%1\"").arg(criteriaStr);
+ *errMsg = i18n("Invalid criteria \"%1\"").tqarg(criteriaStr);
delete whereExpr;
return false;
}
@@ -431,7 +431,7 @@ KexiQueryDesignerGuiEditor::buildSchema(TQString *errMsg)
false/*!allowRelationalOperator*/);
if (!columnExpr) {
if (errMsg)
- *errMsg = i18n("Invalid expression \"%1\"").arg(fieldName);
+ *errMsg = i18n("Invalid expression \"%1\"").tqarg(fieldName);
return false;
}
temp->query()->addExpression(columnExpr, fieldVisible);
@@ -624,7 +624,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode)
if (!m_dialog->neverSaved()) {
if (!loadLayout()) {
//err msg
- parentDialog()->setStatus(conn,
+ parentDialog()->settqStatus(conn,
i18n("Query definition loading failed."),
i18n("Query design may be corrupted so it could not be opened even in text view.\n"
"You can delete the query and create it again."));
@@ -639,7 +639,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode)
KexiDB::ResultInfo result;
showFieldsForQuery( q, result );
if (!result.success) {
- parentDialog()->setStatus(&result, i18n("Query definition loading failed."));
+ parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
tempData()->proposeOpeningInTextViewModeBecauseOfProblems = true;
return false;
}
@@ -662,7 +662,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode)
KexiDB::ResultInfo result;
showFieldsAndRelationsForQuery( tempData()->query(), result );
if (!result.success) {
- parentDialog()->setStatus(&result, i18n("Query definition loading failed."));
+ parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
return false;
}
}
@@ -901,7 +901,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(
columnAlias = query->columnAlias(row_num);
if (field->isExpression()) {
// if (columnAlias.isEmpty()) {
-// columnAlias = i18n("expression", "expr%1").arg(row_num); //TODO
+// columnAlias = i18n("expression", "expr%1").tqarg(row_num); //TODO
// }
// if (columnAlias.isEmpty())
//TODO: ok? perhaps do not allow to omit aliases?
@@ -1074,7 +1074,7 @@ bool KexiQueryDesignerGuiEditor::loadLayout()
// return false;
// }
if (xml.isEmpty()) {
- //in a case when query layout was not saved, build layout by hand
+ //in a case when query tqlayout was not saved, build tqlayout by hand
// -- dynamic cast because of a need for handling invalid queries
// (as in KexiQueryDesignerGuiEditor::afterSwitchFrom()):
KexiDB::QuerySchema * q = dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData());
@@ -1083,7 +1083,7 @@ bool KexiQueryDesignerGuiEditor::loadLayout()
KexiDB::ResultInfo result;
showRelationsForQuery( q, result );
if (!result.success) {
- parentDialog()->setStatus(&result, i18n("Query definition loading failed."));
+ parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
return false;
}
}
@@ -1177,10 +1177,10 @@ bool KexiQueryDesignerGuiEditor::storeLayout()
return true;
}
-TQSize KexiQueryDesignerGuiEditor::sizeHint() const
+TQSize KexiQueryDesignerGuiEditor::tqsizeHint() const
{
- TQSize s1 = d->relations->sizeHint();
- TQSize s2 = d->head->sizeHint();
+ TQSize s1 = d->relations->tqsizeHint();
+ TQSize s2 = d->head->tqsizeHint();
return TQSize(TQMAX(s1.width(),s2.width()), s1.height()+s2.height());
}
@@ -1239,7 +1239,7 @@ void KexiQueryDesignerGuiEditor::slotNewItemAppendedForAfterDeletingInSpreadShee
item->at(COLUMN_ID_VISIBLE) = TQVariant(false, 0); //the same init as in initTableRows()
}
-void KexiQueryDesignerGuiEditor::slotRowInserted(KexiTableItem* item, uint row, bool /*repaint*/)
+void KexiQueryDesignerGuiEditor::slotRowInserted(KexiTableItem* item, uint row, bool /*tqrepaint*/)
{
if (d->droppedNewItem && d->droppedNewItem==item) {
createPropertySet( row, d->droppedNewTable, d->droppedNewField, true );
@@ -1449,7 +1449,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int
result->allowToDiscardChanges = true;
result->column = colnum;
result->msg = i18n("Entered column alias \"%1\" is not a valid identifier.")
- .arg(alias.data());
+ .tqarg(alias.data());
result->desc = i18n("Identifiers should start with a letter or '_' character");
return;
}
@@ -1468,7 +1468,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int
result->success = false;
result->allowToDiscardChanges = true;
result->column = colnum;
- result->msg = i18n("Invalid expression \"%1\"").arg(fieldName);
+ result->msg = i18n("Invalid expression \"%1\"").tqarg(fieldName);
return;
}
}
@@ -1590,7 +1590,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int
result->allowToDiscardChanges = true;
result->column = colnum;
result->msg = i18n("Could not set sorting for multiple columns (%1)")
- .arg(table=="*" ? table : (table+".*"));
+ .tqarg(table=="*" ? table : (table+".*"));
}
}
else if (colnum==COLUMN_ID_CRITERIA) {
@@ -1612,7 +1612,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int
result->column = colnum;
if (propertySet())
result->msg = i18n("Could not set criteria for \"%1\"")
- .arg(table=="*" ? table : field);
+ .tqarg(table=="*" ? table : field);
else
result->msg = i18n("Could not set criteria for empty row");
//moved to result->allowToDiscardChanges handler //d->dataTable->dataAwareObject()->cancelEditor(); //prevents further editing of this cell
@@ -1638,7 +1638,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int
result->success = false;
result->allowToDiscardChanges = true;
result->column = colnum;
- result->msg = i18n("Invalid criteria \"%1\"").arg(newValue.toString());
+ result->msg = i18n("Invalid criteria \"%1\"").tqarg(newValue.toString());
}
}
}
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.h b/kexi/plugins/queries/kexiquerydesignerguieditor.h
index f85125c6..c97c140d 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.h
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.h
@@ -69,7 +69,7 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase
KexiRelationWidget *relationView() const;
- virtual TQSize sizeHint() const;
+ virtual TQSize tqsizeHint() const;
public slots:
virtual void setFocus();
@@ -129,15 +129,15 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase
void slotBeforeCellChanged(KexiTableItem *item, int colnum,
TQVariant& newValue, KexiDB::ResultInfo* result);
- void slotRowInserted(KexiTableItem* item, uint row, bool repaint);
+ void slotRowInserted(KexiTableItem* item, uint row, bool tqrepaint);
void slotTablePositionChanged(KexiRelationViewTableContainer*);
void slotAboutConnectionRemove(KexiRelationViewConnection*);
void slotTableFieldDoubleClicked( KexiDB::TableSchema* table, const TQString& fieldName );
- /*! Loads layout of relation GUI diagram. */
+ /*! Loads tqlayout of relation GUI diagram. */
bool loadLayout();
- /*! Stores layout of relation GUI diagram. */
+ /*! Stores tqlayout of relation GUI diagram. */
bool storeLayout();
void showTablesForQuery(KexiDB::QuerySchema *query);
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index 022b47a0..37fab0e6 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -19,7 +19,7 @@
*/
#include <tqsplitter.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqhbox.h>
#include <tqvbox.h>
#include <tqtimer.h>
@@ -73,7 +73,7 @@ class KexiQueryDesignerSQLView::Private
}
KexiQueryDesignerSQLEditor *editor;
KexiQueryDesignerSQLHistory *history;
- TQLabel *pixmapStatus, *lblStatus;
+ TQLabel *pixmaptqStatus, *lbltqStatus;
TQHBox *status_hbox;
TQVBox *history_section;
KexiSectionHeader *head, *historyHead;
@@ -120,18 +120,18 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi
d->status_hbox->installEventFilter(this);
d->splitter->setResizeMode(d->history_section, TQSplitter::KeepSize);
d->status_hbox->setSpacing(0);
- d->pixmapStatus = new TQLabel(d->status_hbox);
- d->pixmapStatus->setFixedWidth(d->statusPixmapOk.width()*3/2);
- d->pixmapStatus->setAlignment(AlignHCenter | AlignTop);
- d->pixmapStatus->setMargin(d->statusPixmapOk.width()/4);
- d->pixmapStatus->setPaletteBackgroundColor( palette().active().color(TQColorGroup::Base) );
-
- d->lblStatus = new TQLabel(d->status_hbox);
- d->lblStatus->setAlignment(AlignLeft | AlignTop | WordBreak);
- d->lblStatus->setMargin(d->statusPixmapOk.width()/4);
- d->lblStatus->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
- d->lblStatus->resize(d->lblStatus->width(),d->statusPixmapOk.width()*3);
- d->lblStatus->setPaletteBackgroundColor( palette().active().color(TQColorGroup::Base) );
+ d->pixmaptqStatus = new TQLabel(d->status_hbox);
+ d->pixmaptqStatus->setFixedWidth(d->statusPixmapOk.width()*3/2);
+ d->pixmaptqStatus->tqsetAlignment(AlignHCenter | AlignTop);
+ d->pixmaptqStatus->setMargin(d->statusPixmapOk.width()/4);
+ d->pixmaptqStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) );
+
+ d->lbltqStatus = new TQLabel(d->status_hbox);
+ d->lbltqStatus->tqsetAlignment(AlignLeft | AlignTop | WordBreak);
+ d->lbltqStatus->setMargin(d->statusPixmapOk.width()/4);
+ d->lbltqStatus->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
+ d->lbltqStatus->resize(d->lbltqStatus->width(),d->statusPixmapOk.width()*3);
+ d->lbltqStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) );
TQHBoxLayout *b = new TQHBoxLayout(this);
b->addWidget(d->splitter);
@@ -171,36 +171,36 @@ KexiQueryDesignerSQLEditor *KexiQueryDesignerSQLView::editor() const
void KexiQueryDesignerSQLView::setStatusOk()
{
- d->pixmapStatus->setPixmap(d->statusPixmapOk);
+ d->pixmaptqStatus->setPixmap(d->statusPixmapOk);
setStatusText("<h2>"+i18n("The query is correct")+"</h2>");
d->history->addEvent(d->editor->text().stripWhiteSpace(), true, TQString());
}
void KexiQueryDesignerSQLView::setStatusError(const TQString& msg)
{
- d->pixmapStatus->setPixmap(d->statusPixmapErr);
+ d->pixmaptqStatus->setPixmap(d->statusPixmapErr);
setStatusText("<h2>"+i18n("The query is incorrect")+"</h2><p>"+msg+"</p>");
d->history->addEvent(d->editor->text().stripWhiteSpace(), false, msg);
}
void KexiQueryDesignerSQLView::setStatusEmpty()
{
- d->pixmapStatus->setPixmap(d->statusPixmapInfo);
+ d->pixmaptqStatus->setPixmap(d->statusPixmapInfo);
setStatusText(i18n("Please enter your query and execute \"Check query\" function to verify it."));
}
void KexiQueryDesignerSQLView::setStatusText(const TQString& text)
{
if (!d->action_toggle_history->isChecked()) {
- TQSimpleRichText rt(text, d->lblStatus->font());
- rt.setWidth(d->lblStatus->width());
+ TQSimpleRichText rt(text, d->lbltqStatus->font());
+ rt.setWidth(d->lbltqStatus->width());
TQValueList<int> sz = d->splitter->sizes();
- const int newHeight = rt.height()+d->lblStatus->margin()*2;
+ const int newHeight = rt.height()+d->lbltqStatus->margin()*2;
if (sz[1]<newHeight) {
sz[1] = newHeight;
d->splitter->setSizes(sz);
}
- d->lblStatus->setText(text);
+ d->lbltqStatus->setText(text);
}
}
@@ -449,7 +449,7 @@ KexiQueryDesignerSQLView::storeNewData(const KexiDB::SchemaData& sdata, bool &ca
{
Q_UNUSED( cancel );
- //here: we won't store query layout: it will be recreated 'by hand' in GUI Query Editor
+ //here: we won't store query tqlayout: it will be recreated 'by hand' in GUI Query Editor
bool queryOK = slotCheckQuery();
bool ok = true;
KexiDB::SchemaData* query = 0;
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index 16bfffce..7cc62620 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -19,7 +19,7 @@
*/
#include <tqpainter.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqregexp.h>
#include <kpopupmenu.h>
@@ -57,14 +57,14 @@ KexiQueryDesignerSQLHistory::drawContents(TQPainter *p, int cx, int cy, int cw,
for(HistoryEntry *it = m_history->first(); it; it = m_history->next())
{
// it->drawItem(p, visibleWidth());
- if(clipping.intersects(it->geometry(y, visibleWidth(), fontMetrics())))
+ if(clipping.intersects(it->tqgeometry(y, visibleWidth(), fontMetrics())))
{
p->saveWorldMatrix();
p->translate(0, y);
- it->drawItem(p, visibleWidth(), colorGroup());
+ it->drawItem(p, visibleWidth(), tqcolorGroup());
p->restoreWorldMatrix();
}
- y += it->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
+ y += it->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
}
}
@@ -79,27 +79,27 @@ KexiQueryDesignerSQLHistory::contentsMousePressEvent(TQMouseEvent * e)
if(it.current()->isSelected())
{
//clear
- it.current()->setSelected(false, colorGroup());
- updateContents(it.current()->geometry(y, visibleWidth(), fontMetrics()));
+ it.current()->setSelected(false, tqcolorGroup());
+ updateContents(it.current()->tqgeometry(y, visibleWidth(), fontMetrics()));
}
- if(it.current()->geometry(y, visibleWidth(), fontMetrics()).contains(e->pos()))
+ if(it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).contains(e->pos()))
{
popupHistory = it.current();
pos = y;
}
- y += it.current()->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
+ y += it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
}
//now do update
if (popupHistory) {
if (m_selected && m_selected != popupHistory) {
- m_selected->setSelected(false, colorGroup());
- updateContents(m_selected->geometry(pos, visibleWidth(), fontMetrics()));
+ m_selected->setSelected(false, tqcolorGroup());
+ updateContents(m_selected->tqgeometry(pos, visibleWidth(), fontMetrics()));
}
m_selected = popupHistory;
- m_selected->setSelected(true, colorGroup());
- updateContents(m_selected->geometry(pos, visibleWidth(), fontMetrics()));
+ m_selected->setSelected(true, tqcolorGroup());
+ updateContents(m_selected->tqgeometry(pos, visibleWidth(), fontMetrics()));
if(e->button() == Qt::RightButton) {
m_popup->exec(e->globalPos());
}
@@ -121,7 +121,7 @@ KexiQueryDesignerSQLHistory::addEvent(const TQString& q, bool s, const TQString
if (he) {
if (he->statement()==q) {
he->updateTime(TQTime::currentTime());
- repaint();
+ tqrepaint();
return;
}
}
@@ -137,25 +137,25 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e)
int y = 0;
for(HistoryEntry *it = m_history->first(); it; it = m_history->next())
{
- y += it->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
+ y += it->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
}
resizeContents(visibleWidth() - 1, y);
if (m_selected) {
- m_selected->setSelected(false, colorGroup());
+ m_selected->setSelected(false, tqcolorGroup());
}
m_selected = e;
- m_selected->setSelected(true, colorGroup());
+ m_selected->setSelected(true, tqcolorGroup());
ensureVisible(0,y+5);
updateContents();
/* ensureVisible(0, 0);
if (m_selected) {
- m_selected->setSelected(false, colorGroup());
+ m_selected->setSelected(false, tqcolorGroup());
}
m_selected = e;
- m_selected->setSelected(true, colorGroup());
+ m_selected->setSelected(true, tqcolorGroup());
// updateContents();
- updateContents(m_selected->geometry(0, visibleWidth(), fontMetrics()));*/
+ updateContents(m_selected->tqgeometry(0, visibleWidth(), fontMetrics()));*/
}
/*void
@@ -180,7 +180,7 @@ KexiQueryDesignerSQLHistory::slotToClipboard()
if(!m_selected)
return;
- TQApplication::clipboard()->setText(m_selected->statement(), TQClipboard::Clipboard);
+ TQApplication::tqclipboard()->setText(m_selected->statement(), TQClipboard::Clipboard);
}
void
@@ -326,7 +326,7 @@ HistoryEntry::highlight(const TQColorGroup &cg)
}
else
{
- text = TQString("<font color=\"%1\">%2").arg(cg.highlightedText().name()).arg(statement);
+ text = TQString("<font color=\"%1\">%2").tqarg(cg.highlightedText().name()).tqarg(statement);
}
TQRegExp keywords("\\b(SELECT|UPDATE|INSERT|DELETE|DROP|FROM|WHERE|AND|OR|NOT|NULL|JOIN|LEFT|RIGHT|ON|INTO|TABLE)\\b");
@@ -334,9 +334,9 @@ HistoryEntry::highlight(const TQColorGroup &cg)
text = text.replace(keywords, "<b>\\1</b>");
if(!m_error.isEmpty())
-// text += ("<br>"+i18n("Error: %1").arg(m_error));
-// text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\" size=\"-1\">") + i18n("Error: %1").arg(m_error) + "</font>";
- text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\">") + i18n("Error: %1").arg(m_error) + "</font>";
+// text += ("<br>"+i18n("Error: %1").tqarg(m_error));
+// text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\" size=\"-1\">") + i18n("Error: %1").tqarg(m_error) + "</font>";
+ text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\">") + i18n("Error: %1").tqarg(m_error) + "</font>";
kdDebug() << "HistoryEntry::highlight() text:" << text << endl;
// m_formated = new TQSimpleRichText(text, TQFont("courier", 8));
@@ -352,7 +352,7 @@ HistoryEntry::setSelected(bool selected, const TQColorGroup &cg)
}
TQRect
-HistoryEntry::geometry(int y, int width, TQFontMetrics f)
+HistoryEntry::tqgeometry(int y, int width, TQFontMetrics f)
{
Q_UNUSED( f );
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.h b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
index 6c828c39..a6d55285 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.h
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
@@ -36,7 +36,7 @@ class HistoryEntry
HistoryEntry(bool success, const TQTime &time, const TQString &statement, /*int y,*/ const TQString &error = TQString());
~HistoryEntry();
- TQRect geometry(int y, int width, TQFontMetrics f);
+ TQRect tqgeometry(int y, int width, TQFontMetrics f);
void drawItem(TQPainter *p, int width, const TQColorGroup &cg);
void setSelected(bool selected, const TQColorGroup &cg);
diff --git a/kexi/plugins/queries/kexiqueryview.cpp b/kexi/plugins/queries/kexiqueryview.cpp
index 1b3c16d7..c57224ea 100644
--- a/kexi/plugins/queries/kexiqueryview.cpp
+++ b/kexi/plugins/queries/kexiqueryview.cpp
@@ -83,7 +83,7 @@ tristate KexiQueryView::executeQuery(KexiDB::QuerySchema *query)
}
d->cursor = mainWin()->project()->dbConnection()->executeQuery(*query, params);
if (!d->cursor) {
- parentDialog()->setStatus(parentDialog()->mainWin()->project()->dbConnection(),
+ parentDialog()->settqStatus(parentDialog()->mainWin()->project()->dbConnection(),
i18n("Query executing failed."));
//todo: also provide server result and sql statement
return false;