summaryrefslogtreecommitdiffstats
path: root/kexi/plugins
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-08-25 11:21:54 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-08-29 12:16:41 +0900
commit73836b4ca5f241d070dd34ac1d9bb828e05f9544 (patch)
tree001b3935b9362f17083be2a8225e6ff42afc2019 /kexi/plugins
parent1607518b8c749b4195c5ab11b405f77001526a6a (diff)
downloadkoffice-73836b4c.tar.gz
koffice-73836b4c.zip
Drop USE_TQT4 code
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit e0df02598b8e19d8b6ddf07fdbca661489ab2e99)
Diffstat (limited to 'kexi/plugins')
-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
4 files changed, 3 insertions, 25 deletions
diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp
index 47021959e..6ea8bd154 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 e315e752c..26ba8ebe5 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 4669fa406..106e465b6 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 29e404b6f..cccc5f8bc 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;
}