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

List:       kde-commits
Subject:    koffice
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2006-08-31 20:55:50
Message-ID: 1157057750.954066.31376.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 579335 by sebsauer:

revert r578171 since it does not solve the crash-on-file-close issue :-/


 M  +1 -1      karbon/karbon_view.cc  
 M  +1 -1      kivio/src/part/KivioView.cpp  
 M  +1 -1      kword/part/KWView.cpp  
 M  +1 -1      libs/kofficeui/KoToolBox.cpp  
 M  +1 -1      libs/kofficeui/KoToolBox.h  
 M  +2 -2      libs/kofficeui/KoToolManager.cpp  
 M  +2 -2      libs/kofficeui/KoToolManager.h  


--- trunk/koffice/karbon/karbon_view.cc #579334:579335
@@ -1716,7 +1716,7 @@
 }
 
 QDockWidget *KarbonView::createToolBox() {
-	return KoToolManager::instance()->toolBox(this, "Karbon");
+	return KoToolManager::instance()->toolBox("Karbon");
 }
 
 
--- trunk/koffice/kivio/src/part/KivioView.cpp #579334:579335
@@ -96,7 +96,7 @@
   layout->addWidget(m_canvasController, 0, 0);
 
   KoToolManager::instance()->addControllers(m_canvasController, this);
-  shell()->addDockWidget(Qt::LeftDockWidgetArea, KoToolManager::instance()->toolBox(this, "Kivio"));
+  shell()->addDockWidget(Qt::LeftDockWidgetArea, KoToolManager::instance()->toolBox("Kivio"));
 
   KoShapeSelector *selector = new KoShapeSelector(0, m_canvasController, ".*");
   selector->resize(QSize(100, 200));
--- trunk/koffice/kword/part/KWView.cpp #579334:579335
@@ -199,7 +199,7 @@
 }
 
 QDockWidget *KWView::createToolBox() {
-    return KoToolManager::instance()->toolBox(this, "KWord");
+    return KoToolManager::instance()->toolBox("KWord");
 }
 
 #include "KWView.moc"
--- trunk/koffice/libs/kofficeui/KoToolBox.cpp #579334:579335
@@ -30,7 +30,7 @@
 #include <QMainWindow>
 #include <QBoxLayout>
 
-KoToolBox::KoToolBox(QWidget* parent) : QDockWidget(parent) {
+KoToolBox::KoToolBox() : QDockWidget() {
     m_buttonGroup = new QButtonGroup(this);
     setFeatures(DockWidgetMovable | DockWidgetFloatable);
 }
--- trunk/koffice/libs/kofficeui/KoToolBox.h #579334:579335
@@ -45,7 +45,7 @@
     Q_OBJECT
 public:
     /// constructor
-    KoToolBox(QWidget* parent);
+    KoToolBox();
     ~KoToolBox();
 
     /**
--- trunk/koffice/libs/kofficeui/KoToolManager.cpp #579334:579335
@@ -87,9 +87,9 @@
         connect(tool, SIGNAL(toolActivated(ToolHelper*)), this, SLOT(toolActivated(ToolHelper*)));
 }
 
-KoToolBox *KoToolManager::toolBox(QWidget* parent, const QString &applicationName) {
+KoToolBox *KoToolManager::toolBox(const QString &applicationName) {
     setup();
-    KoToolBox *toolBox = new KoToolBox(parent);
+    KoToolBox *toolBox = new KoToolBox();
     foreach(ToolHelper *tool, m_tools) {
         QAbstractButton *but = tool->createButton();
         toolBox->addButton(but, tool->toolType(), tool->priority(), tool->uniqueId());
--- trunk/koffice/libs/kofficeui/KoToolManager.h #579334:579335
@@ -79,12 +79,12 @@
      * If your view extends KoView the line of code is:
 @code
     shell()->addDockWidget(Qt::LeftDockWidgetArea,
-        KoToolManager::instance()->toolBox(this, "MyApp"));
+        KoToolManager::instance()->toolBox("MyApp"));
 @endcode
      * @param parent the parent QWidget the toolbox will be child of.
      * @param applicationName the title for the toolbox
      */
-    KoToolBox *toolBox(QWidget* parent, const QString &applicationName = QString());
+    KoToolBox *toolBox(const QString &applicationName = QString());
 
     void registerTools(KActionCollection *ac);
 
[prev in list] [next in list] [prev in thread] [next in thread]