From kde-commits  Thu Apr 05 14:23:28 2007
From: Pino Toscano <toscano.pino () tiscali ! it>
Date: Thu, 05 Apr 2007 14:23:28 +0000
To: kde-commits
Subject: KDE/kdebase/libkonq
Message-Id: <1175783008.861562.26624.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=117578423421725

SVN commit 650840 by pino:

less qt3_support


 M  +1 -1      konq_dirpart.cc  
 M  +2 -2      konq_filetip.cc  
 M  +2 -2      konq_popupmenu.cc  


--- trunk/KDE/kdebase/libkonq/konq_dirpart.cc #650839:650840
@@ -124,7 +124,7 @@
 
 int KonqDirPart::KonqDirPartPrivate::nearestIconSizeError(int size)
 {
-    return QABS(size - findNearestIconSize(size));
+    return qAbs(size - findNearestIconSize(size));
 }
 
 KonqDirPart::KonqDirPart( QObject *parent )
--- trunk/KDE/kdebase/libkonq/konq_filetip.cc #650839:650840
@@ -43,7 +43,7 @@
 //--------------------------------------------------------------------------------
 
 KonqFileTip::KonqFileTip( Q3ScrollView* parent )
-  : Q3Frame( 0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool | Qt::WStyle_StaysOnTop | Qt::WX11BypassWM ),
+  : Q3Frame( 0, 0, Qt::FramelessWindowHint | Qt::Tool | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint ),
     m_on( false ),
     m_preview( false ),
     m_filter( false ),
@@ -66,7 +66,7 @@
 
     setPalette( QToolTip::palette() );
     setMargin( 1 );
-    setFrameStyle( Q3Frame::Plain | Q3Frame::Box );
+    setFrameStyle( QFrame::Plain | QFrame::Box );
 
     m_timer = new QTimer(this);
 
--- trunk/KDE/kdebase/libkonq/konq_popupmenu.cc #650839:650840
@@ -851,13 +851,13 @@
                     // use service->noDisplay() here.
                     const QString onlyShowIn = service->property("OnlyShowIn", QVariant::String).toString();
                     if ( !onlyShowIn.isEmpty() ) {
-                        const QStringList aList = QStringList::split(';', onlyShowIn);
+                        const QStringList aList = onlyShowIn.split(';', QString::SkipEmptyParts);
                         if (!aList.contains("KDE"))
                             continue;
                     }
                     const QString notShowIn = service->property("NotShowIn", QVariant::String).toString();
                     if ( !notShowIn.isEmpty() ) {
-                        const QStringList aList = QStringList::split(';', notShowIn);
+                        const QStringList aList = notShowIn.split(';', QString::SkipEmptyParts);
                         if (aList.contains("KDE"))
                             continue;
                     }