summaryrefslogtreecommitdiffstats
path: root/kexi/plugins/queries
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/plugins/queries')
-rw-r--r--kexi/plugins/queries/kexiaddparamwidget.ui2
-rw-r--r--kexi/plugins/queries/kexiquerydesignerguieditor.cpp20
-rw-r--r--kexi/plugins/queries/kexiquerydesignerguieditor.h2
-rw-r--r--kexi/plugins/queries/kexiquerydesignersqlhistory.cpp30
-rw-r--r--kexi/plugins/queries/kexiquerydesignersqlhistory.h2
5 files changed, 28 insertions, 28 deletions
diff --git a/kexi/plugins/queries/kexiaddparamwidget.ui b/kexi/plugins/queries/kexiaddparamwidget.ui
index ed1864f6..080f8d08 100644
--- a/kexi/plugins/queries/kexiaddparamwidget.ui
+++ b/kexi/plugins/queries/kexiaddparamwidget.ui
@@ -50,7 +50,7 @@
<property name="text">
<string>kexi_</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
index c6708e7f..cfd38e3a 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -388,7 +388,7 @@ KexiQueryDesignerGuiEditor::buildSchema(TQString *errMsg)
d->dataTable->dataAwareObject()->setCursorPosition(i,0);
if (errMsg)
*errMsg = i18n("Select column for table \"%1\"")
- .tqarg(it.current()->at(COLUMN_ID_TABLE).toString());
+ .arg(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\"").tqarg(criteriaStr);
+ *errMsg = i18n("Invalid criteria \"%1\"").arg(criteriaStr);
delete whereExpr;
return false;
}
@@ -431,7 +431,7 @@ KexiQueryDesignerGuiEditor::buildSchema(TQString *errMsg)
false/*!allowRelationalOperator*/);
if (!columnExpr) {
if (errMsg)
- *errMsg = i18n("Invalid expression \"%1\"").tqarg(fieldName);
+ *errMsg = i18n("Invalid expression \"%1\"").arg(fieldName);
return false;
}
temp->query()->addExpression(columnExpr, fieldVisible);
@@ -901,7 +901,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(
columnAlias = query->columnAlias(row_num);
if (field->isExpression()) {
// if (columnAlias.isEmpty()) {
-// columnAlias = i18n("expression", "expr%1").tqarg(row_num); //TODO
+// columnAlias = i18n("expression", "expr%1").arg(row_num); //TODO
// }
// if (columnAlias.isEmpty())
//TODO: ok? perhaps do not allow to omit aliases?
@@ -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 /*tqrepaint*/)
+void KexiQueryDesignerGuiEditor::slotRowInserted(KexiTableItem* item, uint row, bool /*repaint*/)
{
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.")
- .tqarg(alias.data());
+ .arg(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\"").tqarg(fieldName);
+ result->msg = i18n("Invalid expression \"%1\"").arg(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)")
- .tqarg(table=="*" ? table : (table+".*"));
+ .arg(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\"")
- .tqarg(table=="*" ? table : field);
+ .arg(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\"").tqarg(newValue.toString());
+ result->msg = i18n("Invalid criteria \"%1\"").arg(newValue.toString());
}
}
}
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.h b/kexi/plugins/queries/kexiquerydesignerguieditor.h
index d96fd987..1102b1d9 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.h
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.h
@@ -129,7 +129,7 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase
void slotBeforeCellChanged(KexiTableItem *item, int colnum,
TQVariant& newValue, KexiDB::ResultInfo* result);
- void slotRowInserted(KexiTableItem* item, uint row, bool tqrepaint);
+ void slotRowInserted(KexiTableItem* item, uint row, bool repaint);
void slotTablePositionChanged(KexiRelationViewTableContainer*);
void slotAboutConnectionRemove(KexiRelationViewConnection*);
void slotTableFieldDoubleClicked( KexiDB::TableSchema* table, const TQString& fieldName );
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index 503b432a..e53e876c 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -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->tqgeometry(y, visibleWidth(), fontMetrics())))
+ if(clipping.intersects(it->geometry(y, visibleWidth(), fontMetrics())))
{
p->saveWorldMatrix();
p->translate(0, y);
it->drawItem(p, visibleWidth(), colorGroup());
p->restoreWorldMatrix();
}
- y += it->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
+ y += it->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
}
}
@@ -80,26 +80,26 @@ KexiQueryDesignerSQLHistory::contentsMousePressEvent(TQMouseEvent * e)
{
//clear
it.current()->setSelected(false, colorGroup());
- updateContents(it.current()->tqgeometry(y, visibleWidth(), fontMetrics()));
+ updateContents(it.current()->geometry(y, visibleWidth(), fontMetrics()));
}
- if(it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).contains(e->pos()))
+ if(it.current()->geometry(y, visibleWidth(), fontMetrics()).contains(e->pos()))
{
popupHistory = it.current();
pos = y;
}
- y += it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
+ y += it.current()->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
}
//now do update
if (popupHistory) {
if (m_selected && m_selected != popupHistory) {
m_selected->setSelected(false, colorGroup());
- updateContents(m_selected->tqgeometry(pos, visibleWidth(), fontMetrics()));
+ updateContents(m_selected->geometry(pos, visibleWidth(), fontMetrics()));
}
m_selected = popupHistory;
m_selected->setSelected(true, colorGroup());
- updateContents(m_selected->tqgeometry(pos, visibleWidth(), fontMetrics()));
+ updateContents(m_selected->geometry(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());
- tqrepaint();
+ repaint();
return;
}
}
@@ -137,7 +137,7 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e)
int y = 0;
for(HistoryEntry *it = m_history->first(); it; it = m_history->next())
{
- y += it->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
+ y += it->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
}
resizeContents(visibleWidth() - 1, y);
@@ -155,7 +155,7 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e)
m_selected = e;
m_selected->setSelected(true, colorGroup());
// updateContents();
- updateContents(m_selected->tqgeometry(0, visibleWidth(), fontMetrics()));*/
+ updateContents(m_selected->geometry(0, visibleWidth(), fontMetrics()));*/
}
/*void
@@ -326,7 +326,7 @@ HistoryEntry::highlight(const TQColorGroup &cg)
}
else
{
- text = TQString("<font color=\"%1\">%2").tqarg(cg.highlightedText().name()).tqarg(statement);
+ text = TQString("<font color=\"%1\">%2").arg(cg.highlightedText().name()).arg(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").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>";
+// 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>";
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::tqgeometry(int y, int width, TQFontMetrics f)
+HistoryEntry::geometry(int y, int width, TQFontMetrics f)
{
Q_UNUSED( f );
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.h b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
index a6d55285..6c828c39 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 tqgeometry(int y, int width, TQFontMetrics f);
+ TQRect geometry(int y, int width, TQFontMetrics f);
void drawItem(TQPainter *p, int width, const TQColorGroup &cg);
void setSelected(bool selected, const TQColorGroup &cg);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-16 01:56:54 +0000