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

List:       kde-commits
Subject:    [Amarok] de65def: Fix compilation on some systems. The Context names
From:       Martin Blumenstingl <darklight.xdarklight () googlemail ! com>
Date:       2010-11-15 20:29:58
Message-ID: 20101115202958.C7962A60AA () git ! kde ! org
[Download RAW message or body]

commit de65def6474ff9c8b73ae1bd2ca175255382a917
branch master
Author: Martin Blumenstingl <darklight.xdarklight@googlemail.com>
Date:   Mon Nov 15 21:28:38 2010 +0100

    Fix compilation on some systems.
    The Context namespace conflicts with Plasma::Context there.
    
    This was caused by b11cd9dba88a2407015badc76239bb395ca9ad65.
    Thanks to 'davidsansome' for pointing me into the right direction. :)

diff --git a/src/context/Applet.cpp b/src/context/Applet.cpp
index 55424a9..7dd8cbd 100644
--- a/src/context/Applet.cpp
+++ b/src/context/Applet.cpp
@@ -396,7 +396,7 @@ Context::Applet::plasmaMessageHidden()
 {
     // Disconnect from the messageButtonPressed() signal so the next
     // dialog can be shown.
-    disconnect( SIGNAL( messageButtonPressed( const MessageButton ) ) );
+    disconnect( SIGNAL( messageButtonPressed( MessageButton ) ) );
 
     // No dialog is shown anymore.
     m_isMessageShown = false;
@@ -429,8 +429,8 @@ Context::Applet::showMessage( const QString &message, const char \
                *slot, const KI
         Plasma::MessageButtons plasmaYesNoButtons = Plasma::ButtonYes | \
Plasma::ButtonNo;  
         // Connect Plasma's messageButtonPressed SIGNAL to the given slot.
-        connect( this, SIGNAL( messageButtonPressed( const MessageButton ) ), slot \
                );
-        connect( this, SIGNAL( messageButtonPressed( const MessageButton ) ), SLOT( \
plasmaMessageHidden() ) ); +        connect( this, SIGNAL( messageButtonPressed( \
MessageButton ) ), slot ); +        connect( this, SIGNAL( messageButtonPressed( \
MessageButton ) ), SLOT( plasmaMessageHidden() ) );  
         // Show a dialog and ask the user what to do.
         Plasma::Applet::showMessage( icon, message, plasmaYesNoButtons );
diff --git a/src/context/Applet.h b/src/context/Applet.h
index e8cad32..3838098 100644
--- a/src/context/Applet.h
+++ b/src/context/Applet.h
@@ -37,6 +37,8 @@ namespace Plasma
     class IconWidget;
 }
 
+using Plasma::MessageButton;
+
 namespace Context
 {
 
diff --git a/src/context/applets/lyrics/LyricsApplet.h \
b/src/context/applets/lyrics/LyricsApplet.h index 4aaaf99..71e47a9 100644
--- a/src/context/applets/lyrics/LyricsApplet.h
+++ b/src/context/applets/lyrics/LyricsApplet.h
@@ -25,8 +25,6 @@
 
 class LyricsAppletPrivate;
 
-using namespace Plasma;
-
 class LyricsApplet : public Context::Applet
 {
     Q_OBJECT


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