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

List:       kde-commits
Subject:    extragear/graphics/digikam/digikam
From:       Gilles Caulier <caulier.gilles () free ! fr>
Date:       2006-10-26 8:17:06
Message-ID: 1161850626.508492.8292.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 599195 by cgilles:

using KPopupMenu instead QPopupMenu


 M  +6 -6      digikamapp.cpp  
 M  +4 -1      digikamapp.h  


--- trunk/extragear/graphics/digikam/digikam/digikamapp.cpp #599194:599195
@@ -90,6 +90,7 @@
 #include "batchthumbsgenerator.h"
 #include "digikamview.h"
 #include "digikamapp.h"
+#include "digikamapp.moc"
 
 using KIO::Job;
 using KIO::UDSEntryList;
@@ -123,7 +124,7 @@
     mAlbumManager = AlbumManager::instance();
     AlbumLister::instance();
 
-    mCameraMediaList = new QPopupMenu;
+    mCameraMediaList = new KPopupMenu;
 
     connect(mCameraMediaList, SIGNAL( aboutToShow() ),
             this, SLOT(slotCameraMediaMenu()));
@@ -1261,8 +1262,8 @@
     mMediaItems.clear();
     
     mCameraMediaList->clear();
-    mCameraMediaList->insertItem(i18n("No Media Devices Found"),1);
-    mCameraMediaList->setItemEnabled(1,false);
+    mCameraMediaList->insertItem(i18n("No Media Devices Found"), 0);
+    mCameraMediaList->setItemEnabled(0, false);
         
     KURL kurl("media:/");
     KIO::ListJob *job = KIO::listDir(kurl, false, false);
@@ -1275,12 +1276,12 @@
 {
     int i = 0;
 
-    for(KIO::UDSEntryList::ConstIterator it = list.begin() ; it!=list.end() ; ++it)
+    for(KIO::UDSEntryList::ConstIterator it = list.begin() ; it != list.end() ; ++it)
     {
         QString name;
         QString path;
 
-        for ( UDSEntry::const_iterator et = (*it).begin() ; et !=   (*it).end() ; ++et ) 
+        for ( UDSEntry::const_iterator et = (*it).begin() ; et != (*it).end() ; ++et ) 
         {
             if ( (*et).m_uds == KIO::UDS_NAME)
                 name = ( *et ).m_str;
@@ -1651,4 +1652,3 @@
 
 }  // namespace Digikam
 
-#include "digikamapp.moc"
--- trunk/extragear/graphics/digikam/digikam/digikamapp.h #599194:599195
@@ -51,6 +51,7 @@
 class KToolBarPopupAction;
 class KSelectAction;
 class KConfig;
+class KPopupMenu;
 
 namespace KIPI
 {
@@ -59,6 +60,7 @@
 
 namespace Digikam
 {
+
 class ImagePluginLoader;
 class AlbumManager;
 class PluginLoader;               //   For KIPI pluggins support.
@@ -174,11 +176,12 @@
     QPtrList<KAction>      m_kipiBatchActions;
     QPtrList<KAction>      m_kipiAlbumActions;
 
-    QPopupMenu            *mCameraMediaList;
     QMap<int, QString>     mMediaItems;
 
     QString                mCameraGuiPath;
 
+    KPopupMenu            *mCameraMediaList;
+
     KAccel                *m_accelerators;
 
     KConfig               *m_config;    
[prev in list] [next in list] [prev in thread] [next in thread]