[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    tags/KDE/3.5.0/kdebase
From:       Stephan Kulow <coolo () kde ! org>
Date:       2005-11-26 6:52:36
Message-ID: 1132987956.630501.3894.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 483368 by coolo:

merge in some fixes since RC2


 M  +1 -0      kcontrol/joystick/joydevice.h  
 M  +3 -3      kcontrol/kicker/menutab_impl.cpp  
 M  +1 -1      kioslave/fish/fish.cpp  
 M  +18 -15    kwin/clients/keramik/keramik.cpp  
 M  +0 -1      kwin/clients/keramik/keramik.h  


--- tags/KDE/3.5.0/kdebase/kcontrol/joystick/joydevice.h #483367:483368
@@ -23,6 +23,7 @@
 
 #include <qstring.h>
 
+#include <sys/types.h>
 #include <linux/joystick.h>
 
 // helper class which holds all current values, file descriptor, etc. for
--- tags/KDE/3.5.0/kdebase/kcontrol/kicker/menutab_impl.cpp #483367:483368
@@ -84,7 +84,7 @@
                                       i18n("Bookmarks"),
                                       QString::null,
                                       SmallIcon("bookmark"),
-                                      c->readBoolEntry("UseBookmarks", true));
+                                      c->readBoolEntry("UseBookmarks", false));
     connect(m_bookmarkMenu, SIGNAL(toggled(bool)), SIGNAL(changed()));
 
     // show the quick menus menu?
@@ -92,10 +92,10 @@
                                           i18n("Quick Browser"),
                                           QString::null,
                                           SmallIcon("kdisknav"),
-                                          c->readBoolEntry("UseBrowser", true));
+                                          c->readBoolEntry("UseBrowser", false));
     connect(m_quickBrowserMenu, SIGNAL(toggled(bool)), SIGNAL(changed()));
 
-    QStringList ext = c->readListEntry("Extensions");
+    QStringList ext = c->readListEntry("Extensions", "prefmenu.desktop,systemmenu.desktop");
     QStringList dirs = KGlobal::dirs()->findDirs("data", "kicker/menuext");
     kSubMenuItem* menuItem(0);
     for (QStringList::ConstIterator dit=dirs.begin(); dit!=dirs.end(); ++dit)
--- tags/KDE/3.5.0/kdebase/kioslave/fish/fish.cpp #483367:483368
@@ -1216,7 +1216,7 @@
         if (buflen <= 0) break;
 
         if (rawRead > 0) {
-            myDebug( << "processedSize " << dataRead << ", len " << buflen << "/" << rawRead << endl);
+            //myDebug( << "processedSize " << dataRead << ", len " << buflen << "/" << rawRead << endl);
             int dataSize = (rawRead > buflen?buflen:rawRead);
             if (!mimeTypeSent)
             {
--- tags/KDE/3.5.0/kdebase/kwin/clients/keramik/keramik.cpp #483367:483368
@@ -41,7 +41,19 @@
 
 // -------------------------------------------------------------------------------------------
 
+static void flip( QPixmap *&pix )
+{
+	QPixmap *tmp = new QPixmap( pix->xForm( QWMatrix(-1,0,0,1,pix->width(),0) ) );
+	delete pix;
+	pix = tmp;
+}
 
+static void flip( QBitmap *&pix )
+{
+	QBitmap *tmp = new QBitmap( pix->xForm( QWMatrix(-1,0,0,1,pix->width(),0) ) );
+	delete pix;
+	pix = tmp;
+}
 
 namespace Keramik
 {
@@ -195,11 +207,11 @@
 
 	// Flip the bitmaps horizontally in right-to-left mode
 	if ( QApplication::reverseLayout() ) {
-		for ( int i = 0; i < Help; i++ )
-			flip( reinterpret_cast<QPixmap**>(buttonDecos)[i] );
+		for ( int i = 0; i < Help; ++i )
+			::flip( buttonDecos[i] );
 
-		for ( int i = Help + 1; i < NumButtonDecos; i++ )
-			flip( reinterpret_cast<QPixmap**>(buttonDecos)[i] );
+		for ( int i = Help + 1; i < NumButtonDecos; ++i )
+			::flip( buttonDecos[i] );
 	}
 
 	readConfig();
@@ -393,8 +405,8 @@
 		flip( activeTiles[GrabBarLeft], activeTiles[GrabBarRight] );
 		flip( inactiveTiles[GrabBarLeft], inactiveTiles[GrabBarRight] );
 
-		flip( titleButtonRound );
-		flip( titleButtonSquare );
+		::flip( titleButtonRound );
+		::flip( titleButtonSquare );
 	}
 
 	// Pretile the center & border tiles for optimal performance
@@ -528,15 +540,6 @@
 }
 
 
-void KeramikHandler::flip( QPixmap *&pix )
-{
-	// Flip the pixmap horizontally
-	QPixmap *tmp = new QPixmap( pix->xForm( QWMatrix(-1,0,0,1,pix->width(),0) ) );
-	delete pix;
-	pix = tmp;
-}
-
-
 void KeramikHandler::pretile( QPixmap *&pix, int size, Qt::Orientation dir )
 {
 	QPixmap *newpix;
--- tags/KDE/3.5.0/kdebase/kwin/clients/keramik/keramik.h #483367:483368
@@ -92,7 +92,6 @@
 			void addWidth  (int width,  QPixmap *&pix, bool left, QPixmap *bottomPix);
 			void addHeight (int height, QPixmap *&pix);
 			void flip( QPixmap *&, QPixmap *& );
-			void flip( QPixmap *& );
 			void pretile( QPixmap *&, int, Qt::Orientation );
 			QPixmap *composite( QImage *, QImage * );
 			QImage  *loadImage( const QString &, const QColor & );
[prev in list] [next in list] [prev in thread] [next in thread]