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

List:       kde-commits
Subject:    extragear/plasma/applets/frame
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2007-11-25 16:48:22
Message-ID: 1196009302.265158.29252.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 741408 by annma:

port to last code -> init() and remove call to resize
clean some includes


 M  +4 -20     frame.cpp  
 M  +1 -1      frame.h  


--- trunk/extragear/plasma/applets/frame/frame.cpp #741407:741408
@@ -20,14 +20,9 @@
 
 #include "frame.h"
 
-#include <QApplication>
-#include <QBitmap>
-#include <QGraphicsScene>
-#include <QPaintEvent>
 #include <QPainter>
 #include <QPixmap>
 #include <QStyleOptionGraphicsItem>
-#include <QGridLayout>
 #include <QRadioButton>
 #include <QGroupBox>
 #include <QGraphicsSceneDragDropEvent>
@@ -41,22 +36,16 @@
 #include <KDebug>
 #include <kdialog.h>
 #include <KLocale>
-#include <KIcon>
 #include <kcolorbutton.h>
 #include <kcombobox.h>
 #include <KSharedConfig>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
-#include <kio/netaccess.h>
 #include <kurl.h>
-#include <QPicture>
-#include <plasma/dataenginemanager.h>
-#include <plasma/layouts/vboxlayout.h>
-#include <plasma/phase.h>
 #include <plasma/theme.h>
+
 #include "math.h"
 
-
 Frame::Frame(QObject *parent, const QVariantList &args)
     : Plasma::Applet(parent, args),
       m_dialog(0), m_paintCount(0)
@@ -65,7 +54,10 @@
     setAcceptDrops(true);
     setAcceptsHoverEvents(true);
     setCachePaintMode(NoCacheMode);
+}
 
+void Frame::init()
+{
     m_dialog = 0;
     m_slideNumber = 0;
     // Get config values
@@ -249,14 +241,6 @@
     cg.config()->sync();
 }
 
-QSizeF Frame::contentSizeHint() const
-{
-    QSizeF pixSize(m_picture.size());
-    pixSize = pixSize.boundedTo(contentSize());
-
-    return pixSize.expandedTo(contentSize());
-}
-
 void Frame::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
 {
 	kDebug() << event->mimeData()->formats();
--- trunk/extragear/plasma/applets/frame/frame.h #741407:741408
@@ -53,7 +53,7 @@
 
         void paintInterface(QPainter *painter, const QStyleOptionGraphicsItem *option,
                             const QRect &contentsRect);
-        QSizeF contentSizeHint() const;
+        void init();
         void constraintsUpdated(Plasma::Constraints constraints);
 
     public slots:
[prev in list] [next in list] [prev in thread] [next in thread]