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

List:       kde-commits
Subject:    [k3b/kf5] src: Fix build.
From:       Johannes Obermayr <johannesobermayr () gmx ! de>
Date:       2016-01-02 18:42:50
Message-ID: E1aFR8c-00041D-GK () scm ! kde ! org
[Download RAW message or body]

Git commit 734d5c452b987223f77519be5cca94820289d077 by Johannes Obermayr.
Committed on 02/01/2016 at 18:42.
Pushed by jobermayr into branch 'kf5'.

Fix build.

M  +0    -1    src/k3bjobprogressdialog.h
M  +1    -1    src/option/k3bdevicewidget.cpp
M  +1    -1    src/rip/k3baudiocdview.cpp

http://commits.kde.org/k3b/734d5c452b987223f77519be5cca94820289d077

diff --git a/src/k3bjobprogressdialog.h b/src/k3bjobprogressdialog.h
index a210494..5607da2 100644
--- a/src/k3bjobprogressdialog.h
+++ b/src/k3bjobprogressdialog.h
@@ -97,7 +97,6 @@ namespace K3b {
          * \reimpl from QDialog
          */
         void reject() override;
-        virtual void slotButtonClicked( int button );
 
 	void slotShowDebuggingOutput();
 
diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp
index 79e0935..c2be4c9 100644
--- a/src/option/k3bdevicewidget.cpp
+++ b/src/option/k3bdevicewidget.cpp
@@ -58,7 +58,7 @@ K3b::DeviceWidget::DeviceWidget( K3b::Device::DeviceManager* manager, QWidget *p
     m_messageWidget->hide();
     m_messageWidget->setWordWrap( true );
 #ifdef ENABLE_PERMISSION_HELPER
-    m_addToGroupAction = new KAction( QIcon::fromTheme("dialog-password"), QString(), this );
+    m_addToGroupAction = new QAction( QIcon::fromTheme("dialog-password"), QString(), this );
 #endif
 
     // buttons
diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp
index 1810d48..c1bf705 100644
--- a/src/rip/k3baudiocdview.cpp
+++ b/src/rip/k3baudiocdview.cpp
@@ -405,7 +405,7 @@ void K3b::AudioCdView::slotEditAlbumCddb()
     } else {
         spinYear->setValue( d->trackModel->cddbInfo().get( KCDDB::Year ).toInt() );
     }
-    QFrame* line = new QFrame( w );
+    QFrame* line = new QFrame( this );
     line->setFrameShape( QFrame::HLine );
     line->setFrameShadow( QFrame::Sunken );
     KComboBox* comboGenre = new KComboBox( this );
[prev in list] [next in list] [prev in thread] [next in thread]