Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance

7 files changed, 13 insertions, 13 deletions

diff --git a/doc/html/qaction-application-example.html b/doc/html/qaction-application-example.html
index 406d3f6..f15a4af 100644
--- a/doc/html/qaction-application-example.html
+++ b/doc/html/qaction-application-example.html
@@ -152,7 +152,7 @@ private:
                      "Click this button to open a <em>new file</em>. <br>"
                      "You can also select the <b>Open</b> command "
                      "from the <b>File</b> menu.</p>";
-<a name="x1140"></a>    QMimeSourceFactory::<a href="qmimesourcefactory.html#defaultFactory">defaultFactory</a>()-&gt;setPixmap( "fileopen",
+<a name="x1140"></a>    QMimeSourceFactory::<a href="qmimesourcefactory.html#defaultFactory">defaultFactory</a>()-&gt;setPixmap( "document-open",
 <a name="x1125"></a>                          fileOpenAction-&gt;<a href="qaction.html#iconSet">iconSet</a>().pixmap() );
 <a name="x1126"></a>    fileOpenAction-&gt;<a href="qaction.html#setWhatsThis">setWhatsThis</a>( fileOpenText );
 
diff --git a/doc/html/qwhatsthis.html b/doc/html/qwhatsthis.html
index eafc62f..122fe42 100644
--- a/doc/html/qwhatsthis.html
+++ b/doc/html/qwhatsthis.html
@@ -89,7 +89,7 @@ stylesheet. This makes it possible to embed images. See
                          "Click this button to open a &lt;em&gt;new file&lt;/em&gt;. &lt;br&gt;"
                          "You can also select the &lt;b&gt;Open&lt;/b&gt; command "
                          "from the &lt;b&gt;File&lt;/b&gt; menu.&lt;/p&gt;";
-    <a name="x2104"></a>    QMimeSourceFactory::<a href="qmimesourcefactory.html#defaultFactory">defaultFactory</a>()-&gt;setPixmap( "fileopen",
+    <a name="x2104"></a>    QMimeSourceFactory::<a href="qmimesourcefactory.html#defaultFactory">defaultFactory</a>()-&gt;setPixmap( "document-open",
     <a name="x2102"></a>                          fileOpenAction-&gt;<a href="qaction.html#iconSet">iconSet</a>().pixmap() );
     <a name="x2103"></a>    fileOpenAction-&gt;<a href="qaction.html#setWhatsThis">setWhatsThis</a>( fileOpenText );
 </pre>
diff --git a/doc/html/simple-application-example.html b/doc/html/simple-application-example.html
index b8a5ef7..80c2207 100644
--- a/doc/html/simple-application-example.html
+++ b/doc/html/simple-application-example.html
@@ -161,7 +161,7 @@ private:
 
 <a name="x1591"></a>    QWhatsThis::<a href="qwhatsthis.html#add">add</a>( fileOpen, fileOpenText );
 
-<a name="x1558"></a>    QMimeSourceFactory::<a href="qmimesourcefactory.html#defaultFactory">defaultFactory</a>()-&gt;setPixmap( "fileopen", openIcon );
+<a name="x1558"></a>    QMimeSourceFactory::<a href="qmimesourcefactory.html#defaultFactory">defaultFactory</a>()-&gt;setPixmap( "document-open", openIcon );
 
     const char * fileSaveText = "&lt;p&gt;Click this button to save the file you "
                  "are editing. You will be prompted for a file name.\n"
diff --git a/doc/html/simple-application.html b/doc/html/simple-application.html
index e016572..e414a35 100644
--- a/doc/html/simple-application.html
+++ b/doc/html/simple-application.html
@@ -232,10 +232,10 @@ function, as its mouse interface is unusual.
 </pre>
 <p> With the above line we add the "What's This?" help-text to the 
 <em>fileOpen</em> button...
-<p> <pre>        QMimeSourceFactory::<a href="qmimesourcefactory.html#defaultFactory">defaultFactory</a>()-&gt;setPixmap( "fileopen", openIcon );
+<p> <pre>        QMimeSourceFactory::<a href="qmimesourcefactory.html#defaultFactory">defaultFactory</a>()-&gt;setPixmap( "document-open", openIcon );
 </pre>
 <p> ... and tell the rich-text engine that when a help-text (like the one
-saved in <em>fileOpenText</em>) requests an image named "fileopen", the <em>openIcon</em> pixmap is used.
+saved in <em>fileOpenText</em>) requests an image named "document-open", the <em>openIcon</em> pixmap is used.
 <p> <pre>        const char * fileSaveText = "&lt;p&gt;Click this button to save the file you "
                      "are editing. You will be prompted for a file name.\n"
                      "You can also select the &lt;b&gt;Save&lt;/b&gt; command "
diff --git a/examples/action/application.cpp b/examples/action/application.cpp
index a15806a..f830d07 100644
--- a/examples/action/application.cpp
+++ b/examples/action/application.cpp
@@ -57,7 +57,7 @@ ApplicationWindow::ApplicationWindow()
                      "Click this button to open a <em>new file</em>. <br>"
                      "You can also select the <b>Open</b> command "
                      "from the <b>File</b> menu.</p>";
-    QMimeSourceFactory::defaultFactory()->setPixmap( "fileopen",
+    QMimeSourceFactory::defaultFactory()->setPixmap( "document-open",
                           fileOpenAction->iconSet().pixmap() );
     fileOpenAction->setWhatsThis( fileOpenText );
 
diff --git a/examples/application/application.cpp b/examples/application/application.cpp
index 2435a5d..df72625 100644
--- a/examples/application/application.cpp
+++ b/examples/application/application.cpp
@@ -67,7 +67,7 @@ ApplicationWindow::ApplicationWindow()
 
     QWhatsThis::add( fileOpen, fileOpenText );
 
-    QMimeSourceFactory::defaultFactory()->setPixmap( "fileopen", openIcon );
+    QMimeSourceFactory::defaultFactory()->setPixmap( "document-open", openIcon );
 
     const char * fileSaveText = "<p>Click this button to save the file you "
                  "are editing. You will be prompted for a file name.\n"
diff --git a/tools/designer/plugins/wizards/mainwindowwizard.ui.h b/tools/designer/plugins/wizards/mainwindowwizard.ui.h
index f975ba2..ecfee60 100644
--- a/tools/designer/plugins/wizards/mainwindowwizard.ui.h
+++ b/tools/designer/plugins/wizards/mainwindowwizard.ui.h
@@ -123,14 +123,14 @@ void MainWindowWizardBase::accept()
 
     QtMsgHandler oldMsgHandler = qInstallMsgHandler( devNull );
 
-    getPixmap( "filenew", pix );
+    getPixmap( "document-new", pix );
 
     QAction *fileNewAction = dfw->createAction( tr( "New" ), pix, tr( "&New" ), CTRL + Key_N, 0, "fileNewAction" );
     actions.insert( tr( "New" ), fileNewAction );
-    getPixmap( "fileopen", pix );
+    getPixmap( "document-open", pix );
     QAction *fileOpenAction = dfw->createAction( tr( "Open" ), pix, tr( "&Open..." ), CTRL + Key_O, 0, "fileOpenAction" );
     actions.insert( tr( "Open" ), fileOpenAction );
-    getPixmap( "filesave", pix );
+    getPixmap( "document-save", pix );
     QAction *fileSaveAction = dfw->createAction( tr( "Save" ), pix, tr( "&Save" ), CTRL + Key_S, 0, "fileSaveAction" );
     actions.insert( tr( "Save" ), fileSaveAction );
     QAction *fileSaveAsAction = dfw->createAction( tr( "Save As" ), QIconSet(), tr( "Save &As..." ), 0, 0, "fileSaveAsAction" );
@@ -147,13 +147,13 @@ void MainWindowWizardBase::accept()
     getPixmap( "redo", pix );
     QAction *editRedoAction = dfw->createAction( tr( "Redo" ), pix, tr( "&Redo" ), CTRL + Key_Y, 0, "editRedoAction" );
     actions.insert( tr( "Redo" ), editRedoAction );
-    getPixmap( "editcut", pix );
+    getPixmap( "edit-cut", pix );
     QAction *editCutAction = dfw->createAction( tr( "Cut" ), pix, tr( "Cu&t" ), CTRL + Key_X, 0, "editCutAction" );
     actions.insert( tr( "Cut" ), editCutAction );
-    getPixmap( "editcopy", pix );
+    getPixmap( "edit-copy", pix );
     QAction *editCopyAction = dfw->createAction( tr( "Copy" ), pix, tr( "&Copy" ), CTRL + Key_C, 0, "editCopyAction" );
     actions.insert( tr( "Copy" ), editCopyAction );
-    getPixmap( "editpaste", pix );
+    getPixmap( "edit-paste", pix );
     QAction *editPasteAction = dfw->createAction( tr( "Paste" ), pix, tr( "&Paste" ), CTRL + Key_V, 0, "editPasteAction" );
     actions.insert( tr( "Paste" ), editPasteAction );
     getPixmap( "searchfind", pix );