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

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/dialogs
From:       Teo Mrnjavac <teo () kde ! org>
Date:       2010-11-11 10:22:36
Message-ID: 20101111102236.4554AAC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1195495 by mrnjavac:

Make Social about dialog work as it should on both mobile and full profile.

 M  +10 -2     kaboutapplicationpersonmodel_p.cpp  
 M  +5 -2      kaboutapplicationpersonmodel_p.h  


--- trunk/KDE/kdelibs/kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp \
#1195494:1195495 @@ -122,9 +122,12 @@
 #endif //HAVE_ATTICA
 }
 
-#ifdef HAVE_ATTICA
 void KAboutApplicationPersonModel::onPersonJobFinished( Attica::BaseJob *job )   \
//SLOT  {
+#ifndef HAVE_ATTICA
+    Q_UNUSED( job )
+#endif //HAVE_ATTICA
+#ifdef HAVE_ATTICA
     Attica::ItemJob< Attica::Person > *personJob =
         static_cast< Attica::ItemJob< Attica::Person > * >( job );
     if( personJob->metadata().error() == Attica::Metadata::NoError ) {
@@ -206,10 +209,15 @@
     }
     else
         kDebug() << "Could not fetch OCS person info.";
+#endif //HAVE_ATTICA
 }
 
 void KAboutApplicationPersonModel::onAvatarJobFinished( QNetworkReply *reply )  \
//SLOT  {
+#ifndef HAVE_ATTICA
+    Q_UNUSED( reply )
+#endif //HAVE_ATTICA
+#ifdef HAVE_ATTICA
     QNetworkAccessManager *manager = reply->manager();
     int personProfileListIndex = manager->property( "personProfile" ).toInt();
 
@@ -232,8 +240,8 @@
 
     emit dataChanged( index( personProfileListIndex ), index( personProfileListIndex \
) );  emit layoutChanged();
+#endif //HAVE_ATTICA
 }
-#endif //HAVE_ATTICA
 
 KAboutApplicationPersonProfileOcsLink::Type \
KAboutApplicationPersonProfileOcsLink::typeFromAttica( const QString &atticaType )  {
--- trunk/KDE/kdelibs/kdeui/dialogs/kaboutapplicationpersonmodel_p.h #1195494:1195495
@@ -33,6 +33,11 @@
 #include <QtGui/QPixmap>
 #include <QtNetwork/QNetworkReply>
 
+// Forward declarations to make Attica-related members work
+namespace Attica {
+class BaseJob;
+}
+
 namespace KDEPrivate
 {
 
@@ -58,10 +63,8 @@
 
 private Q_SLOTS:
     void onProvidersLoaded();
-#ifdef HAVE_ATTICA
     void onPersonJobFinished( Attica::BaseJob *job );
     void onAvatarJobFinished( QNetworkReply *reply );
-#endif //HAVE_ATTICA
 
 private:    
     QList< KAboutPerson > m_personList;


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