[qet] [3776] Fix compilation error on windows:

[subversion@xxxxxxxxxxxxx]

Revision: 3776
Author:   blacksun
Date:     2015-02-28 12:59:07 +0100 (Sat, 28 Feb 2015)
Log Message:
-----------
Fix compilation error on windows:
Rename some icons, again because name was already used by mingw

Modified Paths:
--------------
    branches/Qt5/sources/elementspanelwidget.cpp
    branches/Qt5/sources/exportdialog.cpp
    branches/Qt5/sources/qeticons.cpp
    branches/Qt5/sources/qeticons.h

Modified: branches/Qt5/sources/elementspanelwidget.cpp
===================================================================
--- branches/Qt5/sources/elementspanelwidget.cpp	2015-02-28 10:54:09 UTC (rev 3775)
+++ branches/Qt5/sources/elementspanelwidget.cpp	2015-02-28 11:59:07 UTC (rev 3776)
@@ -54,7 +54,7 @@
 	
 	// initialise les actions
 	open_directory        = new QAction(QET::Icons::DocumentOpen,              tr("Ouvrir le dossier correspondant"),     this);
-	copy_path             = new QAction(QET::Icons::CopyFile,                  tr("Copier le chemin"),                    this);
+	copy_path             = new QAction(QET::Icons::IC_CopyFile,                  tr("Copier le chemin"),                    this);
 	reload                = new QAction(QET::Icons::ViewRefresh,               tr("Recharger les collections"),           this);
 	new_category          = new QAction(QET::Icons::FolderNew,                 tr("Nouvelle catégorie"),               this);
 	edit_category         = new QAction(QET::Icons::FolderEdit,                tr("Éditer la catégorie"),           this);
@@ -77,8 +77,8 @@
 	tbt_add               = new QAction(QET::Icons::TitleBlock,                tr("Nouveau modèle"),                   this);
 	tbt_edit              = new QAction(QET::Icons::TitleBlock,                tr("Éditer ce modèle"),              this);
 	tbt_remove            = new QAction(QET::Icons::TitleBlock,                tr("Supprimer ce modèle"),              this);
-	move_elements_        = new QAction(QET::Icons::MoveFile,                  tr("Déplacer dans cette catégorie"), this);
-	copy_elements_        = new QAction(QET::Icons::CopyFile,                  tr("Copier dans cette catégorie"),      this);
+	move_elements_        = new QAction(QET::Icons::IC_MoveFile,                  tr("Déplacer dans cette catégorie"), this);
+	copy_elements_        = new QAction(QET::Icons::IC_CopyFile,                  tr("Copier dans cette catégorie"),      this);
 	cancel_elements_      = new QAction(QET::Icons::Cancel,                    tr("Annuler"),                             this);
 	erase_textfield       = new QAction(QET::Icons::EditClearLocationBar,      tr("Effacer le filtre"),                   this);
 

Modified: branches/Qt5/sources/exportdialog.cpp
===================================================================
--- branches/Qt5/sources/exportdialog.cpp	2015-02-28 10:54:09 UTC (rev 3775)
+++ branches/Qt5/sources/exportdialog.cpp	2015-02-28 11:59:07 UTC (rev 3776)
@@ -1069,7 +1069,7 @@
 	preview -> setToolTip(QObject::tr("Aperçu"));
 	
 	clipboard = new QPushButton();
-	clipboard -> setIcon(QET::Icons::CopyFile);
+	clipboard -> setIcon(QET::Icons::IC_CopyFile);
 	clipboard -> setToolTip(QObject::tr("Exporter vers le presse-papier"));
 }
 

Modified: branches/Qt5/sources/qeticons.cpp
===================================================================
--- branches/Qt5/sources/qeticons.cpp	2015-02-28 10:54:09 UTC (rev 3775)
+++ branches/Qt5/sources/qeticons.cpp	2015-02-28 11:59:07 UTC (rev 3776)
@@ -35,7 +35,7 @@
 		QIcon ConductorSettings;
 		QIcon Configure;
 		QIcon ConfigureToolbars;
-		QIcon CopyFile;
+		QIcon IC_CopyFile;
 		QIcon DefaultConductor;
 		QIcon DiagramAdd;
 		QIcon Diagram;
@@ -99,7 +99,7 @@
 		QIcon HotSpot;
 		QIcon InsertImage;
 		QIcon Lower;
-		QIcon MoveFile;
+		QIcon IC_MoveFile;
 		QIcon Names;
 		QIcon Neutral;
 		QIcon NewDiagram;
@@ -208,7 +208,7 @@
 	Configure           .addFile(":/ico/22x22/configure.png");
 	ConfigureToolbars   .addFile(":/ico/16x16/configure-toolbars.png");
 	ConfigureToolbars   .addFile(":/ico/22x22/configure-toolbars.png");
-	CopyFile            .addFile(":/ico/16x16/item_copy.png");
+	IC_CopyFile            .addFile(":/ico/16x16/item_copy.png");
 	DefaultConductor    .addFile(":/ico/22x22/conductor3.png");
 	DiagramAdd          .addFile(":/ico/22x22/diagram_add.png");
 	Diagram             .addFile(":/ico/diagram.png");
@@ -329,7 +329,7 @@
 	HotSpot             .addFile(":/ico/22x22/hotspot.png");
 	InsertImage         .addFile(":/ico/22x22/insert-image.png");
 	Lower               .addFile(":/ico/22x22/lower.png");
-	MoveFile            .addFile(":/ico/16x16/item_move.png");
+	IC_MoveFile            .addFile(":/ico/16x16/item_move.png");
 	Names               .addFile(":/ico/22x22/names.png");
 	Neutral             .addFile(":/ico/16x16/neutral.png");
 	NewDiagram          .addFile(":/ico/128x128/diagram.png");

Modified: branches/Qt5/sources/qeticons.h
===================================================================
--- branches/Qt5/sources/qeticons.h	2015-02-28 10:54:09 UTC (rev 3775)
+++ branches/Qt5/sources/qeticons.h	2015-02-28 11:59:07 UTC (rev 3776)
@@ -42,7 +42,7 @@
 		extern QIcon ConductorSettings;
 		extern QIcon Configure;
 		extern QIcon ConfigureToolbars;
-		extern QIcon CopyFile;
+		extern QIcon IC_CopyFile;
 		extern QIcon DefaultConductor;
 		extern QIcon DiagramAdd;
 		extern QIcon Diagram;
@@ -106,7 +106,7 @@
 		extern QIcon HotSpot;
 		extern QIcon InsertImage;
 		extern QIcon Lower;
-		extern QIcon MoveFile;
+		extern QIcon IC_MoveFile;
 		extern QIcon Names;
 		extern QIcon Neutral;
 		extern QIcon NewDiagram;