diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-25 05:28:35 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-25 05:28:35 +0000 |
commit | f008adb5a77e094eaf6abf3fc0f36958e66896a5 (patch) | |
tree | 8e9244c4d4957c36be81e15b566b4aa5ea26c982 /kexi/widget/tableview/kexitableviewdata.cpp | |
parent | 1210f27b660efb7b37ff43ec68763e85a403471f (diff) | |
download | koffice-f008adb5a77e094eaf6abf3fc0f36958e66896a5.tar.gz koffice-f008adb5a77e094eaf6abf3fc0f36958e66896a5.zip |
TQt4 port koffice
This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kexi/widget/tableview/kexitableviewdata.cpp')
-rw-r--r-- | kexi/widget/tableview/kexitableviewdata.cpp | 124 |
1 files changed, 62 insertions, 62 deletions
diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp index 62259db3..1fb65c6a 100644 --- a/kexi/widget/tableview/kexitableviewdata.cpp +++ b/kexi/widget/tableview/kexitableviewdata.cpp @@ -36,7 +36,7 @@ #include <kdebug.h> #include <klocale.h> -#include <qapplication.h> +#include <tqapplication.h> unsigned short KexiTableViewData::charTable[]= { @@ -54,12 +54,12 @@ KexiTableViewColumn::KexiTableViewColumn(KexiDB::Field& f, bool owner) init(); } -KexiTableViewColumn::KexiTableViewColumn(const QString& name, KexiDB::Field::Type ctype, +KexiTableViewColumn::KexiTableViewColumn(const TQString& name, KexiDB::Field::Type ctype, uint cconst, uint options, uint length, uint precision, - QVariant defaultValue, - const QString& caption, const QString& description, uint width + TQVariant defaultValue, + const TQString& caption, const TQString& description, uint width ) : columnInfo(0) , visibleLookupColumnInfo(0) @@ -78,8 +78,8 @@ KexiTableViewColumn::KexiTableViewColumn(const QString& name, KexiDB::Field::Typ init(); } -KexiTableViewColumn::KexiTableViewColumn(const QString& name, KexiDB::Field::Type ctype, - const QString& caption, const QString& description) +KexiTableViewColumn::KexiTableViewColumn(const TQString& name, KexiDB::Field::Type ctype, + const TQString& caption, const TQString& description) : columnInfo(0) , visibleLookupColumnInfo(0) { @@ -88,7 +88,7 @@ KexiTableViewColumn::KexiTableViewColumn(const QString& name, KexiDB::Field::Typ KexiDB::Field::NoConstraints, KexiDB::Field::NoOptions, 0, 0, - QVariant(), + TQVariant(), caption, description); isDBAware = false; @@ -122,7 +122,7 @@ KexiTableViewColumn::KexiTableViewColumn( } init(); //setup column's readonly flag: true, if - // - it's not from parent table's field, or + // - it's not from tqparent table's field, or // - if the query itself is coming from read-only connection, or // - if the query itself is stored (i.e. has connection) and lookup column is defined const bool columnFromMasterTable = query.masterTable()==columnInfo->field->table(); @@ -168,7 +168,7 @@ void KexiTableViewColumn::init() void KexiTableViewColumn::setValidator( KexiUtils::Validator* v ) { if (m_validator) {//remove old one - if (!m_validator->parent()) //destroy if has no parent + if (!m_validator->tqparent()) //destroy if has no tqparent delete m_validator; } m_validator = v; @@ -205,7 +205,7 @@ bool KexiTableViewColumn::isReadOnly() const return m_readOnly || (m_data && m_data->isReadOnly()); } -bool KexiTableViewColumn::acceptsFirstChar(const QChar& ch) const +bool KexiTableViewColumn::acceptsFirstChar(const TQChar& ch) const { // the field we're looking at can be related to "visible lookup column" // if lookup column is present @@ -216,7 +216,7 @@ bool KexiTableViewColumn::acceptsFirstChar(const QChar& ch) const return visibleField->isFPNumericType(); if (ch=='-') return !visibleField->isUnsigned(); - if (ch=='+' || (ch>='0' && ch<='9')) + if (ch=='+' || ((int)ch>='0' && (int)ch<='9')) return true; return false; } @@ -227,7 +227,7 @@ bool KexiTableViewColumn::acceptsFirstChar(const QChar& ch) const case KexiDB::Field::Date: case KexiDB::Field::DateTime: case KexiDB::Field::Time: - return ch>='0' && ch<='9'; + return (int)ch>='0' && (int)ch<='9'; default:; } return true; @@ -237,7 +237,7 @@ bool KexiTableViewColumn::acceptsFirstChar(const QChar& ch) const //------------------------------------------------------ KexiTableViewData::KexiTableViewData() - : QObject() + : TQObject() , KexiTableViewDataBase() { init(); @@ -245,7 +245,7 @@ KexiTableViewData::KexiTableViewData() // db-aware ctor KexiTableViewData::KexiTableViewData(KexiDB::Cursor *c) - : QObject() + : TQObject() , KexiTableViewDataBase() { init(); @@ -282,9 +282,9 @@ KexiTableViewData::KexiTableViewData(KexiDB::Cursor *c) } KexiTableViewData::KexiTableViewData( - const QValueList<QVariant> &keys, const QValueList<QVariant> &values, + const TQValueList<TQVariant> &keys, const TQValueList<TQVariant> &values, KexiDB::Field::Type keyType, KexiDB::Field::Type valueType) - : QObject() + : TQObject() , KexiTableViewDataBase() { init(keys, values, keyType, valueType); @@ -293,7 +293,7 @@ KexiTableViewData::KexiTableViewData( KexiTableViewData::KexiTableViewData( KexiDB::Field::Type keyType, KexiDB::Field::Type valueType) { - const QValueList<QVariant> empty; + const TQValueList<TQVariant> empty; init(empty, empty, keyType, valueType); } @@ -304,7 +304,7 @@ KexiTableViewData::~KexiTableViewData() } void KexiTableViewData::init( - const QValueList<QVariant> &keys, const QValueList<QVariant> &values, + const TQValueList<TQVariant> &keys, const TQValueList<TQVariant> &values, KexiDB::Field::Type keyType, KexiDB::Field::Type valueType) { init(); @@ -318,9 +318,9 @@ void KexiTableViewData::init( KexiTableViewColumn *valueColumn = new KexiTableViewColumn(*valueField, true); addColumn(valueColumn); - uint cnt = QMIN(keys.count(), values.count()); - QValueList<QVariant>::ConstIterator it_keys = keys.constBegin(); - QValueList<QVariant>::ConstIterator it_values = values.constBegin(); + uint cnt = TQMIN(keys.count(), values.count()); + TQValueList<TQVariant>::ConstIterator it_keys = keys.constBegin(); + TQValueList<TQVariant>::ConstIterator it_values = values.constBegin(); for (;cnt>0;++it_keys, ++it_values, cnt--) { KexiTableItem *item = new KexiTableItem(2); (*item)[0] = (*it_keys); @@ -355,14 +355,14 @@ void KexiTableViewData::init() void KexiTableViewData::deleteLater() { m_cursor = 0; - QObject::deleteLater(); + TQObject::deleteLater(); } void KexiTableViewData::addColumn( KexiTableViewColumn* col ) { // if (!col->isDBAware) { // if (!m_simpleColumnsByName) -// m_simpleColumnsByName = new QDict<KexiTableViewColumn>(101); +// m_simpleColumnsByName = new TQDict<KexiTableViewColumn>(101); // m_simpleColumnsByName->insert(col->caption,col);//for faster lookup // } columns.append( col ); @@ -386,11 +386,11 @@ void KexiTableViewData::addColumn( KexiTableViewColumn* col ) m_itemSize = columns.count()+(m_containsROWIDInfo?1:0); } -QString KexiTableViewData::dbTableName() const +TQString KexiTableViewData::dbTableName() const { if (m_cursor && m_cursor->query() && m_cursor->query()->masterTable()) return m_cursor->query()->masterTable()->name(); - return QString::null; + return TQString(); } void KexiTableViewData::setSorting(int column, bool ascending) @@ -506,11 +506,11 @@ int KexiTableViewData::cmpTime(Item item1, Item item2) int KexiTableViewData::cmpStr(Item item1, Item item2) { CMP_NULLS(item1, item2); - const QString &as = m_leftTmp.toString(); - const QString &bs = m_rightTmp.toString(); + const TQString &as = m_leftTmp.toString(); + const TQString &bs = m_rightTmp.toString(); - const QChar *a = as.unicode(); - const QChar *b = bs.unicode(); + const TQChar *a = as.tqunicode(); + const TQChar *b = bs.tqunicode(); if ( a == b ) return 0; @@ -522,18 +522,18 @@ int KexiTableViewData::cmpStr(Item item1, Item item2) unsigned short au; unsigned short bu; - int l=QMIN(as.length(),bs.length()); + int l=TQMIN(as.length(),bs.length()); - au = a->unicode(); - bu = b->unicode(); + au = a->tqunicode(); + bu = b->tqunicode(); au = (au <= 0x17e ? charTable[au] : 0xffff); bu = (bu <= 0x17e ? charTable[bu] : 0xffff); while (l-- && au == bu) { a++,b++; - au = a->unicode(); - bu = b->unicode(); + au = a->tqunicode(); + bu = b->tqunicode(); au = (au <= 0x17e ? charTable[au] : 0xffff); bu = (bu <= 0x17e ? charTable[bu] : 0xffff); } @@ -578,8 +578,8 @@ void KexiTableViewData::clearRowEditBuffer() } bool KexiTableViewData::updateRowEditBufferRef(KexiTableItem *item, - int colnum, KexiTableViewColumn* col, QVariant& newval, bool allowSignals, - QVariant *visibleValueForLookupField) + int colnum, KexiTableViewColumn* col, TQVariant& newval, bool allowSignals, + TQVariant *visibleValueForLookupField) { m_result.clear(); if (allowSignals) @@ -615,7 +615,7 @@ bool KexiTableViewData::updateRowEditBufferRef(KexiTableItem *item, return false; } //not db-aware: - const QString colname = col->field()->name(); + const TQString colname = col->field()->name(); if (colname.isEmpty()) { kdDebug() << "KexiTableViewData::updateRowEditBufferRef(): column #" << colnum<<" not found!" << endl; return false; @@ -635,7 +635,7 @@ bool KexiTableViewData::updateRowEditBufferRef(KexiTableItem *item, } //! @todo if there're multiple views for this data, we need multiple buffers! -bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool repaint) +bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool tqrepaint) { if (!m_pRowEditBuffer) return true; //nothing to do @@ -645,7 +645,7 @@ bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool repaint) KexiTableViewColumn::ListIterator it_f(columns); KexiDB::RowData::ConstIterator it_r = item.constBegin(); int col = 0; - const QVariant *val; + const TQVariant *val; for (;it_f.current() && it_r!=item.constEnd();++it_f,++it_r,col++) { KexiDB::Field *f = it_f.current()->field(); val = 0; @@ -655,7 +655,7 @@ bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool repaint) if (val->isNull() && !f->isAutoIncrement()) { //NOT NULL violated m_result.msg = i18n("\"%1\" column requires a value to be entered.") - .arg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData(); + .tqarg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData(); m_result.desc = i18n("The column's constraint is declared as NOT NULL."); m_result.column = col; return false; @@ -666,7 +666,7 @@ bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool repaint) if (!f->isAutoIncrement() && (val->isNull() || KexiDB::isEmptyValue( f, *val ))) { //NOT EMPTY violated m_result.msg = i18n("\"%1\" column requires a value to be entered.") - .arg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData(); + .tqarg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData(); m_result.desc = i18n("The column's constraint is declared as NOT EMPTY."); m_result.column = col; return false; @@ -685,7 +685,7 @@ bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool repaint) /* if (desc) *desc = -js: TODO: use KexiMainWindowImpl::showErrorMessage(const QString &title, KexiDB::Object *obj) +js: TODO: use KexiMainWindowImpl::showErrorMessage(const TQString &title, KexiDB::Object *obj) after it will be moved somewhere to kexidb (this will require moving other showErrorMessage() methods from KexiMainWindowImpl to libkexiutils....) then: just call: *desc = KexiDB::errorMessage(m_cursor); @@ -721,12 +721,12 @@ js: TODO: use KexiMainWindowImpl::showErrorMessage(const QString &title, KexiDB: m_pRowEditBuffer->clear(); - if (repaint) + if (tqrepaint) emit rowRepaintRequested(item); return true; } -bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool repaint) +bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool tqrepaint) { kdDebug() << "KexiTableViewData::saveRowChanges()..." << endl; m_result.clear(); @@ -734,32 +734,32 @@ bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool repaint) if (!m_result.success) return false; - if (saveRow(item, false /*update*/, repaint)) { + if (saveRow(item, false /*update*/, tqrepaint)) { emit rowUpdated(&item); return true; } return false; } -bool KexiTableViewData::saveNewRow(KexiTableItem& item, bool repaint) +bool KexiTableViewData::saveNewRow(KexiTableItem& item, bool tqrepaint) { kdDebug() << "KexiTableViewData::saveNewRow()..." << endl; m_result.clear(); - emit aboutToInsertRow(&item, &m_result, repaint); + emit aboutToInsertRow(&item, &m_result, tqrepaint); if (!m_result.success) return false; - if (saveRow(item, true /*insert*/, repaint)) { - emit rowInserted(&item, repaint); + if (saveRow(item, true /*insert*/, tqrepaint)) { + emit rowInserted(&item, tqrepaint); return true; } return false; } -bool KexiTableViewData::deleteRow(KexiTableItem& item, bool repaint) +bool KexiTableViewData::deleteRow(KexiTableItem& item, bool tqrepaint) { m_result.clear(); - emit aboutToDeleteRow(item, &m_result, repaint); + emit aboutToDeleteRow(item, &m_result, tqrepaint); if (!m_result.success) return false; @@ -784,15 +784,15 @@ bool KexiTableViewData::deleteRow(KexiTableItem& item, bool repaint) return true; } -void KexiTableViewData::deleteRows( const QValueList<int> &rowsToDelete, bool repaint ) +void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool tqrepaint ) { - Q_UNUSED( repaint ); + Q_UNUSED( tqrepaint ); if (rowsToDelete.isEmpty()) return; int last_r=0; first(); - for (QValueList<int>::ConstIterator r_it = rowsToDelete.constBegin(); r_it!=rowsToDelete.constEnd(); ++r_it) { + for (TQValueList<int>::ConstIterator r_it = rowsToDelete.constBegin(); r_it!=rowsToDelete.constEnd(); ++r_it) { for (; last_r<(*r_it); last_r++) { next(); } @@ -804,17 +804,17 @@ void KexiTableViewData::deleteRows( const QValueList<int> &rowsToDelete, bool re emit rowsDeleted( rowsToDelete ); } -void KexiTableViewData::insertRow(KexiTableItem& item, uint index, bool repaint) +void KexiTableViewData::insertRow(KexiTableItem& item, uint index, bool tqrepaint) { - if (!insert( index = QMIN(index, count()), &item )) + if (!insert( index = TQMIN(index, count()), &item )) return; - emit rowInserted(&item, index, repaint); + emit rowInserted(&item, index, tqrepaint); } void KexiTableViewData::clearInternal() { clearRowEditBuffer(); -// qApp->processEvents( 1 ); +// tqApp->processEvents( 1 ); //TODO: this is time consuming: find better data model // KexiTableViewDataBase::clear(); const uint c = count(); @@ -822,12 +822,12 @@ void KexiTableViewData::clearInternal() removeLast(); #ifndef KEXI_NO_PROCESS_EVENTS if (i % 1000 == 0) - qApp->processEvents( 1 ); + tqApp->tqprocessEvents( 1 ); #endif } } -bool KexiTableViewData::deleteAllRows(bool repaint) +bool KexiTableViewData::deleteAllRows(bool tqrepaint) { clearInternal(); @@ -837,7 +837,7 @@ bool KexiTableViewData::deleteAllRows(bool repaint) res = m_cursor->deleteAllRows(); } - if (repaint) + if (tqrepaint) emit reloadRequested(); return res; } @@ -873,7 +873,7 @@ void KexiTableViewData::preloadAllRows() m_cursor->moveNext(); #ifndef KEXI_NO_PROCESS_EVENTS if ((i % 1000) == 0) - qApp->processEvents( 1 ); + tqApp->tqprocessEvents( 1 ); #endif } } |