[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Laurent Montel]

SVN commit 594475 by mlaurent:

Q3Frame--


 M  +1 -1      dialogs/activitydialog.cpp  
 M  +1 -1      dialogs/assocpropdlg.cpp  
 M  +1 -1      dialogs/classpropdlg.cpp  
 M  +1 -2      dialogs/codeviewerdialog.h  
 M  +1 -1      dialogs/statedialog.cpp  
 M  +1 -1      dialogs/umlviewdialog.cpp  
 M  +2 -2      kplayerslideraction.cpp  
 M  +4 -4      kplayerslideraction.h  
 M  +2 -2      notewidget.cpp  
 M  +2 -2      uml.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/activitydialog.cpp #594474:594475
@@ -19,7 +19,7 @@
 #include <qlayout.h>
 //Added by qt3to4:
 #include <kicon.h>
-#include <Q3Frame>
+#include <QFrame>
 #include <QHBoxLayout>
 #include <QGridLayout>
 #include <kvbox.h>
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/assocpropdlg.cpp #594474:594475
@@ -16,7 +16,7 @@
 #include <qlayout.h>
 #include <qlabel.h>
 //Added by qt3to4:
-#include <Q3Frame>
+#include <QFrame>
 #include <QHBoxLayout>
 #include <kicon.h>
 #include <klocale.h>
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/classpropdlg.cpp #594474:594475
@@ -13,7 +13,7 @@
 // qt/kde includes
 #include <qlayout.h>
 //Added by qt3to4:
-#include <Q3Frame>
+#include <QFrame>
 #include <QHBoxLayout>
 #include <kiconloader.h>
 #include <klocale.h>
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/codeviewerdialog.h #594474:594475
@@ -26,7 +26,7 @@
 #include <q3textedit.h>
 //Added by qt3to4:
 #include <QVBoxLayout>
-#include <Q3Frame>
+#include <QFrame>
 #include <QHBoxLayout>
 #include <QGridLayout>
 #include "../codeviewerstate.h"
@@ -36,7 +36,6 @@
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
-class Q3Frame;
 
 class UMLObject;
 
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/statedialog.cpp #594474:594475
@@ -23,7 +23,7 @@
 #include <q3groupbox.h>
 #include <kicon.h>
 //Added by qt3to4:
-#include <Q3Frame>
+#include <QFrame>
 #include <QHBoxLayout>
 #include <QGridLayout>
 #include <kvbox.h>
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlviewdialog.cpp #594474:594475
@@ -26,7 +26,7 @@
 #include <qspinbox.h>
 #include <kicon.h>
 //Added by qt3to4:
-#include <Q3Frame>
+#include <QFrame>
 #include <QHBoxLayout>
 #include <knuminput.h>
 #include <q3vbox.h>
--- trunk/KDE/kdesdk/umbrello/umbrello/kplayerslideraction.cpp #594474:594475
@@ -26,7 +26,7 @@
 #include <qtooltip.h>
 #include <q3whatsthis.h>
 //Added by qt3to4:
-#include <Q3Frame>
+#include <QFrame>
 #include <QKeyEvent>
 #include <QDesktopWidget>
 #include <kdebug.h>
@@ -73,7 +73,7 @@
         : KAction (text, pix, shortcut, receiver, slot, parent, name)
 {
     m_frame = new KPlayerPopupFrame;
-    m_frame -> setFrameStyle (Q3Frame::PopupPanel | Q3Frame::Raised);
+    m_frame -> setFrameStyle (QFrame::PopupPanel | QFrame::Raised);
     m_frame -> setLineWidth (2);
     m_slider = new KPlayerSlider (Qt::Vertical, m_frame);
     m_frame -> resize (36, m_slider -> sizeHint().height() + 4);
--- trunk/KDE/kdesdk/umbrello/umbrello/kplayerslideraction.h #594474:594475
@@ -19,7 +19,7 @@
 #include <kaction.h>
 #include <qslider.h>
 //Added by qt3to4:
-#include <Q3Frame>
+#include <QFrame>
 #include <QKeyEvent>
 
 /**KPlayer's slider widget. Works around the Qt upside-down slider bug.
@@ -104,15 +104,15 @@
 /**KPlayer popup frame.
   *@author kiriuja
   */
-class KPlayerPopupFrame : public Q3Frame
+class KPlayerPopupFrame : public QFrame
 {
     Q_OBJECT
 
 public:
     /** The KPlayerPopupFrame constructor. Parameters are passed on to QFrame.
       */
-    KPlayerPopupFrame (QWidget* parent = 0, const char* name = 0)
-            : Q3Frame (parent, name, Qt::WType_Popup) { }
+    KPlayerPopupFrame (QWidget* parent = 0/*, const char* name = 0*/)
+            : QFrame (parent/*, name, Qt::WType_Popup*/) { }
     /** The KPlayerPopupFrame destructor. Does nothing.
       */
     virtual ~KPlayerPopupFrame() { }
--- trunk/KDE/kdesdk/umbrello/umbrello/notewidget.cpp #594474:594475
@@ -15,7 +15,7 @@
 #include <q3pointarray.h>
 #include <qpainter.h>
 #include <q3textedit.h>
-#include <q3frame.h>
+#include <qframe.h>
 //Added by qt3to4:
 #include <QMouseEvent>
 // kde includes
@@ -40,7 +40,7 @@
     // NB: This code is currently deactivated because
     // Zoom does not yet work with the embedded text editor.
     m_pEditor = new Q3TextEdit(view);
-    m_pEditor->setFrameStyle(Q3Frame::NoFrame | Q3Frame::Plain);
+    m_pEditor->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
     m_pEditor->setHScrollBarMode(Q3ScrollView::AlwaysOff);
     m_pEditor->setVScrollBarMode(Q3ScrollView::AlwaysOff);
     m_pEditor->setTextFormat(Qt::RichText);
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #594474:594475
@@ -20,7 +20,7 @@
 #include <qtoolbutton.h>
 //Added by qt3to4:
 #include <QKeyEvent>
-#include <Q3Frame>
+#include <QFrame>
 #include <QMenuItem>
 #include <QDockWidget>
 #include <QStackedWidget>
@@ -436,7 +436,7 @@
     m_statusLabel = new KStatusBarLabel( i18n("Ready."), 0, statusBar() );
     m_statusLabel->setFixedHeight( m_statusLabel->sizeHint().height() );
 
-    m_statusLabel->setFrameStyle( Q3Frame::NoFrame | Q3Frame::Plain );
+    m_statusLabel->setFrameStyle( QFrame::NoFrame | QFrame::Plain );
     m_statusLabel->setMargin( 0 );
     m_statusLabel->setLineWidth(0);