SOURCES: kphotoalbum-namespace.patch (NEW) - let it compile with g...

[pawelk]

Author: pawelk                       Date: Thu Dec 28 22:57:47 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- let it compile with gcc 3.3.6

---- Files affected:
SOURCES:
   kphotoalbum-namespace.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/kphotoalbum-namespace.patch
diff -u /dev/null SOURCES/kphotoalbum-namespace.patch:1.1
--- /dev/null	Thu Dec 28 23:57:47 2006
+++ SOURCES/kphotoalbum-namespace.patch	Thu Dec 28 23:57:42 2006
@@ -0,0 +1,38 @@
+diff -ru kphotoalbum-2006-12-09-noi18n-org/src/Settings/CategoryItem.cpp kphotoalbum-2006-12-09-noi18n/src/Settings/CategoryItem.cpp
+--- kphotoalbum-2006-12-09-noi18n-org/src/Settings/CategoryItem.cpp	2006-12-09 14:32:12.000000000 +0100
++++ kphotoalbum-2006-12-09-noi18n/src/Settings/CategoryItem.cpp	2006-12-28 22:36:35.000000000 +0100
+@@ -113,7 +113,7 @@
+ {
+     _type = type;
+ }
+-
++using namespace MainWindow;
+ void Settings::CategoryItem::renameCategory( DB::MemberMap* memberMap )
+ {
+     QString txt = i18n("<p>Due to a shortcoming in KPhotoAlbum, you need to save your database after renaming categories; "
+@@ -122,7 +122,7 @@
+                        "step save the database.</p>" );
+ 
+ 
+-    if ( KMessageBox::warningContinueCancel( MainWindow::Window::theMainWindow(), txt ) == QMessageBox::Cancel )
++    if ( KMessageBox::warningContinueCancel( Window::theMainWindow(), txt ) == QMessageBox::Cancel )
+         return;
+ 
+     QDir dir( QString::fromLatin1("%1/CategoryImages" ).arg( Settings::SettingsData::instance()->imageDirectory() ) );
+diff -ru kphotoalbum-2006-12-09-noi18n-org/src/Settings/SettingsDialog.cpp kphotoalbum-2006-12-09-noi18n/src/Settings/SettingsDialog.cpp
+--- kphotoalbum-2006-12-09-noi18n-org/src/Settings/SettingsDialog.cpp	2006-12-09 14:32:12.000000000 +0100
++++ kphotoalbum-2006-12-09-noi18n/src/Settings/SettingsDialog.cpp	2006-12-28 22:34:41.000000000 +0100
+@@ -881,11 +881,11 @@
+     QWhatsThis::add( _smoothScale, txt );
+ }
+ 
+-
++using namespace MainWindow;
+ void Settings::SettingsDialog::createPluginPage()
+ {
+ #ifdef HASKIPI
+-    MainWindow::Window::theMainWindow()->loadPlugins();
++    Window::theMainWindow()->loadPlugins();
+     QWidget* top = addPage( i18n("Plugins" ), i18n("Plugins" ),
+                             KGlobal::iconLoader()->loadIcon( QString::fromLatin1( "share" ),
+                                                              KIcon::Desktop, 32 ) );
================================================================