[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-10 15:25:29
Message-ID: 20101110152529.B36A8AC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1195204 by mrnjavac:

Fix #ifdef positions and includes to make compile with mobile profile.

 M  +2 -5      kaboutapplicationpersonmodel_p.cpp  
 M  +3 -0      kaboutapplicationpersonmodel_p.h  


--- trunk/KDE/kdelibs/kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp \
#1195203:1195204 @@ -26,7 +26,6 @@
 
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkRequest>
-#include <QtNetwork/QNetworkReply>
 
 namespace KDEPrivate
 {
@@ -123,9 +122,9 @@
 #endif //HAVE_ATTICA
 }
 
+#ifdef HAVE_ATTICA
 void KAboutApplicationPersonModel::onPersonJobFinished( Attica::BaseJob *job )   \
//SLOT  {
-#ifdef HAVE_ATTICA
     Attica::ItemJob< Attica::Person > *personJob =
         static_cast< Attica::ItemJob< Attica::Person > * >( job );
     if( personJob->metadata().error() == Attica::Metadata::NoError ) {
@@ -207,12 +206,10 @@
     }
     else
         kDebug() << "Could not fetch OCS person info.";
-#endif //HAVE_ATTICA
 }
 
 void KAboutApplicationPersonModel::onAvatarJobFinished( QNetworkReply *reply )  \
//SLOT  {
-#ifdef HAVE_ATTICA
     QNetworkAccessManager *manager = reply->manager();
     int personProfileListIndex = manager->property( "personProfile" ).toInt();
 
@@ -235,8 +232,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 #1195203:1195204
@@ -31,6 +31,7 @@
 
 #include <QtCore/QAbstractListModel>
 #include <QtGui/QPixmap>
+#include <QtNetwork/QNetworkReply>
 
 namespace KDEPrivate
 {
@@ -57,8 +58,10 @@
 
 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]