Bring camera icons into XDG compliance

digikam/digikam/digikamapp.cpp

@@ -1480,7 +1480,7 @@ void DigikamApp::slotDownloadImages()
     {
         TDEAction *cAction  = new TDEAction(
                  i18n("Browse %1").arg(KURL(d->cameraGuiPath).prettyURL()),
-                 "camera",
+                 "camera-photo",
                  0,
                  TQT_TQOBJECT(this),
                  TQT_SLOT(slotDownloadImages()),
@@ -1540,7 +1540,7 @@ void DigikamApp::slotCameraAdded(CameraType *ctype)
 {
     if (!ctype) return;
 
-    TDEAction *cAction = new TDEAction(ctype->title(), "camera", 0,
+    TDEAction *cAction = new TDEAction(ctype->title(), "camera-photo", 0,
                                    TQT_TQOBJECT(this), TQT_SLOT(slotCameraConnect()),
                                    actionCollection(),
                                    ctype->title().utf8());

digikam/imageplugins/coreplugin/iccprooftool.cpp

@@ -286,7 +286,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
 
     //---------- "Input" Page Setup ----------------------------------
 
-    m_toolBoxWidgets->insertItem(INPUTPAGE, inProfiles, SmallIconSet("camera"), i18n("Input Profile"));
+    m_toolBoxWidgets->insertItem(INPUTPAGE, inProfiles, SmallIconSet("camera-photo"), i18n("Input Profile"));
     TQWhatsThis::add(inProfiles, i18n("<p>Set here all parameters relevant of Input Color "
                     "Profiles.</p>"));
 

digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp

@@ -272,7 +272,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
 
     //---------- "Input" Page Setup ----------------------------------
 
-    m_toolBoxWidgets->insertItem(INPUTPAGE, inProfiles, SmallIconSet("camera"), i18n("Input Profile"));
+    m_toolBoxWidgets->insertItem(INPUTPAGE, inProfiles, SmallIconSet("camera-photo"), i18n("Input Profile"));
     TQWhatsThis::add(inProfiles, i18n("<p>Set here all parameters relevant of Input Color "
                     "Profiles.</p>"));
 

digikam/utilities/cameragui/camerafolderview.h

@@ -50,10 +50,10 @@ public:
     CameraFolderView(TQWidget* parent);
     ~CameraFolderView();
 
-    void addVirtualFolder(const TQString& name, const TQPixmap& pixmap=SmallIcon("camera"));
+    void addVirtualFolder(const TQString& name, const TQPixmap& pixmap=SmallIcon("camera-photo"));
     void addRootFolder(const TQString& folder, int nbItems, const TQPixmap& pixmap=SmallIcon("folder"));
 
-    CameraFolderItem* addFolder(const TQString& folder, const TQString& subFolder, int nbItems, 
+    CameraFolderItem* addFolder(const TQString& folder, const TQString& subFolder, int nbItems,
                                 const TQPixmap& pixmap=SmallIcon("folder"));
 
     CameraFolderItem* findFolder(const TQString& folderPath);

digikam/utilities/cameragui/camerainfodialog.cpp

@@ -69,7 +69,7 @@ CameraInfoDialog::CameraInfoDialog(TQWidget *parent, const TQString& summary, co
 
     // ----------------------------------------------------------
 
-    TQFrame *p3 = addPage( i18n("About"), i18n("About Driver"), BarIcon("camera", TDEIcon::SizeMedium) );
+    TQFrame *p3 = addPage( i18n("About"), i18n("About Driver"), BarIcon("camera-photo", TDEIcon::SizeMedium) );
     TQVBoxLayout *p3layout = new TQVBoxLayout( p3, 0, 6 );
     
     TQTextEdit *aboutView = new TQTextEdit(about, TQString(), p3);

digikam/utilities/cameragui/cameraui.cpp

@@ -451,7 +451,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
 
     TQPushButton *helpButton = actionButton( Help );
     d->helpMenu = new KHelpMenu(this, kapp->aboutData(), false);
-    d->helpMenu->menu()->insertItem(SmallIcon("camera"), i18n("Camera Information"),
+    d->helpMenu->menu()->insertItem(SmallIcon("camera-photo"), i18n("Camera Information"),
                                     this, TQT_SLOT(slotInformations()), 0, CAMERA_INFO_MENU_ID, 0);
     helpButton->setPopup( d->helpMenu->menu() );
 

digikam/utilities/setup/setupicc.cpp

@@ -7,7 +7,7 @@
  * Description : Color management setup tab.
  *
  * Copyright (C) 2005-2007 by F.J. Cruz <fj.cruz@supercable.es>
- * Copyright (C) 2005-2009 by Gilles Caulier <caulier dot gilles at gmail dot com> 
+ * Copyright (C) 2005-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -257,7 +257,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
     grid2->addMultiCellWidget(d->infoWorkProfiles, 2, 2, 3, 3);
 
     TQLabel *inIcon     = new TQLabel(d->profilesGB);
-    inIcon->setPixmap(SmallIcon("camera"));
+    inIcon->setPixmap(SmallIcon("camera-photo"));
     TQLabel *inProfiles = new TQLabel(i18n("Input:"), d->profilesGB);
     d->inProfilesKC    = new SqueezedComboBox(d->profilesGB);
     inProfiles->setBuddy(d->inProfilesKC);