projects / packages / bmpx.git / blame
| Commit | Line | Data |
|---|---|---|
| e80ae7ce PS |
1 | --- bmpx-0.40.13/src/sanity.cc.constcastfix 2007-10-18 19:17:08.000000000 +0200 |
| 2 | +++ bmpx-0.40.13/src/sanity.cc 2007-11-29 16:05:38.000000000 +0100 | |
| 3 | @@ -72,9 +72,9 @@ C_FUNCTION | |
| 4 | gchar * | |
| 5 | sanity_check_gtk (void) | |
| 6 | { | |
| 7 | - return gtk_check_version (GTK_REQUIRED_MAJOR_VER, | |
| 8 | - GTK_REQUIRED_MINOR_VER, | |
| 9 | - GTK_REQUIRED_MICRO_VER); | |
| 10 | + return const_cast<gchar *>(gtk_check_version (GTK_REQUIRED_MAJOR_VER, | |
| 11 | + GTK_REQUIRED_MINOR_VER, | |
| 12 | + GTK_REQUIRED_MICRO_VER)); | |
| 13 | } | |
| 14 | ||
| 15 | static gchar * | |
| 16 | --- bmpx-0.40.14/src/ui-part-library.cc.orig 2008-03-05 22:31:06.000000000 +0100 | |
| 17 | +++ bmpx-0.40.14/src/ui-part-library.cc 2009-08-29 09:56:40.906222237 +0200 | |
| 18 | @@ -509,8 +509,8 @@ | |
| 19 | if( node != NODE_BRANCH ) | |
| 20 | { | |
| 21 | // Clone this node as one child row | |
| 22 | - UID uid (Bmp::AlbumArtist ((*i_toplevel)[mStoreArtistCR.artist]).bmpx_album_artist_id); | |
| 23 | Bmp::AlbumArtist aa ((*i_toplevel)[mStoreArtistCR.artist]); | |
| 24 | + UID uid (aa.bmpx_album_artist_id); | |
| 25 | ||
| 26 | UidIterMapIter uid_i = mUidIterMap.find (uid); | |
| 27 | if( uid_i != mUidIterMap.end() ) | |
| 28 | --- bmpx-0.40.14/src/ui-part-library.hh.orig 2008-03-05 22:31:06.000000000 +0100 | |
| 29 | +++ bmpx-0.40.14/src/ui-part-library.hh 2009-08-29 09:47:47.032596592 +0200 | |
| 30 | @@ -464,7 +464,7 @@ | |
| 31 | void | |
| 32 | print (const char* func) | |
| 33 | { | |
| 34 | - printf ("Func: %s\nSize: %llu\n", func, guint64 (mQueue.size())); | |
| 35 | + printf ("Func: %s\nSize: %Zd\n", func, guint64 (mQueue.size())); | |
| 36 | for (Queue::const_iterator i = mQueue.begin(); i != mQueue.end(); ++i) | |
| 37 | { | |
| 38 | if (i == mPosition) | |
| 39 | --- bmpx-0.40.14/src/ui-part-playlist.hh.orig 2008-03-05 22:31:06.000000000 +0100 | |
| 40 | +++ bmpx-0.40.14/src/ui-part-playlist.hh 2009-08-29 09:49:56.605846457 +0200 | |
| 41 | @@ -256,7 +256,7 @@ | |
| 42 | void | |
| 43 | print (const char* func) | |
| 44 | { | |
| 45 | - printf ("Func: %s\nSize: %llu\n", func, guint64 (mQueue.size())); | |
| 46 | + printf ("Func: %s\nSize: %Zd\n", func, guint64 (mQueue.size())); | |
| 47 | for (Queue::const_iterator i = mQueue.begin(); i != mQueue.end(); ++i) | |
| 48 | { | |
| 49 | if (i == mPosition) | |
| 50 | --- bmpx-0.40.14/src/uri.cc.orig 2008-04-06 01:49:24.000000000 +0200 | |
| 51 | +++ bmpx-0.40.14/src/uri.cc 2009-08-29 09:45:15.116765917 +0200 | |
| 52 | @@ -40,6 +40,7 @@ | |
| 53 | #include <glibmm.h> | |
| 54 | #include <iostream> | |
| 55 | #include <cstring> | |
| 56 | +#include <cstdio> | |
| 57 | ||
| 58 | #include "debug.hh" | |
| 59 | #include "uri.hh" | |
| 60 | --- bmpx-0.40.14/widgets/popup.cc.orig 2008-03-05 22:31:12.000000000 +0100 | |
| 61 | +++ bmpx-0.40.14/widgets/popup.cc 2009-08-29 09:40:10.893479372 +0200 | |
| 62 | @@ -308,7 +308,7 @@ | |
| 63 | ||
| 64 | if (m_location == ARROW_TOP) | |
| 65 | { | |
| 66 | - Cairo::Matrix matrix = { 1, 0, 0, -1, 0, h }; | |
| 67 | + Cairo::Matrix matrix( 1, 0, 0, -1, 0, h ); | |
| 68 | cr->set_matrix (matrix); | |
| 69 | } | |
| 70 |