summaryrefslogtreecommitdiffstats
path: root/kde/kipi-plugins/ipodexport_no_keywords.patch
diff options
context:
space:
mode:
Diffstat (limited to 'kde/kipi-plugins/ipodexport_no_keywords.patch')
-rw-r--r--kde/kipi-plugins/ipodexport_no_keywords.patch55
1 files changed, 55 insertions, 0 deletions
diff --git a/kde/kipi-plugins/ipodexport_no_keywords.patch b/kde/kipi-plugins/ipodexport_no_keywords.patch
new file mode 100644
index 000000000..1ae92747d
--- /dev/null
+++ b/kde/kipi-plugins/ipodexport_no_keywords.patch
@@ -0,0 +1,55 @@
+Index: ipodexport/IpodExportDialog.cpp
+===================================================================
+--- ipodexport/IpodExportDialog.cpp (revision 1138808)
++++ ipodexport/IpodExportDialog.cpp (working copy)
+@@ -694,7 +694,7 @@
+ {
+ QList<QTreeWidgetItem*> selected = m_ipodAlbumList->selectedItems();
+
+- foreach( QTreeWidgetItem *item, selected )
++ Q_FOREACH( QTreeWidgetItem *item, selected )
+ {
+ IpodAlbumItem *album = dynamic_cast<IpodAlbumItem*>( item );
+ if( album )
+@@ -721,7 +721,7 @@
+ {
+ if( filesPath.isEmpty() ) return;
+
+- foreach( const QString &dropFile, filesPath )
++ Q_FOREACH( const QString &dropFile, filesPath )
+ {
+ // TODO: Check if the new item already exist in the list.
+ addUrlToList( dropFile );
+Index: ipodexport/ImageList.cpp
+===================================================================
+--- ipodexport/ImageList.cpp (revision 1138808)
++++ ipodexport/ImageList.cpp (working copy)
+@@ -65,14 +65,14 @@
+ {
+ QStringList filesPath;
+
+- foreach( const QUrl &u, urls )
++ Q_FOREACH( const QUrl &u, urls )
+ {
+ filesPath << u.path();
+ }
+
+ if( !filesPath.isEmpty() )
+ {
+- emit signalAddedDropItems( filesPath );
++ Q_EMIT signalAddedDropItems( filesPath );
+ }
+ }
+
+Index: ipodexport/CMakeLists.txt
+===================================================================
+--- ipodexport/CMakeLists.txt (revision 1138808)
++++ ipodexport/CMakeLists.txt (working copy)
+@@ -10,6 +10,7 @@
+ )
+
+ KDE4_ADD_PLUGIN(kipiplugin_ipodexport ${kipiplugin_ipodexport_PART_SRCS})
++ADD_DEFINITIONS(-DQT_NO_KEYWORDS)
+
+ TARGET_LINK_LIBRARIES(kipiplugin_ipodexport
+ ${GOBJECT_LIBRARIES}