1 files changed, 0 insertions, 48 deletions
diff --git a/src/qalculateexpressionedit.cpp b/src/qalculateexpressionedit.cpp
index c834f6e..f5ae71a 100644
--- a/src/qalculateexpressionedit.cpp
+++ b/src/qalculateexpressionedit.cpp
@@ -23,7 +23,6 @@
 #include "kqalculate.h"
 #include <vector>
 #include <string>
-#include <tdeversion.h>
 #include <kcursor.h>
 #include <tqstyle.h>
 #include <tqpainter.h>
@@ -794,36 +793,6 @@ QalculateExpressionEditListBoxItem::QalculateExpressionEditListBoxItem(Expressio
 QalculateExpressionEditListBoxItem::~QalculateExpressionEditListBoxItem() {
 }
 
-#if TDE_VERSION_MAJOR < 4 && TDE_VERSION_MINOR < 2
-TQString rPixelSqueeze(const TQString& name, const TQFontMetrics& fontMetrics, uint maxPixels)
-{
-  uint nameWidth = fontMetrics.width(name);
-
-  if (maxPixels < nameWidth)
-  {
-    TQString tmp = name;
-    const uint em = fontMetrics.maxWidth();
-    maxPixels -= fontMetrics.width("...");
-
-    while (maxPixels < nameWidth && !tmp.isEmpty())
-    {
-      int length = tmp.length();
-      int delta = em ? (nameWidth - maxPixels) / em : length;
-
-      if(delta < 1) delta = 1;
-      else if(length < delta) delta = length;
-
-      tmp.remove(length - delta, delta);
-      nameWidth = fontMetrics.width(tmp);
-    }
-
-    return (tmp + "...");
-  }
-
-  return name;
-}
-#endif
-
 void QalculateExpressionEditListBoxItem::paint(TQPainter *painter) {
 
 	int itemHeight = height(listBox());
@@ -840,11 +809,7 @@ void QalculateExpressionEditListBoxItem::paint(TQPainter *painter) {
 			if(rt.widthUsed() > nameWidth - 1) {
 				squeezedText = text();			
 				if(italic_index > 0) squeezedText.truncate(italic_index);
-#if TDE_VERSION_MAJOR < 4 && TDE_VERSION_MINOR < 2	
-				squeezedText = rPixelSqueeze(squeezedText, listBox()->fontMetrics(), nameWidth);
-#else
 				squeezedText = KStringHandler::rPixelSqueeze(squeezedText, listBox()->fontMetrics(), nameWidth);
-#endif
 				painter->drawText(0, 0, nameWidth, itemHeight, TQt::AlignLeft | TQt::AlignVCenter, squeezedText);
 			} else {
 				TQColorGroup cg = listBox()->colorGroup();
@@ -852,18 +817,10 @@ void QalculateExpressionEditListBoxItem::paint(TQPainter *painter) {
 				rt.draw(painter, 1, 0, TQRect(0, 0, nameWidth - 1, itemHeight), cg, &painter->brush());
 			}
 		} else {
-#if TDE_VERSION_MAJOR < 4 && TDE_VERSION_MINOR < 2	
-			squeezedText = rPixelSqueeze(text(), listBox()->fontMetrics(), nameWidth);
-#else
 			squeezedText = KStringHandler::rPixelSqueeze(text(), listBox()->fontMetrics(), nameWidth);
-#endif
 			painter->drawText(0, 0, nameWidth, itemHeight, TQt::AlignLeft | TQt::AlignVCenter, squeezedText);
 		}
-#if TDE_VERSION_MAJOR < 4 && TDE_VERSION_MINOR < 2	
-		squeezedText = rPixelSqueeze(title, listBox()->fontMetrics(), titleWidth);
-#else
 		squeezedText = KStringHandler::rPixelSqueeze(title, listBox()->fontMetrics(), titleWidth);
-#endif		
 		TQFont font = painter->font();
 		font.setItalic(true);
 		painter->setFont(font);
@@ -943,12 +900,7 @@ void QalculateExpressionEditCompletionBox::setItems(const TQValueVector<Expressi
 	sort();
 
 	if(isVisible() && size().height() != sizeHint().height()) {
-#if TDE_VERSION_MAJOR < 4 && TDE_VERSION_MINOR < 2
-		hide();
-		popup();
-#else
 		sizeAndPosition();
-#endif
 	}
 
 	blockSignals(block);