Drop USE_TQT4 code

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

README.APPS

@@ -8,9 +8,6 @@ between 1.5 and 2.0.  For all the rest of the programs, bugfixes that
 are committed in the 1.5 branch will be forward ported to 1.6 at the
 time of the release. 
 
-The real development will happen in trunk, and will eventually lead to
-KOffice version 2.0, which will be based on Qt4 and tdelibs4.
-
 Here is the list of applications and libraries that will be developed 
 in the 1.6 cycle:
 

chalk/ui/kis_qpaintdevice_canvas_painter.cpp

@@ -596,22 +596,12 @@ void KisTQPaintDeviceCanvasPainter::drawText(const TQPoint& point, const TQStrin
 
 void KisTQPaintDeviceCanvasPainter::drawText(int x, int y, int w, int h, int flags, const TQString& text, int len, TQRect *br, TQTextParag **intern)
 {
-#ifdef USE_QT4
-    printf("[WARNING] KisTQPaintDeviceCanvasPainter::drawText partially implemented\n");
-    m_painter.drawText(x, y, w, h, flags, text, len, br);
-#else // USE_QT4
     m_painter.drawText(x, y, w, h, flags, text, len, br, intern);
-#endif // USE_QT4
 }
 
 void KisTQPaintDeviceCanvasPainter::drawText(const TQRect& r, int flags, const TQString& text, int len, TQRect *br, TQTextParag **intern)
 {
-#ifdef USE_QT4
-    printf("[WARNING] KisTQPaintDeviceCanvasPainter::drawText partially implemented\n");
-    m_painter.drawText(r, flags, text, len, br);
-#else // USE_QT4
     m_painter.drawText(r, flags, text, len, br, intern);
-#endif // USE_QT4
 }
 
 void KisTQPaintDeviceCanvasPainter::drawTextItem(int x, int y, const TQTextItem& ti, int textflags)
@@ -626,22 +616,12 @@ void KisTQPaintDeviceCanvasPainter::drawTextItem(const TQPoint& p, const TQTextI
 
 TQRect KisTQPaintDeviceCanvasPainter::boundingRect(int x, int y, int w, int h, int flags, const TQString& text, int len, TQTextParag **intern)
 {
-#ifdef USE_QT4
-    printf("[WARNING] KisTQPaintDeviceCanvasPainter::boundingRect partially implemented\n");
-    return m_painter.boundingRect(x, y, w, h, flags, text, len);
-#else // USE_QT4
     return m_painter.boundingRect(x, y, w, h, flags, text, len, intern);
-#endif // USE_QT4
 }
 
 TQRect KisTQPaintDeviceCanvasPainter::boundingRect(const TQRect& r, int flags, const TQString& text, int len, TQTextParag **intern)
 {
-#ifdef USE_QT4
-    printf("[WARNING] KisTQPaintDeviceCanvasPainter::boundingRect partially implemented\n");
-    return m_painter.boundingRect(r, flags, text, len);
-#else // USE_QT4
     return m_painter.boundingRect(r, flags, text, len, intern);
-#endif // USE_QT4
 }
 
 int	KisTQPaintDeviceCanvasPainter::tabStops() const

karbon/TODO

@@ -61,8 +61,7 @@ TODO:
 -	VImage
 -	VPattern like VImage with embedded binaries instead of paths
 -	bring text support back, ideally using fontconfig and freetype, and no xft.
--	improve printing (specifically printing of gradient and pattern fill), 
-	should go along with porting to qt4/the new rendering framework
+-	improve printing (specifically printing of gradient and pattern fill).
 -	select first/last segment's knot if one of each other's knot is selected
 -	allow for multiple strokes and fills in VPath which get rendered in the order they occur.
 -	use inside/intersection tests in vpath::combine() for changing winding.

kdgantt/KDGanttView.cpp

@@ -979,8 +979,7 @@ TQSize KDGanttView::drawContents( TQPainter* p,
         temp =  thY;
       p->translate( 0, temp );
       //HACK: Only draw list headers if we draw timeline, else
-      // there is no room for it. This will most probably be changed
-      // with qt4 anyway, so I think we can live with it atm.
+      // there is no room for it.
       myListView->drawToPainter( p, drawTimeLine ); 
       p->translate( lvX, -temp);
     }

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);

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

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);
 }

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 );

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));

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"

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;
 		}
 

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

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);

kivio/kiviopart/kivio_view.cpp

