summaryrefslogtreecommitdiffstats
path: root/kde/kipi-plugins/ipodexport_no_keywords.patch
blob: 1ae92747d9c6a11bea9274979f3f7c6d3d5458b7 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
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}