aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/opie-notes/opie-notes-1.2.4/gcc-4.5-non-trivially-copyable-fix.patch
blob: 6c3c62594317896c503a9d1a5e08dfbf9b8fde69 (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
56
57
58
59
60
61
62
Index: notes/editwindow.cpp
===================================================================
--- notes/editwindow.cpp
+++ notes/editwindow.cpp
@@ -22,7 +22,7 @@ void editWindowWidget::loadFile(QString 
     {
         if (!file.open(IO_ReadOnly)) 
         {
-            QMessageBox::warning(0, tr("File i/o error"), fileName.sprintf(tr("Could not read file '%s'"), fileName));
+            QMessageBox::warning(0, tr("File i/o error"), fileName.sprintf(tr("Could not read file '%s'"), fileName.data()));
         } 
         else 
         {
@@ -40,7 +40,7 @@ void editWindowWidget::saveFile(QString 
 
     if(!file.open(IO_WriteOnly)) 
     {
-        QMessageBox::warning(0, tr("File i/o error"), fileName.sprintf(tr("Could not write file '%s'"), fileName));
+        QMessageBox::warning(0, tr("File i/o error"), fileName.sprintf(tr("Could not write file '%s'"), fileName.data()));
     }
     else 
     {
Index: notes/mainwindow.cpp
===================================================================
--- notes/mainwindow.cpp
+++ notes/mainwindow.cpp
@@ -57,7 +57,7 @@ mainWindowWidget::mainWindowWidget( QWid
 
             if(!fileList.mkdir(fileList.absPath()))
             {
-                QMessageBox::critical(0, tr("i/o error"), text.sprintf(tr("Could not create directory '%s'"), fileList.absPath()));
+                QMessageBox::critical(0, tr("i/o error"), text.sprintf(tr("Could not create directory '%s'"), fileList.absPath().data()).data());
             }
             else
             {
@@ -65,7 +65,7 @@ mainWindowWidget::mainWindowWidget( QWid
 
                 if(!fileList.mkdir(fileList.absPath()))
                 {
-                    QMessageBox::critical(0, tr("i/o error"), text.sprintf(tr("Could not create directory '%s'"), fileList.absPath()));
+                    QMessageBox::critical(0, tr("i/o error"), text.sprintf(tr("Could not create directory '%s'"), fileList.absPath().data()).data());
                 }
             }
         }
@@ -154,7 +154,7 @@ void mainWindowWidget::slotItemDuplicate
     {
         if (!fileOld.open(IO_ReadOnly)) 
         {
-            QMessageBox::warning(0, tr("File i/o error"), fileName.sprintf(tr("Could not read file '%s'"), fileName));
+            QMessageBox::warning(0, tr("File i/o error"), fileName.sprintf(tr("Could not read file '%s'"), fileName.data()));
         } 
         else 
         {
@@ -208,7 +208,7 @@ void mainWindowWidget::refreshList()
 
         if (!file.open(IO_ReadOnly)) 
         {
-            QMessageBox::warning(0, tr("File i/o error"), title.sprintf(tr("Could not read file '%s'"), fileList[item]));
+            QMessageBox::warning(0, tr("File i/o error"), title.sprintf(tr("Could not read file '%s'"), fileList[item].data()).data());
         }
         else 
         {