[vidalia-svn] r3433: Bitmaps used in libmarblewidget were getting built into the (marble/trunk/src/lib)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-01-15 19:49:05 -0500 (Thu, 15 Jan 2009)
New Revision: 3433

Modified:
   marble/trunk/src/lib/MarbleWidgetInputHandler.cpp
   marble/trunk/src/lib/libmarble.qrc
Log:
Bitmaps used in libmarblewidget were getting built into the library, but not
actually used. So fix up libmarble.qrc and actually make use of the built-in
XPMs.


Modified: marble/trunk/src/lib/MarbleWidgetInputHandler.cpp
===================================================================
--- marble/trunk/src/lib/MarbleWidgetInputHandler.cpp	2009-01-16 00:25:38 UTC (rev 3432)
+++ marble/trunk/src/lib/MarbleWidgetInputHandler.cpp	2009-01-16 00:49:05 UTC (rev 3433)
@@ -60,14 +60,14 @@
 MarbleWidgetDefaultInputHandler::MarbleWidgetDefaultInputHandler()
     : MarbleWidgetInputHandler()
 {
-    curpmtl.load( MarbleDirs::path("bitmaps/cursor_tl.xpm") );
-    curpmtc.load( MarbleDirs::path("bitmaps/cursor_tc.xpm") );
-    curpmtr.load( MarbleDirs::path("bitmaps/cursor_tr.xpm") );
-    curpmcr.load( MarbleDirs::path("bitmaps/cursor_cr.xpm") );
-    curpmcl.load( MarbleDirs::path("bitmaps/cursor_cl.xpm") );
-    curpmbl.load( MarbleDirs::path("bitmaps/cursor_bl.xpm") );
-    curpmbc.load( MarbleDirs::path("bitmaps/cursor_bc.xpm") );
-    curpmbr.load( MarbleDirs::path("bitmaps/cursor_br.xpm") );
+    curpmtl.load( ":/bitmaps/cursor_tl.xpm" );
+    curpmtc.load( ":/bitmaps/cursor_tc.xpm" );
+    curpmtr.load( ":/bitmaps/cursor_tr.xpm" );
+    curpmcr.load( ":/bitmaps/cursor_cr.xpm" );
+    curpmcl.load( ":/bitmaps/cursor_cl.xpm" );
+    curpmbl.load( ":/bitmaps/cursor_bl.xpm" );
+    curpmbc.load( ":/bitmaps/cursor_bc.xpm" );
+    curpmbr.load( ":/bitmaps/cursor_br.xpm" );
 
     arrowcur [0][0] = QCursor(curpmtl,2,2);
     arrowcur [1][0] = QCursor(curpmtc,10,3);

Modified: marble/trunk/src/lib/libmarble.qrc
===================================================================
--- marble/trunk/src/lib/libmarble.qrc	2009-01-16 00:25:38 UTC (rev 3432)
+++ marble/trunk/src/lib/libmarble.qrc	2009-01-16 00:49:05 UTC (rev 3433)
@@ -1,12 +1,12 @@
 <RCC>
-    <qresource>
-        <file>../../data/bitmaps/cursor_bc.xpm</file>
-        <file>../../data/bitmaps/cursor_bl.xpm</file>
-        <file>../../data/bitmaps/cursor_br.xpm</file>
-        <file>../../data/bitmaps/cursor_cl.xpm</file>
-        <file>../../data/bitmaps/cursor_cr.xpm</file>
-        <file>../../data/bitmaps/cursor_tc.xpm</file>
-        <file>../../data/bitmaps/cursor_tl.xpm</file>
-        <file>../../data/bitmaps/cursor_tr.xpm</file>
+    <qresource prefix="/data/bitmaps">
+        <file alias="cursor_bc.xpm">../../data/bitmaps/cursor_bc.xpm</file>
+        <file alias="cursor_bl.xpm">../../data/bitmaps/cursor_bl.xpm</file>
+        <file alias="cursor_br.xpm">../../data/bitmaps/cursor_br.xpm</file>
+        <file alias="cursor_cl.xpm">../../data/bitmaps/cursor_cl.xpm</file>
+        <file alias="cursor_cr.xpm">../../data/bitmaps/cursor_cr.xpm</file>
+        <file alias="cursor_tc.xpm">../../data/bitmaps/cursor_tc.xpm</file>
+        <file alias="cursor_tl.xpm">../../data/bitmaps/cursor_tl.xpm</file>
+        <file alias="cursor_tr.xpm">../../data/bitmaps/cursor_tr.xpm</file>
     </qresource>
 </RCC>