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

List:       kde-commits
Subject:    extragear/multimedia/k3b/src
From:       Michal Malek <michalm () jabster ! pl>
Date:       2008-09-30 19:57:14
Message-ID: 1222804634.555867.3636.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 866419 by mmalek:

Cleaned up K3BDirView:
- removed redundant headers
- fixed signal<->slot connections
- removed code displaying context menu for device (K3bFileTreeView handles it \
nowadays)

 M  +24 -68    k3bdirview.cpp  
 M  +7 -19     k3bdirview.h  


--- trunk/extragear/multimedia/k3b/src/k3bdirview.cpp #866418:866419
@@ -12,74 +12,40 @@
  * See the file "COPYING" for the exact licensing terms.
  */
 
+// K3B-includes
+#include <config-k3b.h>
 #include "k3bdirview.h"
-#include "k3bapplication.h"
 #include "k3b.h"
-#include <config-k3b.h>
-
+#include "k3bappdevicemanager.h"
+#include "k3bapplication.h"
+#include "k3bdevice.h"
+#include "k3bdevicehandler.h"
+#include "k3bdiskinfoview.h"
+#include "k3bexternalbinmanager.h"
+#include "k3bfileview.h"
+#include "k3bfiletreeview.h"
+#include "k3bmediacache.h"
+#include "k3bpassivepopup.h"
+#include "k3bthememanager.h"
 #include "rip/k3baudiocdview.h"
 #include "rip/k3bvideocdview.h"
 #ifdef HAVE_LIBDVDREAD
 #include "rip/videodvd/k3bvideodvdrippingview.h"
 #endif
-#include "k3bfileview.h"
-#include "k3bfiletreeview.h"
-#include "k3bappdevicemanager.h"
-#include "k3bdiskinfoview.h"
-#include <k3bdevicehandler.h>
-#include <k3bdevice.h>
-#include <k3bthememanager.h>
-#include <k3bmediacache.h>
-#include <k3bexternalbinmanager.h>
-#include <k3bpassivepopup.h>
-#include <KActionMenu>
-#include <kactioncollection.h>
-#include <kmenu.h>
+
+// KDE-includes
+#include <KConfig>
+#include <KLocale>
+#include <KMessageBox>
+#include <KUrl>
 #include <unistd.h>
+
 // QT-includes
-#include <qdir.h>
-#include <q3listview.h>
-#include <qstring.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qpixmap.h>
-#include <qstringlist.h>
-#include <q3strlist.h>
-#include <qsplitter.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qicon.h>
-#include <q3valuelist.h>
-#include <qlabel.h>
+#include <QDir>
+#include <QSplitter>
+#include <QString>
 #include <QStackedWidget>
-#include <q3scrollview.h>
-#include <qpainter.h>
-#include <q3simplerichtext.h>
 
-// KDE-includes
-#include <kmimetype.h>
-#include <kcursor.h>
-#include <ktoolbar.h>
-#include <kiconloader.h>
-#include <kurl.h>
-#include <klocale.h>
-#include <kstandarddirs.h>
-#include <kio/global.h>
-#include <krun.h>
-#include <k3process.h>
-#include <kio/job.h>
-#include <kcombobox.h>
-#include <k3filetreeview.h>
-#include <kdialog.h>
-#include <kmessagebox.h>
-#include <kstandardaction.h>
-#include <kconfig.h>
-#include <kaction.h>
-#include <kinputdialog.h>
-#include <kvbox.h>
-
-
-
 class K3bDirView::Private
 {
 public:
@@ -138,10 +104,8 @@
              this, SLOT(slotDirActivated(const KUrl&)) );
     connect( m_fileTreeView, SIGNAL(activated(K3bDevice::Device*)),
              this, SLOT(showDevice(K3bDevice::Device*)) );
-    connect( m_fileTreeView, SIGNAL(deviceExecuted(K3bDevice::Device*)),
+    connect( m_fileTreeView, SIGNAL(activated(K3bDevice::Device*)),
              this, SIGNAL(deviceSelected(K3bDevice::Device*)) );
-    connect( m_fileTreeView, SIGNAL(contextMenu(K3bDevice::Device*, const QPoint&)),
-             this, SLOT(slotFileTreeContextMenu(K3bDevice::Device*, const QPoint&)) \
);  
     connect( m_fileView, SIGNAL(urlEntered(const KUrl&)), m_fileTreeView, \
                SLOT(setSelectedUrl(const KUrl&)) );
     connect( m_fileView, SIGNAL(urlEntered(const KUrl&)), this, \
SIGNAL(urlEntered(const KUrl&)) ); @@ -321,14 +285,6 @@
 }
 
 
-void K3bDirView::slotFileTreeContextMenu( K3bDevice::Device* /*dev*/, const QPoint& \
                p )
-{
-    QAction* a = k3bappcore->appDeviceManager()->actionCollection()->action( \
                "device_popup" );
-    if( KActionMenu* m = dynamic_cast<KActionMenu*>(a) )
-        m->menu()->exec( p );
-}
-
-
 void K3bDirView::slotDirActivated( const QString& url )
 {
 //   m_urlCombo->insertItem( url, 0 );
--- trunk/extragear/multimedia/k3b/src/k3bdirview.h #866418:866419
@@ -12,37 +12,27 @@
  * See the file "COPYING" for the exact licensing terms.
  */
 
-
 #ifndef K3BDIRVIEW_H
 #define K3BDIRVIEW_H
 
-
-//Added by qt3to4:
-#include <QLabel>
-
 #include <k3bmedium.h>
-#include <kvbox.h>
+#include <KVBox>
 
-class QSplitter;
-class KUrl;
 class K3bAudioCdView;
-class K3bVideoCdView;
+class K3bDiskInfoView;
+class K3bFileTreeView;
 class K3bFileView;
+class K3bVideoCdView;
 class K3bVideoDVDRippingView;
 class KComboBox;
-class K3bFileTreeView;
-class QStackedWidget;
-class K3bDiskInfoView;
-class Q3ScrollView;
-class QLabel;
-class KConfig;
 class KConfigGroup;
+class KUrl;
+class QSplitter;
+class QStackedWidget;
 namespace K3bDevice {
     class Device;
-    class DiskInfo;
 }
 
-
 /**
  *@author Sebastian Trueg
  */
@@ -68,7 +58,6 @@
     void slotUnmountFinished( bool );
     void showMediumInfo( const K3bMedium& );
     void home();
-    void slotFileTreeContextMenu( K3bDevice::Device* dev, const QPoint& p );
 
 Q_SIGNALS:
     void urlEntered( const KUrl& );
@@ -76,7 +65,6 @@
 
 private:
     QStackedWidget* m_viewStack;
-    Q3ScrollView* m_scroll;
 
     K3bAudioCdView*   m_cdView;
     K3bVideoCdView*   m_videoView;


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