Better workaround for the "ignoring inline" gcc bug, since editing the

generated inlinepics_p.h makes no sense after all

1 files changed, 6 insertions, 0 deletions

diff --git a/library/resource.cpp b/library/resource.cpp
index 0db2a75..bdcd603 100644
--- a/library/resource.cpp
+++ b/library/resource.cpp
@@ -19,25 +19,31 @@
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_MIMEEXT
 #include "qpeapplication.h"
 #include "resource.h"
 #include "mimetype.h"
 #include <qdir.h>
 #include <qfile.h>
 #include <qregexp.h>
 #include <qpixmapcache.h>
 #include <qpainter.h>
 
+// this namespace is just a workaround for a gcc bug
+// gcc exports inline functions in the generated file
+// inlinepics_p.h
+
+namespace {
 #include "inlinepics_p.h"
+}
 
 /*!
   \class Resource resource.h
   \brief The Resource class provides access to named resources.
 
   The resources may be provided from files or other sources.
 
   The allSounds() function returns a list of all the sounds available.
   A particular sound can be searched for using findSound().
 
   Images can be loaded with loadImage(), loadPixmap(), loadBitmap()
   and loadIconSet().