summaryrefslogtreecommitdiffstats
path: root/kexi
diff options
context:
space:
mode:
Diffstat (limited to 'kexi')
-rw-r--r--kexi/core/kexiblobbuffer.cpp2
-rw-r--r--kexi/core/kexiblobbuffer.h1
-rw-r--r--kexi/kexiutils/utils.h1
-rw-r--r--kexi/plugins/forms/kexiformview.cpp6
-rw-r--r--kexi/plugins/forms/widgets/kexidbcombobox.cpp1
-rw-r--r--kexi/plugins/forms/widgets/kexidbform.cpp20
-rw-r--r--kexi/plugins/importexport/csv/kexicsvimportdialog.cpp1
-rw-r--r--kexi/widget/utils/kexiflowlayout.cpp36
-rw-r--r--kexi/widget/utils/kexiflowlayout.h4
9 files changed, 4 insertions, 68 deletions
diff --git a/kexi/core/kexiblobbuffer.cpp b/kexi/core/kexiblobbuffer.cpp
index aeb621c4..6cb91e7b 100644
--- a/kexi/core/kexiblobbuffer.cpp
+++ b/kexi/core/kexiblobbuffer.cpp
@@ -306,7 +306,7 @@ KexiBLOBBuffer::Handle KexiBLOBBuffer::objectForId(Id_t id, bool stored)
rowData[1].toString(),
rowData[2].toString(),
rowData[3].toString(),
- (Id_t)rowData[4].toInt() //!< @todo folder id: fix Id_t for TQt4
+ (Id_t)rowData[4].toInt()
);
insertItem(item);
diff --git a/kexi/core/kexiblobbuffer.h b/kexi/core/kexiblobbuffer.h
index 5207818e..4299bbb1 100644
--- a/kexi/core/kexiblobbuffer.h
+++ b/kexi/core/kexiblobbuffer.h
@@ -86,7 +86,6 @@ class KEXICORE_EXPORT KexiBLOBBuffer : public TQObject
class Item;
public:
//! long integer for unique identifying blobs
-//! @todo TQt4: will be changed
typedef long Id_t;
//! Access to KexiBLOBBuffer singleton
diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h
index e244f02e..7ad11324 100644
--- a/kexi/kexiutils/utils.h
+++ b/kexi/kexiutils/utils.h
@@ -250,7 +250,6 @@ namespace KexiUtils
Copies @p src file to @p dest file.
@return CopySuccess on success, CopyReadError on source file error,
CopyWriteError on destination file error.
- @todo remove: TQFile in TQt4 provides this.
*/
KEXIUTILS_EXPORT CopyFileResult copyFile(const TQString& src, const TQString& dest);
}
diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp
index 47021959..6ea8bd15 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -374,7 +374,7 @@ static void setUnsavedBLOBIdsForDataViewMode(
if (-1 != widget->metaObject()->findProperty("pixmapId")) {
const KexiBLOBBuffer::Id_t blobID = unsavedLocalBLOBsByName[ widget->name() ];
if (blobID > 0)
- widget->setProperty("pixmapId", (uint /* KexiBLOBBuffer::Id_t is unsafe and unsupported by TQVariant - will be fixed in TQt4*/)blobID);
+ widget->setProperty("pixmapId", (uint)blobID);
}
const TQObjectList list = widget->childrenListObject();
if (list.isEmpty())
@@ -803,11 +803,11 @@ KexiFormView::storeData(bool dontAsk)
return false;
}
kexipluginsdbg << " storedDataID=" << storedBLOBID << endl;
- h.setStoredWidthID((KexiBLOBBuffer::Id_t /*unsafe - will be fixed in TQt4*/)storedBLOBID);
+ h.setStoredWidthID((KexiBLOBBuffer::Id_t)storedBLOBID);
//set widget's internal property so it can be saved...
const TQVariant oldStoredPixmapId( it.key()->property("storedPixmapId") );
it.key()->setProperty("storedPixmapId",
- TQVariant((uint /* KexiBLOBBuffer::Id_t is unsafe and unsupported by TQVariant - will be fixed in TQt4*/)storedBLOBID));
+ TQVariant((uint)storedBLOBID));
KFormDesigner::ObjectTreeItem *widgetItem = designFormView->form()->objectTree()->lookup(it.key()->name()); //form()->objectTree()->lookup(it.key()->name());
if (widgetItem)
widgetItem->addModifiedProperty( "storedPixmapId", oldStoredPixmapId );
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index e315e752..26ba8ebe 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -186,7 +186,6 @@ void KexiDBComboBox::createEditor()
m_subwidget->setGeometry( editorGeometry() );
if (!d->isEditable) {
m_subwidget->setCursor(TQCursor(TQt::ArrowCursor)); // widgets like listedit have IbeamCursor, we don't want that
-//! @todo TQt4: set transparent background, for now we're setting button color
TQPalette subwidgetPalette( m_subwidget->palette() );
subwidgetPalette.setColor(TQPalette::Active, TQColorGroup::Base,
subwidgetPalette.color(TQPalette::Active, TQColorGroup::Button));
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index 4669fa40..106e465b 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -691,24 +691,4 @@ void KexiDBForm::setCursor( const TQCursor & cursor )
KexiDBFormBase::setCursor(cursor);
}
-//! @todo: TQt4? XORed resize rectangles instead of black widgets
-/*
-void KexiDBForm::paintEvent( TQPaintEvent *e )
-{
- TQPainter p;
- p.begin(this, true);
- bool unclipped = testWFlags( WPaintUnclipped );
- setWFlags( WPaintUnclipped );
-
- p.setPen(white);
- p.setRasterOp(XorROP);
- p.drawLine(e->rect().topLeft(), e->rect().bottomRight());
-
- if (!unclipped)
- clearWFlags( WPaintUnclipped );
- p.end();
- KexiDBFormBase::paintEvent(e);
-}
-*/
-
#include "kexidbform.moc"
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 29e404b6..cccc5f8b 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -708,7 +708,6 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i
if (offset==0 && x.unicode()==0xfeff) {
// Ignore BOM, the "Byte Order Mark"
// (http://en.wikipedia.org/wiki/Byte_Order_Mark, // http://www.unicode.org/charts/PDF/UFFF0.pdf)
- // Probably fixed in TQt4.
continue;
}
diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp
index 38259277..14e5e959 100644
--- a/kexi/widget/utils/kexiflowlayout.cpp
+++ b/kexi/widget/utils/kexiflowlayout.cpp
@@ -113,13 +113,7 @@ KexiFlowLayout::addSpacing(int size)
TQLayoutIterator
KexiFlowLayout::iterator()
{
- // [FIXME]
-#ifdef USE_QT4
- #warning [FIXME] ContainerAreaLayout iterators may not function correctly under Qt4
- return TQLayoutIterator( this ); // [FIXME]
-#else // USE_QT4
return TQLayoutIterator( new KexiFlowLayoutIterator(&m_list) );
-#endif // USE_QT4
}
TQPtrList<TQWidget>*
@@ -455,33 +449,3 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
// return our width
return x + w - r.x();
}
-
-#ifdef USE_QT4
-/*!
- \reimp
-*/
-int KexiFlowLayout::count() const {
- return m_list.count();
-}
-
-/*!
- \reimp
-*/
-TQLayoutItem* KexiFlowLayout::itemAt(int index) const {
- return index >= 0 && index < m_list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(m_list).at(index)) : 0;
-}
-
-/*!
- \reimp
-*/
-TQLayoutItem* KexiFlowLayout::takeAt(int index) {
- if (index < 0 || index >= m_list.count())
- return 0;
- TQLayoutItem *item = m_list.at(index);
- m_list.remove(m_list.at(index));
- delete item;
-
- invalidate();
- return item;
-}
-#endif // USE_QT4
diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h
index 7353f16f..fa48df6f 100644
--- a/kexi/widget/utils/kexiflowlayout.h
+++ b/kexi/widget/utils/kexiflowlayout.h
@@ -59,10 +59,6 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
virtual bool isEmpty();
-#ifdef USE_QT4
- QLAYOUT_REQUIRED_METHOD_DECLARATIONS
-#endif // USE_QT4
-
protected:
virtual void setGeometry(const TQRect&);
int simulateLayout(const TQRect &r);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 22:09:51 +0000