@@ -1960,11 +1960,9 @@ void KivioView::textSubScript()
 void KivioView::showAlign( int align )
 {
   switch ( align ) {
-#ifndef USE_QT4
     case TQt::AlignAuto: // In left-to-right mode it's align left. TODO: alignright if text->isRightToLeft()
       kdWarning(43000) << k_funcinfo << "shouldn't be called with AlignAuto" << endl;
       // fallthrough
-#endif // USE_QT4
     case TQt::AlignLeft:
       m_textAlignLeft->setChecked( true );
       break;

kword/KWDocument.cpp

@@ -2877,7 +2877,7 @@ bool KWDocument::saveOasisHelper( KoStore* store, KoXmlWriter* manifestWriter, S
             }
         }
 
-        // Add trailing '0'  (TQt4: remove)
+        // Add trailing '0'
         headerFooterContent.resize( headerFooterContent.size() + 1 );
         headerFooterContent[headerFooterContent.size()-1] = '\0';
 
@@ -4435,10 +4435,10 @@ void KWDocument::recalcVariables( int type )
     if ( m_bGeneratingPreview )
         return;
 
-    TQMap<KoTextDocument *, bool> modifiedTextDocuments; // TQt4: TQSet
+    TQMap<KoTextDocument *, bool> modifiedTextDocuments;
     for ( TQValueList<KoVariable *>::const_iterator it = modifiedVariables.begin(), end = modifiedVariables.end() ; it != end ; ++it ) {
         KoTextDocument* textdoc = (*it)->textDocument();
-        if ( modifiedTextDocuments.find( textdoc ) != modifiedTextDocuments.end() ) // TQt4: !contains
+        if ( modifiedTextDocuments.find( textdoc ) != modifiedTextDocuments.end() )
         {
             modifiedTextDocuments.insert( textdoc, true );
             KWTextFrameSet * textfs = static_cast<KWTextDocument *>(textdoc)->textFrameSet();
@@ -5042,7 +5042,7 @@ void KWDocument::displayFootNoteFieldCode()
 
 void KWDocument::changeFootNoteConfig()
 {
-    TQMap<KoTextDocument *, bool> modifiedTextDocuments; // TQt4: TQSet
+    TQMap<KoTextDocument *, bool> modifiedTextDocuments;
     TQPtrListIterator<KoVariable> it( m_varColl->getVariables() );
     for ( ; it.current() ; ++it )
     {
@@ -5062,7 +5062,7 @@ void KWDocument::changeFootNoteConfig()
                 parag->setChanged( true );
             }
             KoTextDocument* textdoc = parag->textDocument();
-            if ( modifiedTextDocuments.find( textdoc ) != modifiedTextDocuments.end() ) // TQt4: !contains
+            if ( modifiedTextDocuments.find( textdoc ) != modifiedTextDocuments.end() )
                 modifiedTextDocuments.insert( textdoc, true );
         }
     }

kword/KWFrame.h

@@ -49,8 +49,6 @@ class TQDomElement;
  *
  * Deprecated, use TQValueVector<KWFrame*> from now on, and sort it with
  * std::sort(frames.begin(),frames.end(),KWFrame::compareFrameZOrder);
- *
- * With TQt4 we'll be able to use qSort for lists.
  */
 class ZOrderedFrameList : public TQPtrList<KWFrame>
 {

kword/KWFrameViewManager.h

@@ -97,7 +97,7 @@ public:
      */
     KWFrameView* selectedFrame() const;
 
-    // this should be changed to a real iterator when TQt4 is used.
+    // this should be changed to a real iterator
     const TQValueList<KWFrameView*> frameViewsIterator() const { return m_frames; }
 
     /**

kword/KWTextFrameSet.cpp

@@ -1795,7 +1795,6 @@ void KWTextFrameSet::saveOasisContent( KoXmlWriter& writer, KoSavingContext& con
         }
 
 
-        // I want TQt4's TQMap/TQHash::value()!
         KoSavingContext::BookmarkPositions bookmarkStarts, bookmarkEnds;
         TQMap<const KoTextParag*, KoTextBookmarkList>::const_iterator bkit = bookmarksPerParagraph.find( parag );
         if ( bkit != bookmarksPerParagraph.end() ) {

kword/KWView.cpp

@@ -2002,11 +2002,9 @@ void KWView::showRulerIndent( double leftMargin, double firstLine, double rightM
 
 void KWView::showAlign( int align ) {
     switch ( align ) {
-#ifndef USE_QT4
         case TQt::AlignAuto: // In left-to-right mode it's align left. TODO: alignright if text->isRightToLeft()
             kdWarning() << k_funcinfo << "shouldn't be called with AlignAuto" << endl;
             // fallthrough
-#endif // USE_QT4
         case TQt::AlignLeft:
             m_actionFormatAlignLeft->setChecked( TRUE );
             break;

lib/kofficecore/KoFilterManager.cpp

@@ -493,7 +493,7 @@ TQStringList KoFilterManager::mimeFilter( const TQCString& mimetype, Direction d
         const TQStringList outMimes = connected( vertices, (*natit).latin1() );
         //kdDebug(s_area) << k_funcinfo << "output formats connected to mime " << *natit << " : " << outMimes << endl;
         for ( TQStringList::ConstIterator mit = outMimes.begin(); mit != outMimes.end(); ++mit )
-            if ( lst.find( *mit ) == lst.end() ) // append only if not there already. TQt4: TQSet<TQString>?
+            if ( lst.find( *mit ) == lst.end() ) // append only if not there already.
                 lst.append( *mit );
     }
     return lst;

lib/kofficeui/KoTabBar.cpp

@@ -283,7 +283,6 @@ void KoTabBarPrivate::drawTab( TQPainter& painter, TQRect& rect, const TQString&
     painter.setPen( tabbar->colorGroup().dark() );
     if( !active )
       painter.drawLine( rect.x()-25, rect.y(), rect.right()+25, rect.top() );
-    // TQt4: painter.setRenderHint( TQPainter::Antialiasing );
     painter.drawPolyline( polygon );
 
     painter.setPen( tabbar->colorGroup().buttonText() );

lib/kotext/KoParagDia.cpp

@@ -616,9 +616,7 @@ void KPagePreview2::drawContents( TQPainter* p )
         }
 
         switch ( align ) {
-#ifndef USE_QT4
             case TQt::AlignAuto:
-#endif // USE_QT4
             case TQt::AlignLeft:
                 __x = _x + 6;
                 break;
@@ -1278,9 +1276,7 @@ void KoParagAlignWidget::display( const KoParagLayout & lay )
 
     clearAligns();
     switch ( align ) {
-#ifndef USE_QT4
         case TQt::AlignAuto: // see KoView::setAlign
-#endif // USE_QT4
         case TQt::AlignLeft:
             rLeft->setChecked( true );
             break;

lib/kotext/KoRichText.cpp

@@ -1243,11 +1243,6 @@ void KoTextString::checkBidi() const
     const KoTextStringChar *end = start + length;
 
     // determines the properties we need for layouting
-#ifdef USE_QT4
-    #warning "KoTextString::checkBidi() for Qt4 partially implemented"
-    printf("[WARNING] KoTextString::checkBidi() partially implemented\n");
-    fflush(stdout);
-#else
     TQTextEngine textEngine( toString(), 0 );
     textEngine.direction = (TQChar::Direction) dir;
     textEngine.itemize(TQTextEngine::SingleLine);
@@ -1286,7 +1281,6 @@ void KoTextString::checkBidi() const
     } else {
 	that->rightToLeft = (textEngine.direction == TQChar::DirR);
     }
-#endif // USE_QT4
 }
 
 TQMemArray<KoTextStringChar> KoTextString::subString( int start, int len ) const

lib/kotext/KoTextBookmark.h

@@ -33,7 +33,7 @@ class KoTextDocument;
  */
 class KOTEXT_EXPORT KoTextBookmark {
 public:
-    KoTextBookmark( const TQString& name = TQString() /*for TQValueList; remove default value when going TQt4*/ );
+    KoTextBookmark( const TQString& name = TQString() );
     KoTextBookmark( const TQString& name,
                     KoTextParag* startParag, KoTextParag* endParag,
                     int start, int end );

lib/store/KoStoreDevice.h

@@ -46,11 +46,7 @@ public:
   void close() { }
   void flush() { }
 
-#ifdef USE_QT4
-  qint64 size() const {
-#else // USE_QT4
   Offset size() const {
-#endif // USE_QT4
     if ( m_store->mode() == KoStore::Read )
       return m_store->size();
     else
@@ -62,11 +58,6 @@ public:
   // Not virtual, only to uncover shadow
   TQ_LONG writeBlock( const TQByteArray& data ) { return TQIODevice::writeBlock( data ); }
 
-#ifdef USE_QT4
-  inline qint64 readData ( char * data, qint64 maxSize ) { return readBlock(data, maxSize); }
-  inline qint64 writeData ( const char * data, qint64 maxSize ) { return writeBlock(data, maxSize); }
-#endif // USE_QT4
-
   int getch() {
     char c[2];
     if ( m_store->read(c, 1) == -1)