From 03246172b8855d661309a166db6909e065ea54cb Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Fri, 4 Dec 2009 21:33:25 +0000 Subject: Fix "Warning: Signals cannot be declared virtual" for progresslogger when building with Qt 4.6. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23848 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/base/progressloggerinterface.h | 2 +- rbutil/rbutilqt/progressloggergui.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rbutil/rbutilqt/base/progressloggerinterface.h b/rbutil/rbutilqt/base/progressloggerinterface.h index 4a8fd831f1..9fff7dccae 100644 --- a/rbutil/rbutilqt/base/progressloggerinterface.h +++ b/rbutil/rbutilqt/base/progressloggerinterface.h @@ -42,7 +42,7 @@ public: virtual int getProgressMax()=0; signals: - virtual void aborted()=0; + void aborted(); public slots: diff --git a/rbutil/rbutilqt/progressloggergui.h b/rbutil/rbutilqt/progressloggergui.h index a0c24d6a26..1e62fac7cd 100644 --- a/rbutil/rbutilqt/progressloggergui.h +++ b/rbutil/rbutilqt/progressloggergui.h @@ -38,8 +38,8 @@ public: virtual void setProgressVisible(bool); signals: - virtual void aborted(); - virtual void closed(); + void aborted(); + void closed(); public slots: virtual void addItem(const QString &text); //! add a string to the progress list -- cgit v1.2.3