From b66ce6b89d15223dfbae6a222b373959d5ba7a41 Mon Sep 17 00:00:00 2001 From: Kelvie Wong Date: Fri, 21 Mar 2008 14:42:31 -0700 Subject: [PATCH] Ran qt3to4 --- file-integration/basketthumbcreator.cpp | 10 +- portinglog.txt | 968 ++++++++++++++++++++++++++++++++ src/archive.cpp | 30 +- src/archive.h | 4 +- src/backgroundmanager.cpp | 2 + src/backgroundmanager.h | 6 +- src/backup.cpp | 27 +- src/backup.h | 2 + src/basket.cpp | 115 ++-- src/basket.h | 60 +- src/basket_part.h | 2 +- src/basketfactory.cpp | 8 +- src/basketlistview.cpp | 60 +- src/basketlistview.h | 22 +- src/basketproperties.cpp | 23 +- src/basketproperties.h | 6 +- src/basketstatusbar.cpp | 2 +- src/basketstatusbar.h | 2 + src/bnpview.cpp | 127 +++-- src/bnpview.h | 46 +- src/clickablelabel.cpp | 2 + src/clickablelabel.h | 2 + src/colorpicker.cpp | 3 + src/colorpicker.h | 3 + src/crashhandler.cpp | 12 +- src/debugwindow.cpp | 11 +- src/debugwindow.h | 11 +- src/exporterdialog.cpp | 10 +- src/filter.cpp | 8 +- src/focusedwidgets.cpp | 9 +- src/focusedwidgets.h | 7 +- src/formatimporter.cpp | 24 +- src/htmlexporter.cpp | 20 +- src/htmlexporter.h | 4 +- src/kcolorcombo2.cpp | 11 +- src/kcolorcombo2.h | 7 + src/kgpgme.cpp | 12 +- src/kgpgme.h | 7 +- src/kiconcanvas.cpp | 22 +- src/kiconcanvas.h | 6 +- src/kicondialog.cpp | 16 +- src/kicondialog.h | 2 + src/likeback.cpp | 57 +- src/likeback_private.h | 8 +- src/linklabel.cpp | 32 +- src/linklabel.h | 13 +- src/mainwindow.cpp | 11 +- src/mainwindow.h | 13 +- src/newbasketdialog.cpp | 26 +- src/newbasketdialog.h | 14 +- src/note.cpp | 37 +- src/note.h | 14 +- src/notecontent.cpp | 35 +- src/notecontent.h | 12 +- src/notedrag.cpp | 73 +-- src/notedrag.h | 14 +- src/noteedit.cpp | 20 +- src/noteedit.h | 4 +- src/notefactory.cpp | 31 +- src/notefactory.h | 3 + src/password.cpp | 6 +- src/popupmenu.cpp | 8 +- src/popupmenu.h | 10 +- src/qeffects.cpp | 13 +- src/qeffects.h | 10 +- src/regiongrabber.cpp | 8 +- src/regiongrabber.h | 3 + src/settings.cpp | 95 ++-- src/settings.h | 6 +- src/softwareimporters.cpp | 52 +- src/softwareimporters.h | 8 +- src/systemtray.cpp | 19 +- src/systemtray.h | 9 + src/tag.cpp | 26 +- src/tag.h | 14 +- src/tagsedit.cpp | 120 ++-- src/tagsedit.h | 42 +- src/tools.cpp | 23 +- src/tools.h | 9 +- src/variouswidgets.cpp | 28 +- src/variouswidgets.h | 7 +- src/xmlwork.cpp | 2 +- 82 files changed, 1962 insertions(+), 704 deletions(-) create mode 100644 portinglog.txt diff --git a/file-integration/basketthumbcreator.cpp b/file-integration/basketthumbcreator.cpp index d3738fb..749eef6 100644 --- a/file-integration/basketthumbcreator.cpp +++ b/file-integration/basketthumbcreator.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include "basketthumbcreator.h" @@ -38,9 +38,9 @@ bool BasketThumbCreator::create(const QString &path, int /*width*/, int /*height const Q_ULONG BUFFER_SIZE = 1024; QFile file(path); - if (file.open(IO_ReadOnly)) { - QTextStream stream(&file); - stream.setEncoding(QTextStream::Latin1); + if (file.open(QIODevice::ReadOnly)) { + Q3TextStream stream(&file); + stream.setEncoding(Q3TextStream::Latin1); QString line = stream.readLine(); if (line != "BasKetNP:archive" && line != "BasKetNP:template") { file.close(); @@ -68,7 +68,7 @@ bool BasketThumbCreator::create(const QString &path, int /*width*/, int /*height } // Get the preview file: QFile previewFile(tempFolder + "preview.png"); - if (previewFile.open(IO_WriteOnly)) { + if (previewFile.open(QIODevice::WriteOnly)) { char *buffer = new char[BUFFER_SIZE]; Q_LONG sizeRead; while ((sizeRead = file.readBlock(buffer, QMIN(BUFFER_SIZE, size))) > 0) { diff --git a/portinglog.txt b/portinglog.txt new file mode 100644 index 0000000..c4af0ad --- /dev/null +++ b/portinglog.txt @@ -0,0 +1,968 @@ +Log for qt3to4 on Fri Mar 21 14:42:20 2008. Number of log entries: 902 +No changes made to file /home/kelvie/src/git/basket/src/aboutdata.cpp +No changes made to file /home/kelvie/src/git/basket/src/application.cpp +In file /home/kelvie/src/git/basket/src/archive.cpp at line 25 column 20: qvaluelist.h -> q3valuelist.h +In file /home/kelvie/src/git/basket/src/archive.cpp at line 72 column 22: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/archive.cpp at line 92 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/archive.cpp at line 142 column 27: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/archive.cpp at line 145 column 13: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/archive.cpp at line 146 column 32: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/archive.cpp at line 157 column 34: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/archive.cpp at line 164 column 34: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/archive.cpp at line 236 column 69: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/archive.cpp at line 256 column 26: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/archive.cpp at line 257 column 13: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/archive.cpp at line 258 column 32: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/archive.cpp at line 348 column 37: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/archive.cpp at line 363 column 25: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/archive.cpp: Added the following include directives: + #include +In file /home/kelvie/src/git/basket/src/backgroundmanager.cpp: Added the following include directives: + #include +In file /home/kelvie/src/git/basket/src/backup.cpp at line 32 column 15: qhbox.h -> q3hbox.h +In file /home/kelvie/src/git/basket/src/backup.cpp at line 33 column 15: qvbox.h -> q3vbox.h +In file /home/kelvie/src/git/basket/src/backup.cpp at line 41 column 19: qgroupbox.h -> q3groupbox.h +In file /home/kelvie/src/git/basket/src/backup.cpp at line 60 column 6: QVBox -> Q3VBox +In file /home/kelvie/src/git/basket/src/backup.cpp at line 66 column 10: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/backup.cpp at line 66 column 39: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/backup.cpp at line 69 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/backup.cpp at line 69 column 44: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/backup.cpp at line 90 column 10: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/backup.cpp at line 90 column 39: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/backup.cpp at line 92 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/backup.cpp at line 92 column 44: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/backup.cpp at line 245 column 27: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/backup.cpp at line 246 column 13: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/backup.cpp at line 363 column 22: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/backup.cpp at line 389 column 21: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/backup.cpp: Added the following include directives: + #include #include +In file /home/kelvie/src/git/basket/src/basket.cpp at line 42 column 21: qdragobject.h -> q3dragobject.h +In file /home/kelvie/src/git/basket/src/basket.cpp at line 48 column 19: qlistview.h -> q3listview.h +In file /home/kelvie/src/git/basket/src/basket.cpp at line 50 column 25: qsimplerichtext.h -> q3simplerichtext.h +In file /home/kelvie/src/git/basket/src/basket.cpp at line 69 column 15: qvbox.h -> q3vbox.h +In file /home/kelvie/src/git/basket/src/basket.cpp at line 77 column 18: qtoolbar.h -> q3toolbar.h +In file /home/kelvie/src/git/basket/src/basket.cpp at line 5402 column 15: qvbox.h -> q3vbox.h +In file /home/kelvie/src/git/basket/src/basket.cpp at line 5419 column 21: qdragobject.h -> q3dragobject.h +In file /home/kelvie/src/git/basket/src/basket.cpp at line 188 column 10: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.cpp at line 190 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.cpp at line 208 column 27: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/basket.cpp at line 328 column 73: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.cpp at line 1354 column 14: QScrollView -> Q3ScrollView +In file /home/kelvie/src/git/basket/src/basket.cpp at line 1507 column 14: QTextEdit -> Q3TextEdit +In file /home/kelvie/src/git/basket/src/basket.cpp at line 1608 column 12: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/basket.cpp at line 1678 column 13: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/basket.cpp at line 1692 column 13: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/basket.cpp at line 1745 column 43: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.cpp at line 1959 column 11: QTextEdit -> Q3TextEdit +In file /home/kelvie/src/git/basket/src/basket.cpp at line 2325 column 15: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/basket.cpp at line 2378 column 14: QDragObject -> Q3DragObject +In file /home/kelvie/src/git/basket/src/basket.cpp at line 2760 column 17: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.cpp at line 2950 column 12: QScrollView -> Q3ScrollView +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3020 column 28: QFrame -> Q3Frame +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3021 column 38: QFrame -> Q3Frame +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3022 column 39: QFrame -> Q3Frame +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3025 column 14: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3025 column 40: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3087 column 17: QSimpleRichText -> Q3SimpleRichText +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3087 column 88: QScrollView -> Q3ScrollView +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3111 column 16: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3262 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3332 column 12: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3553 column 46: QTextEdit -> Q3TextEdit +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3554 column 46: QTextEdit -> Q3TextEdit +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3556 column 46: QTextEdit -> Q3TextEdit +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3557 column 46: QTextEdit -> Q3TextEdit +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3567 column 76: QTextEdit -> Q3TextEdit +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3567 column 97: QTextEdit -> Q3TextEdit +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3699 column 7: QFrame -> Q3Frame +In file /home/kelvie/src/git/basket/src/basket.cpp at line 3699 column 46: QFrame -> Q3Frame +In file /home/kelvie/src/git/basket/src/basket.cpp at line 4151 column 13: QDragObject -> Q3DragObject +In file /home/kelvie/src/git/basket/src/basket.cpp at line 4527 column 12: QScrollView -> Q3ScrollView +In file /home/kelvie/src/git/basket/src/basket.cpp at line 4577 column 10: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.cpp at line 4579 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.cpp at line 4612 column 36: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.cpp at line 5083 column 16: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.cpp at line 5169 column 26: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/basket.cpp at line 5184 column 26: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/basket.cpp at line 5225 column 9: QCString -> Q3CString +In file /home/kelvie/src/git/basket/src/basket.cpp at line 5342 column 9: QCString -> Q3CString +In file /home/kelvie/src/git/basket/src/basket.cpp at line 5360 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/basket.cpp at line 5360 column 38: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/basket.cpp: Added the following include directives: + #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include +In file /home/kelvie/src/git/basket/src/basketfactory.cpp at line 69 column 27: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/basketfactory.cpp at line 70 column 13: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/basketfactory.cpp at line 71 column 32: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/basketfactory.cpp: Added the following include directives: + #include +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 50 column 48: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 51 column 16: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 58 column 52: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 59 column 16: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 66 column 48: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 66 column 71: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 67 column 16: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 74 column 52: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 74 column 75: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 75 column 16: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 99 column 84: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 149 column 14: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 195 column 19: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 215 column 14: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 216 column 14: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 217 column 19: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 242 column 14: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 356 column 14: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 377 column 14: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 399 column 14: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 623 column 15: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 656 column 23: QListViewItemIterator -> Q3ListViewItemIterator +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 658 column 16: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 673 column 22: QListViewItemIterator -> Q3ListViewItemIterator +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 675 column 15: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 702 column 15: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 726 column 15: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.cpp at line 775 column 10: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/basketlistview.cpp: Added the following include directives: + #include #include #include #include #include #include #include +No changes made to file /home/kelvie/src/git/basket/src/basket_part.cpp +In file /home/kelvie/src/git/basket/src/basketproperties.cpp at line 33 column 22: qbuttongroup.h -> q3buttongroup.h +In file /home/kelvie/src/git/basket/src/basketproperties.cpp at line 56 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/basketproperties.cpp at line 56 column 41: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/basketproperties.cpp at line 59 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/basketproperties.cpp at line 59 column 42: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/basketproperties.cpp at line 75 column 10: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/basketproperties.cpp at line 75 column 38: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/basketproperties.cpp at line 77 column 12: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/basketproperties.cpp at line 77 column 36: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/basketproperties.cpp at line 112 column 34: QVButtonGroup -> Q3VButtonGroup +In file /home/kelvie/src/git/basket/src/basketproperties.cpp at line 114 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/basketproperties.cpp at line 114 column 43: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/basketproperties.cpp at line 133 column 35: QVButtonGroup -> Q3VButtonGroup +In file /home/kelvie/src/git/basket/src/basketproperties.cpp at line 135 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/basketproperties.cpp at line 135 column 46: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/basketproperties.cpp: Added the following include directives: + #include #include #include #include +In file /home/kelvie/src/git/basket/src/basketstatusbar.cpp at line 26 column 21: qobjectlist.h -> qobject.h +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 32 column 22: qwidgetstack.h -> q3widgetstack.h +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 38 column 20: qwhatsthis.h -> q3whatsthis.h +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 241 column 14: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 323 column 40: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 341 column 27: QWidgetStack -> Q3WidgetStack +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 351 column 52: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 351 column 96: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 352 column 55: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 352 column 96: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 353 column 46: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 353 column 96: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 354 column 47: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 354 column 93: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 355 column 48: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 355 column 93: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 356 column 62: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 356 column 139: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 357 column 62: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 357 column 139: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 358 column 52: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 358 column 120: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 360 column 47: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 361 column 48: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 381 column 11: QWhatsThis -> Q3WhatsThis +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 613 column 13: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 618 column 46: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 624 column 62: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 631 column 68: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 645 column 11: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 675 column 32: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 677 column 14: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 690 column 48: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 708 column 44: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 729 column 57: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 768 column 38: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 772 column 14: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 797 column 71: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 803 column 15: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 804 column 15: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 828 column 14: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 829 column 14: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 901 column 22: QListViewItemIterator -> Q3ListViewItemIterator +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 921 column 22: QListViewItemIterator -> Q3ListViewItemIterator +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 948 column 22: QListViewItemIterator -> Q3ListViewItemIterator +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 982 column 22: QListViewItemIterator -> Q3ListViewItemIterator +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1001 column 23: QListViewItemIterator -> Q3ListViewItemIterator +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1043 column 22: QListViewItemIterator -> Q3ListViewItemIterator +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1150 column 22: QListViewItemIterator -> Q3ListViewItemIterator +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1162 column 22: QListViewItemIterator -> Q3ListViewItemIterator +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1172 column 44: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1174 column 22: QListViewItemIterator -> Q3ListViewItemIterator +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1184 column 22: QListViewItemIterator -> Q3ListViewItemIterator +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1194 column 22: QListViewItemIterator -> Q3ListViewItemIterator +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1220 column 36: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1227 column 39: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1433 column 10: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1435 column 11: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1445 column 21: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1571 column 22: QListViewItemIterator -> Q3ListViewItemIterator +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1692 column 14: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1693 column 14: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1694 column 19: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 1900 column 19: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 2128 column 22: QListViewItemIterator -> Q3ListViewItemIterator +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 2143 column 9: QCString -> Q3CString +In file /home/kelvie/src/git/basket/src/bnpview.cpp at line 2272 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/bnpview.cpp: Added the following include directives: + #include #include #include #include #include #include #include #include +In file /home/kelvie/src/git/basket/src/clickablelabel.cpp: Added the following include directives: + #include +In file /home/kelvie/src/git/basket/src/colorpicker.cpp: Added the following include directives: + #include #include +In file /home/kelvie/src/git/basket/src/crashhandler.cpp at line 29 column 21: qtextstream.h -> q3textstream.h +In file /home/kelvie/src/git/basket/src/crashhandler.cpp at line 54 column 30: QCString -> Q3CString +In file /home/kelvie/src/git/basket/src/crashhandler.cpp at line 120 column 26: QCString -> Q3CString +In file /home/kelvie/src/git/basket/src/crashhandler.cpp at line 135 column 20: QCString -> Q3CString +In file /home/kelvie/src/git/basket/src/crashhandler.cpp at line 139 column 27: QCString -> Q3CString +In file /home/kelvie/src/git/basket/src/crashhandler.cpp: Added the following include directives: + #include +In file /home/kelvie/src/git/basket/src/debugwindow.cpp at line 25 column 22: qtextbrowser.h -> q3textbrowser.h +In file /home/kelvie/src/git/basket/src/debugwindow.cpp at line 39 column 30: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/debugwindow.cpp at line 40 column 31: QTextBrowser -> Q3TextBrowser +In file /home/kelvie/src/git/basket/src/debugwindow.cpp at line 42 column 38: QTextBrowser -> Q3TextBrowser +In file /home/kelvie/src/git/basket/src/debugwindow.cpp: Added the following include directives: + #include #include +In file /home/kelvie/src/git/basket/src/exporterdialog.cpp at line 28 column 15: qhbox.h -> q3hbox.h +In file /home/kelvie/src/git/basket/src/exporterdialog.cpp at line 29 column 15: qvbox.h -> q3vbox.h +In file /home/kelvie/src/git/basket/src/exporterdialog.cpp at line 43 column 6: QVBox -> Q3VBox +In file /home/kelvie/src/git/basket/src/exporterdialog.cpp at line 46 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/exporterdialog.cpp at line 46 column 36: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/exporterdialog.cpp: Added the following include directives: + #include +In file /home/kelvie/src/git/basket/src/filter.cpp at line 53 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/filter.cpp at line 53 column 37: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/filter.cpp at line 56 column 9: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/filter.cpp at line 57 column 9: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/filter.cpp: Added the following include directives: + #include +In file /home/kelvie/src/git/basket/src/focusedwidgets.cpp at line 24 column 20: qpopupmenu.h -> q3popupmenu.h +In file /home/kelvie/src/git/basket/src/focusedwidgets.cpp at line 172 column 10: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/focusedwidgets.cpp at line 174 column 11: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/focusedwidgets.cpp: Added the following include directives: + #include #include +In file /home/kelvie/src/git/basket/src/formatimporter.cpp at line 164 column 27: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/formatimporter.cpp at line 165 column 13: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/formatimporter.cpp at line 166 column 32: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/formatimporter.cpp at line 239 column 30: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/formatimporter.cpp at line 240 column 16: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/formatimporter.cpp at line 268 column 30: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/formatimporter.cpp at line 269 column 16: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/formatimporter.cpp at line 270 column 35: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/formatimporter.cpp at line 294 column 27: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/formatimporter.cpp at line 295 column 13: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/formatimporter.cpp at line 296 column 32: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/formatimporter.cpp: Added the following include directives: + #include +No changes made to file /home/kelvie/src/git/basket/src/global.cpp +In file /home/kelvie/src/git/basket/src/htmlexporter.cpp at line 202 column 28: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/htmlexporter.cpp at line 205 column 31: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/htmlexporter.cpp at line 212 column 110: QScrollView -> Q3ScrollView +In file /home/kelvie/src/git/basket/src/htmlexporter.cpp at line 245 column 71: QScrollView -> Q3ScrollView +In file /home/kelvie/src/git/basket/src/htmlexporter.cpp at line 266 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/htmlexporter.cpp at line 269 column 83: QScrollView -> Q3ScrollView +In file /home/kelvie/src/git/basket/src/htmlexporter.cpp at line 330 column 53: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/htmlexporter.cpp at line 544 column 28: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/htmlexporter.cpp: Added the following include directives: + #include #include #include +No changes made to file /home/kelvie/src/git/basket/src/kcm_basket.cpp +In file /home/kelvie/src/git/basket/src/kcolorcombo2.cpp at line 32 column 18: qlistbox.h -> q3listbox.h +In file /home/kelvie/src/git/basket/src/kcolorcombo2.cpp at line 675 column 9: QListBox -> Q3ListBox +In file /home/kelvie/src/git/basket/src/kcolorcombo2.cpp: Added the following include directives: + #include #include #include #include #include #include +No changes made to file /home/kelvie/src/git/basket/src/keyboard.cpp +In file /home/kelvie/src/git/basket/src/kgpgme.cpp at line 57 column 14: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/kgpgme.cpp at line 74 column 25: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/kgpgme.cpp at line 98 column 16: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/kgpgme.cpp at line 427 column 10: QCString -> Q3CString +In file /home/kelvie/src/git/basket/src/kgpgme.cpp: Added the following include directives: + #include #include #include +In file /home/kelvie/src/git/basket/src/kiconcanvas.cpp at line 33 column 21: qsortedlist.h -> q3sortedlist.h +In file /home/kelvie/src/git/basket/src/kiconcanvas.cpp at line 38 column 21: qdragobject.h -> q3dragobject.h +In file /home/kelvie/src/git/basket/src/kiconcanvas.cpp at line 48 column 44: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/kiconcanvas.cpp at line 51 column 31: QIconView -> Q3IconView +In file /home/kelvie/src/git/basket/src/kiconcanvas.cpp at line 52 column 23: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/kiconcanvas.cpp at line 62 column 29: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/kiconcanvas.cpp at line 97 column 53: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/kiconcanvas.cpp at line 98 column 42: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/kiconcanvas.cpp at line 211 column 50: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/kiconcanvas.cpp at line 228 column 11: QDragObject -> Q3DragObject +In file /home/kelvie/src/git/basket/src/kiconcanvas.cpp at line 237 column 14: QImageDrag -> Q3ImageDrag +In file /home/kelvie/src/git/basket/src/kiconcanvas.cpp at line 237 column 37: QImageDrag -> Q3ImageDrag +In file /home/kelvie/src/git/basket/src/kicondialog.cpp at line 39 column 21: qsortedlist.h -> q3sortedlist.h +In file /home/kelvie/src/git/basket/src/kicondialog.cpp at line 45 column 22: qbuttongroup.h -> q3buttongroup.h +In file /home/kelvie/src/git/basket/src/kicondialog.cpp at line 49 column 20: qwhatsthis.h -> q3whatsthis.h +In file /home/kelvie/src/git/basket/src/kicondialog.cpp at line 51 column 21: qdragobject.h -> q3dragobject.h +In file /home/kelvie/src/git/basket/src/kicondialog.cpp at line 122 column 60: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/kicondialog.cpp at line 123 column 65: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/kicondialog.cpp at line 521 column 23: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/kicondialog.cpp at line 541 column 12: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 40 column 22: qbuttongroup.h -> q3buttongroup.h +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 41 column 20: qvgroupbox.h -> q3vgroupbox.h +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 43 column 20: qpopupmenu.h -> q3popupmenu.h +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 44 column 19: qtextedit.h -> q3textedit.h +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 48 column 15: qhttp.h -> q3http.h +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 70 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 70 column 38: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 72 column 9: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 73 column 9: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 74 column 9: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 75 column 9: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 423 column 19: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 424 column 19: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 425 column 19: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 426 column 19: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 488 column 19: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 489 column 19: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 490 column 19: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 491 column 19: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 642 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 642 column 42: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 649 column 27: QButtonGroup -> Q3ButtonGroup +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 650 column 11: QVGroupBox -> Q3VGroupBox +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 650 column 33: QVGroupBox -> Q3VGroupBox +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 655 column 12: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 655 column 43: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 699 column 26: QTextEdit -> Q3TextEdit +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 701 column 35: QTextEdit -> Q3TextEdit +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 805 column 6: QHttp -> Q3Http +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 805 column 24: QHttp -> Q3Http +In file /home/kelvie/src/git/basket/src/likeback.cpp at line 811 column 19: QHttpRequestHeader -> Q3HttpRequestHeader +In file /home/kelvie/src/git/basket/src/likeback.cpp: Added the following include directives: + #include #include #include #include +In file /home/kelvie/src/git/basket/src/linklabel.cpp at line 38 column 20: qhgroupbox.h -> q3hgroupbox.h +In file /home/kelvie/src/git/basket/src/linklabel.cpp at line 177 column 9: QFrame -> Q3Frame +In file /home/kelvie/src/git/basket/src/linklabel.cpp at line 184 column 9: QFrame -> Q3Frame +In file /home/kelvie/src/git/basket/src/linklabel.cpp at line 192 column 27: QBoxLayout -> Q3BoxLayout +In file /home/kelvie/src/git/basket/src/linklabel.cpp at line 192 column 44: QBoxLayout -> Q3BoxLayout +In file /home/kelvie/src/git/basket/src/linklabel.cpp at line 285 column 34: QBoxLayout -> Q3BoxLayout +In file /home/kelvie/src/git/basket/src/linklabel.cpp at line 343 column 7: QFrame -> Q3Frame +In file /home/kelvie/src/git/basket/src/linklabel.cpp at line 375 column 20: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/linklabel.cpp at line 377 column 20: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/linklabel.cpp at line 563 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/linklabel.cpp at line 563 column 38: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/linklabel.cpp at line 571 column 12: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/linklabel.cpp at line 571 column 34: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/linklabel.cpp at line 593 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/linklabel.cpp at line 593 column 38: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/linklabel.cpp at line 624 column 10: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/linklabel.cpp at line 624 column 31: QHGroupBox -> Q3HGroupBox +In file /home/kelvie/src/git/basket/src/linklabel.cpp: Added the following include directives: + #include #include #include #include #include #include #include +No changes made to file /home/kelvie/src/git/basket/src/main.cpp +In file /home/kelvie/src/git/basket/src/mainwindow.cpp at line 28 column 20: qwhatsthis.h -> q3whatsthis.h +In file /home/kelvie/src/git/basket/src/mainwindow.cpp at line 29 column 20: qvaluelist.h -> q3valuelist.h +In file /home/kelvie/src/git/basket/src/mainwindow.cpp at line 31 column 22: qbuttongroup.h -> q3buttongroup.h +In file /home/kelvie/src/git/basket/src/mainwindow.cpp at line 41 column 18: qiconset.h -> qicon.h +In file /home/kelvie/src/git/basket/src/mainwindow.cpp: Added the following include directives: + #include #include +In file /home/kelvie/src/git/basket/src/newbasketdialog.cpp at line 56 column 53: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/newbasketdialog.cpp at line 56 column 103: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/newbasketdialog.cpp at line 60 column 11: QDragObject -> Q3DragObject +In file /home/kelvie/src/git/basket/src/newbasketdialog.cpp at line 65 column 65: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/newbasketdialog.cpp at line 97 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/newbasketdialog.cpp at line 97 column 41: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/newbasketdialog.cpp at line 100 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/newbasketdialog.cpp at line 100 column 42: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/newbasketdialog.cpp at line 123 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/newbasketdialog.cpp at line 123 column 38: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/newbasketdialog.cpp at line 210 column 25: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/newbasketdialog.cpp at line 230 column 57: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/newbasketdialog.cpp at line 231 column 57: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/newbasketdialog.cpp at line 256 column 54: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/newbasketdialog.cpp at line 298 column 14: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/newbasketdialog.cpp: Added the following include directives: + #include #include #include +In file /home/kelvie/src/git/basket/src/notecontent.cpp at line 28 column 21: qstylesheet.h -> q3stylesheet.h +In file /home/kelvie/src/git/basket/src/notecontent.cpp at line 381 column 16: QSimpleRichText -> Q3SimpleRichText +In file /home/kelvie/src/git/basket/src/notecontent.cpp at line 555 column 39: QSimpleRichText -> Q3SimpleRichText +In file /home/kelvie/src/git/basket/src/notecontent.cpp at line 662 column 39: QSimpleRichText -> Q3SimpleRichText +In file /home/kelvie/src/git/basket/src/notecontent.cpp at line 771 column 25: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/notecontent.cpp at line 797 column 25: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/notecontent.cpp at line 1334 column 57: QHttpResponseHeader -> Q3HttpResponseHeader +In file /home/kelvie/src/git/basket/src/notecontent.cpp at line 1396 column 21: QHttp -> Q3Http +In file /home/kelvie/src/git/basket/src/notecontent.cpp at line 1398 column 61: QHttpResponseHeader -> Q3HttpResponseHeader +In file /home/kelvie/src/git/basket/src/notecontent.cpp at line 1399 column 49: QHttpResponseHeader -> Q3HttpResponseHeader +In file /home/kelvie/src/git/basket/src/notecontent.cpp at line 1817 column 42: QColorDrag -> Q3ColorDrag +In file /home/kelvie/src/git/basket/src/notecontent.cpp at line 1898 column 26: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/notecontent.cpp at line 1925 column 26: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/notecontent.cpp at line 1928 column 12: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/notecontent.cpp at line 1940 column 13: QStoredDrag -> Q3StoredDrag +In file /home/kelvie/src/git/basket/src/notecontent.cpp at line 1948 column 31: QStoredDrag -> Q3StoredDrag +In file /home/kelvie/src/git/basket/src/notecontent.cpp: Added the following include directives: + #include #include +In file /home/kelvie/src/git/basket/src/note.cpp at line 290 column 16: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.cpp at line 1035 column 18: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.cpp at line 1047 column 18: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.cpp at line 1069 column 17: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.cpp at line 1636 column 66: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.cpp at line 1638 column 16: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.cpp at line 1812 column 18: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.cpp at line 2007 column 16: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.cpp at line 2110 column 51: QScrollView -> Q3ScrollView +In file /home/kelvie/src/git/basket/src/note.cpp at line 2148 column 41: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.cpp at line 2153 column 17: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.cpp at line 2371 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.cpp at line 2388 column 41: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.cpp at line 2439 column 34: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.cpp at line 2452 column 32: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.cpp at line 2814 column 23: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/note.cpp at line 2825 column 22: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/note.cpp: Added the following include directives: + #include #include +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 26 column 21: qdragobject.h -> q3dragobject.h +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 55 column 11: QDragObject -> Q3DragObject +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 69 column 29: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 76 column 12: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 77 column 17: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 84 column 13: QStoredDrag -> Q3StoredDrag +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 84 column 43: QStoredDrag -> Q3StoredDrag +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 151 column 44: QTextDrag -> Q3TextDrag +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 165 column 11: QTextDrag -> Q3TextDrag +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 165 column 37: QTextDrag -> Q3TextDrag +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 170 column 13: QStoredDrag -> Q3StoredDrag +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 170 column 45: QStoredDrag -> Q3StoredDrag +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 178 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 193 column 18: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 203 column 18: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 208 column 12: QImageDrag -> Q3ImageDrag +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 208 column 40: QImageDrag -> Q3ImageDrag +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 236 column 13: QStoredDrag -> Q3StoredDrag +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 236 column 44: QStoredDrag -> Q3StoredDrag +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 250 column 13: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 250 column 43: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 251 column 32: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 253 column 13: QStoredDrag -> Q3StoredDrag +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 253 column 44: QStoredDrag -> Q3StoredDrag +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 259 column 14: QStoredDrag -> Q3StoredDrag +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 259 column 47: QStoredDrag -> Q3StoredDrag +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 286 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 287 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 288 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 331 column 12: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 332 column 12: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 333 column 12: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 383 column 28: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 393 column 10: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 396 column 28: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 403 column 12: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 412 column 19: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 418 column 28: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 426 column 12: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 553 column 9: QCString -> Q3CString +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 557 column 74: QCString -> Q3CString +In file /home/kelvie/src/git/basket/src/notedrag.cpp at line 560 column 20: QTextDrag -> Q3TextDrag +In file /home/kelvie/src/git/basket/src/notedrag.cpp: Added the following include directives: + #include #include #include #include +In file /home/kelvie/src/git/basket/src/noteedit.cpp at line 145 column 40: QScrollView -> Q3ScrollView +In file /home/kelvie/src/git/basket/src/noteedit.cpp at line 213 column 63: QTextEdit -> Q3TextEdit +In file /home/kelvie/src/git/basket/src/noteedit.cpp at line 213 column 84: QTextEdit -> Q3TextEdit +In file /home/kelvie/src/git/basket/src/noteedit.cpp at line 217 column 40: QScrollView -> Q3ScrollView +In file /home/kelvie/src/git/basket/src/noteedit.cpp at line 509 column 12: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/noteedit.cpp at line 509 column 38: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/noteedit.cpp at line 514 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/noteedit.cpp at line 514 column 40: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/noteedit.cpp at line 523 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/noteedit.cpp at line 523 column 36: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/noteedit.cpp at line 668 column 12: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/noteedit.cpp at line 668 column 38: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/noteedit.cpp at line 676 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/noteedit.cpp at line 676 column 36: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/noteedit.cpp: Added the following include directives: + #include #include #include +In file /home/kelvie/src/git/basket/src/notefactory.cpp at line 33 column 21: qstylesheet.h -> q3stylesheet.h +In file /home/kelvie/src/git/basket/src/notefactory.cpp at line 304 column 18: qstrlist.h -> q3strlist.h +In file /home/kelvie/src/git/basket/src/notefactory.cpp at line 240 column 16: QStyleSheet -> Q3StyleSheet +In file /home/kelvie/src/git/basket/src/notefactory.cpp at line 276 column 28: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/notefactory.cpp at line 277 column 13: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/notefactory.cpp at line 278 column 32: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/notefactory.cpp at line 353 column 16: QImageDrag -> Q3ImageDrag +In file /home/kelvie/src/git/basket/src/notefactory.cpp at line 362 column 58: QTextDrag -> Q3TextDrag +In file /home/kelvie/src/git/basket/src/notefactory.cpp at line 385 column 11: QMemArray -> Q3MemArray +In file /home/kelvie/src/git/basket/src/notefactory.cpp at line 414 column 10: QCString -> Q3CString +In file /home/kelvie/src/git/basket/src/notefactory.cpp at line 441 column 30: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/notefactory.cpp at line 592 column 9: QStrList -> Q3StrList +In file /home/kelvie/src/git/basket/src/notefactory.cpp at line 779 column 23: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/notefactory.cpp: Added the following include directives: + #include #include #include #include +In file /home/kelvie/src/git/basket/src/password.cpp at line 29 column 22: qbuttongroup.h -> q3buttongroup.h +In file /home/kelvie/src/git/basket/src/password.cpp at line 42 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/password.cpp at line 42 column 41: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/password.cpp: Added the following include directives: + #include +In file /home/kelvie/src/git/basket/src/popupmenu.cpp at line 23 column 20: qpopupmenu.h -> q3popupmenu.h +In file /home/kelvie/src/git/basket/src/popupmenu.cpp at line 36 column 43: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/popupmenu.cpp at line 55 column 43: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/popupmenu.cpp at line 91 column 42: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/qeffects.cpp at line 54 column 24: qguardedptr.h -> qpointer.h +In file /home/kelvie/src/git/basket/src/qeffects.cpp at line 55 column 24: qscrollview.h -> q3scrollview.h +In file /home/kelvie/src/git/basket/src/qeffects.cpp at line 142 column 27: QScrollView -> Q3ScrollView +In file /home/kelvie/src/git/basket/src/qeffects.cpp at line 338 column 27: QScrollView -> Q3ScrollView +In file /home/kelvie/src/git/basket/src/qeffects.cpp: Added the following include directives: + #include #include #include #include +In file /home/kelvie/src/git/basket/src/regiongrabber.cpp at line 44 column 23: QFrame -> Q3Frame +In file /home/kelvie/src/git/basket/src/regiongrabber.cpp at line 44 column 39: QFrame -> Q3Frame +In file /home/kelvie/src/git/basket/src/regiongrabber.cpp: Added the following include directives: + #include #include #include #include #include +In file /home/kelvie/src/git/basket/src/settings.cpp at line 29 column 15: qhbox.h -> q3hbox.h +In file /home/kelvie/src/git/basket/src/settings.cpp at line 30 column 15: qvbox.h -> q3vbox.h +In file /home/kelvie/src/git/basket/src/settings.cpp at line 32 column 19: qgroupbox.h -> q3groupbox.h +In file /home/kelvie/src/git/basket/src/settings.cpp at line 41 column 20: qwhatsthis.h -> q3whatsthis.h +In file /home/kelvie/src/git/basket/src/settings.cpp at line 42 column 22: qbuttongroup.h -> q3buttongroup.h +In file /home/kelvie/src/git/basket/src/settings.cpp at line 365 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 365 column 38: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 366 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 370 column 12: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 370 column 34: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 392 column 23: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 410 column 10: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/settings.cpp at line 410 column 33: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/settings.cpp at line 412 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 412 column 38: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 420 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 420 column 41: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 428 column 12: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 428 column 34: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 510 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 510 column 38: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 511 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 516 column 10: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/settings.cpp at line 516 column 41: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/settings.cpp at line 530 column 10: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/settings.cpp at line 530 column 39: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/settings.cpp at line 540 column 23: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 545 column 19: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/settings.cpp at line 559 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 559 column 37: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 562 column 19: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/settings.cpp at line 578 column 12: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 578 column 34: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 601 column 10: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/settings.cpp at line 601 column 41: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/settings.cpp at line 606 column 23: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 690 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 690 column 38: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 691 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 696 column 23: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 712 column 23: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 739 column 14: QVButtonGroup -> Q3VButtonGroup +In file /home/kelvie/src/git/basket/src/settings.cpp at line 739 column 47: QVButtonGroup -> Q3VButtonGroup +In file /home/kelvie/src/git/basket/src/settings.cpp at line 798 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 798 column 38: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 846 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 846 column 38: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 850 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 850 column 37: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 858 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 858 column 37: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 866 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 866 column 37: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 874 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 874 column 37: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 884 column 11: QWhatsThis -> Q3WhatsThis +In file /home/kelvie/src/git/basket/src/settings.cpp at line 885 column 11: QWhatsThis -> Q3WhatsThis +In file /home/kelvie/src/git/basket/src/settings.cpp at line 886 column 11: QWhatsThis -> Q3WhatsThis +In file /home/kelvie/src/git/basket/src/settings.cpp at line 887 column 11: QWhatsThis -> Q3WhatsThis +In file /home/kelvie/src/git/basket/src/settings.cpp at line 893 column 11: QWhatsThis -> Q3WhatsThis +In file /home/kelvie/src/git/basket/src/settings.cpp at line 894 column 11: QWhatsThis -> Q3WhatsThis +In file /home/kelvie/src/git/basket/src/settings.cpp at line 895 column 11: QWhatsThis -> Q3WhatsThis +In file /home/kelvie/src/git/basket/src/settings.cpp at line 896 column 11: QWhatsThis -> Q3WhatsThis +In file /home/kelvie/src/git/basket/src/settings.cpp at line 909 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 909 column 36: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp at line 928 column 23: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/settings.cpp: Added the following include directives: + #include #include #include #include +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 30 column 19: qptrstack.h -> q3ptrstack.h +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 35 column 19: qtextedit.h -> q3textedit.h +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 53 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 53 column 41: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 55 column 30: QVButtonGroup -> Q3VButtonGroup +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 82 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 82 column 41: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 84 column 30: QVButtonGroup -> Q3VButtonGroup +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 92 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 92 column 39: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 94 column 34: QTextEdit -> Q3TextEdit +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 246 column 27: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 247 column 14: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 248 column 33: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 324 column 27: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 325 column 14: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 326 column 33: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 421 column 26: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 422 column 13: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 423 column 32: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 488 column 26: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 489 column 13: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 490 column 32: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 524 column 11: QPtrStack -> Q3PtrStack +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 545 column 26: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 547 column 14: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp at line 554 column 33: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/softwareimporters.cpp: Added the following include directives: + #include #include #include +In file /home/kelvie/src/git/basket/src/systemtray.cpp at line 33 column 21: qdockwindow.h -> q3dockwindow.h +In file /home/kelvie/src/git/basket/src/systemtray.cpp at line 96 column 9: QCString -> Q3CString +In file /home/kelvie/src/git/basket/src/systemtray.cpp at line 98 column 9: QCString -> Q3CString +In file /home/kelvie/src/git/basket/src/systemtray.cpp at line 165 column 20: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/systemtray.cpp at line 169 column 20: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/systemtray.cpp: Added the following include directives: + #include #include #include #include #include #include #include #include +In file /home/kelvie/src/git/basket/src/tag.cpp at line 429 column 31: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/tag.cpp at line 695 column 27: IO_WriteOnly -> QIODevice::WriteOnly +In file /home/kelvie/src/git/basket/src/tag.cpp at line 696 column 13: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/tag.cpp at line 697 column 32: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/tag.cpp at line 834 column 8: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/tag.cpp at line 869 column 9: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/tag.cpp at line 870 column 48: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/tag.cpp at line 870 column 69: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/tag.cpp at line 871 column 48: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/tag.cpp at line 871 column 69: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/tag.cpp at line 875 column 8: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/tag.cpp at line 904 column 9: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/tag.cpp at line 905 column 40: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/tag.cpp at line 905 column 61: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/tag.cpp: Added the following include directives: + #include #include #include +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 40 column 19: qgroupbox.h -> q3groupbox.h +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 41 column 17: qheader.h -> q3header.h +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 42 column 20: qvaluelist.h -> q3valuelist.h +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 111 column 42: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 112 column 16: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 117 column 46: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 118 column 16: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 123 column 42: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 123 column 65: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 124 column 16: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 129 column 46: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 129 column 69: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 130 column 16: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 137 column 42: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 138 column 16: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 143 column 46: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 144 column 16: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 149 column 42: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 149 column 65: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 150 column 16: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 155 column 46: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 155 column 69: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 156 column 16: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 197 column 40: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 204 column 81: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 275 column 12: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 289 column 11: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 305 column 11: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 312 column 11: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 317 column 36: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 322 column 36: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 327 column 36: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 337 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 337 column 38: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 352 column 32: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 366 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 366 column 45: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 371 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 371 column 42: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 383 column 37: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 397 column 12: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 397 column 39: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 406 column 37: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 428 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 428 column 44: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 436 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 436 column 53: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 440 column 9: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 447 column 9: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 453 column 9: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 459 column 9: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 467 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 467 column 42: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 491 column 19: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 500 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 500 column 56: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 507 column 19: QMimeSourceFactory -> Q3MimeSourceFactory +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 514 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 514 column 54: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 518 column 12: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 518 column 50: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 528 column 12: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 528 column 41: QGridLayout -> Q3GridLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 546 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 546 column 43: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 615 column 64: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 615 column 116: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 619 column 14: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 698 column 22: QListViewItemIterator -> Q3ListViewItemIterator +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 700 column 15: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 708 column 23: QListViewItemIterator -> Q3ListViewItemIterator +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 710 column 16: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp at line 1021 column 53: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.cpp: Added the following include directives: + #include #include #include #include #include #include #include +In file /home/kelvie/src/git/basket/src/tools.cpp at line 28 column 21: qstylesheet.h -> q3stylesheet.h +In file /home/kelvie/src/git/basket/src/tools.cpp at line 30 column 21: qvaluestack.h -> q3valuestack.h +In file /home/kelvie/src/git/basket/src/tools.cpp at line 36 column 21: qobjectlist.h -> qobject.h +In file /home/kelvie/src/git/basket/src/tools.cpp at line 40 column 9: QMemArray -> Q3MemArray +In file /home/kelvie/src/git/basket/src/tools.cpp at line 41 column 9: QMemArray -> Q3MemArray +In file /home/kelvie/src/git/basket/src/tools.cpp at line 42 column 9: QMemArray -> Q3MemArray +In file /home/kelvie/src/git/basket/src/tools.cpp at line 76 column 33: QStyleSheet -> Q3StyleSheet +In file /home/kelvie/src/git/basket/src/tools.cpp at line 76 column 77: QStyleSheetItem -> Q3StyleSheetItem +In file /home/kelvie/src/git/basket/src/tools.cpp at line 168 column 12: QValueStack -> Q3ValueStack +In file /home/kelvie/src/git/basket/src/tools.cpp at line 169 column 12: QValueStack -> Q3ValueStack +In file /home/kelvie/src/git/basket/src/tools.cpp at line 428 column 37: QCString -> Q3CString +In file /home/kelvie/src/git/basket/src/tools.cpp: Added the following include directives: + #include #include +In file /home/kelvie/src/git/basket/src/variouswidgets.cpp at line 36 column 20: qwhatsthis.h -> q3whatsthis.h +In file /home/kelvie/src/git/basket/src/variouswidgets.cpp at line 39 column 21: qdragobject.h -> q3dragobject.h +In file /home/kelvie/src/git/basket/src/variouswidgets.cpp at line 51 column 12: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/variouswidgets.cpp at line 51 column 38: QHBoxLayout -> Q3HBoxLayout +In file /home/kelvie/src/git/basket/src/variouswidgets.cpp at line 172 column 11: QWhatsThis -> Q3WhatsThis +In file /home/kelvie/src/git/basket/src/variouswidgets.cpp at line 189 column 12: QDragObject -> Q3DragObject +In file /home/kelvie/src/git/basket/src/variouswidgets.cpp at line 197 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/variouswidgets.cpp at line 197 column 41: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/variouswidgets.cpp at line 225 column 49: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/variouswidgets.cpp at line 225 column 90: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/variouswidgets.cpp at line 226 column 54: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/variouswidgets.cpp at line 226 column 90: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/variouswidgets.cpp at line 258 column 41: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/variouswidgets.cpp at line 278 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/variouswidgets.cpp at line 279 column 16: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/variouswidgets.cpp: Added the following include directives: + #include #include #include #include #include +In file /home/kelvie/src/git/basket/src/xmlwork.cpp at line 32 column 29: IO_ReadOnly -> QIODevice::ReadOnly +No changes made to file /home/kelvie/src/git/basket/src/aboutdata.h +No changes made to file /home/kelvie/src/git/basket/src/application.h +In file /home/kelvie/src/git/basket/src/archive.h at line 24 column 20: qvaluelist.h -> q3valuelist.h +In file /home/kelvie/src/git/basket/src/archive.h at line 45 column 68: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/backgroundmanager.h at line 25 column 20: qvaluelist.h -> q3valuelist.h +In file /home/kelvie/src/git/basket/src/backgroundmanager.h at line 69 column 19: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/backgroundmanager.h at line 70 column 19: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/backup.h: Added the following include directives: + #include +No changes made to file /home/kelvie/src/git/basket/src/basketdcopiface.h +No changes made to file /home/kelvie/src/git/basket/src/basketfactory.h +In file /home/kelvie/src/git/basket/src/basket.h at line 42 column 21: qscrollview.h -> q3scrollview.h +In file /home/kelvie/src/git/basket/src/basket.h at line 44 column 20: qvaluelist.h -> q3valuelist.h +In file /home/kelvie/src/git/basket/src/basket.h at line 694 column 21: qscrollview.h -> q3scrollview.h +In file /home/kelvie/src/git/basket/src/basket.h at line 696 column 18: qptrlist.h -> q3ptrlist.h +In file /home/kelvie/src/git/basket/src/basket.h at line 59 column 17: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/basket.h at line 113 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.h at line 146 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/basket.h at line 169 column 33: QScrollView -> Q3ScrollView +In file /home/kelvie/src/git/basket/src/basket.h at line 284 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.h at line 302 column 7: QFrame -> Q3Frame +In file /home/kelvie/src/git/basket/src/basket.h at line 419 column 36: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.h at line 460 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.h at line 582 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.h at line 588 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.h at line 600 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.h at line 604 column 29: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.h at line 653 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/basket.h at line 703 column 12: QFrame -> Q3Frame +In file /home/kelvie/src/git/basket/src/basket.h at line 704 column 17: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/basket.h at line 735 column 40: QScrollView -> Q3ScrollView +In file /home/kelvie/src/git/basket/src/basket.h at line 816 column 9: QPtrList -> Q3PtrList +In file /home/kelvie/src/git/basket/src/basket.h: Added the following include directives: + #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include +In file /home/kelvie/src/git/basket/src/basketlistview.h at line 37 column 47: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.h at line 41 column 30: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/basketlistview.h at line 42 column 34: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.h at line 43 column 30: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/basketlistview.h at line 43 column 57: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.h at line 44 column 34: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.h at line 44 column 57: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.h at line 51 column 60: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/basketlistview.h at line 102 column 15: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/basketlistview.h: Added the following include directives: + #include #include #include #include #include #include #include +No changes made to file /home/kelvie/src/git/basket/src/basket_options.h +In file /home/kelvie/src/git/basket/src/basket_part.h at line 30 column 20: QMultiLineEdit -> Q3MultiLineEdit +In file /home/kelvie/src/git/basket/src/basketproperties.h at line 31 column 19: QVButtonGroup -> Q3VButtonGroup +In file /home/kelvie/src/git/basket/src/basketproperties.h at line 60 column 14: QVButtonGroup -> Q3VButtonGroup +In file /home/kelvie/src/git/basket/src/basketproperties.h at line 63 column 14: QVButtonGroup -> Q3VButtonGroup +In file /home/kelvie/src/git/basket/src/basketstatusbar.h: Added the following include directives: + #include +In file /home/kelvie/src/git/basket/src/bnpview.h at line 37 column 19: qlistview.h -> q3listview.h +In file /home/kelvie/src/git/basket/src/bnpview.h at line 44 column 18: QWidgetStack -> Q3WidgetStack +In file /home/kelvie/src/git/basket/src/bnpview.h at line 49 column 16: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/bnpview.h at line 77 column 37: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/bnpview.h at line 87 column 15: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.h at line 90 column 31: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.h at line 96 column 41: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.h at line 104 column 25: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.h at line 105 column 37: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.h at line 107 column 46: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.h at line 271 column 10: QPtrList -> Q3PtrList +In file /home/kelvie/src/git/basket/src/bnpview.h at line 289 column 64: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.h at line 293 column 12: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/bnpview.h at line 330 column 32: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.h at line 331 column 29: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.h at line 332 column 57: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.h at line 333 column 55: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.h at line 334 column 39: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/bnpview.h at line 349 column 14: QWidgetStack -> Q3WidgetStack +In file /home/kelvie/src/git/basket/src/bnpview.h: Added the following include directives: + #include #include #include #include #include #include #include +In file /home/kelvie/src/git/basket/src/clickablelabel.h: Added the following include directives: + #include +In file /home/kelvie/src/git/basket/src/colorpicker.h: Added the following include directives: + #include #include +No changes made to file /home/kelvie/src/git/basket/src/crashhandler.h +In file /home/kelvie/src/git/basket/src/debugwindow.h at line 29 column 17: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/debugwindow.h at line 30 column 18: QTextBrowser -> Q3TextBrowser +In file /home/kelvie/src/git/basket/src/debugwindow.h at line 49 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/debugwindow.h at line 50 column 13: QTextBrowser -> Q3TextBrowser +In file /home/kelvie/src/git/basket/src/debugwindow.h: Added the following include directives: + #include #include +No changes made to file /home/kelvie/src/git/basket/src/exporterdialog.h +No changes made to file /home/kelvie/src/git/basket/src/filter.h +In file /home/kelvie/src/git/basket/src/focusedwidgets.h at line 50 column 11: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/focusedwidgets.h: Added the following include directives: + #include #include #include #include +No changes made to file /home/kelvie/src/git/basket/src/formatimporter.h +No changes made to file /home/kelvie/src/git/basket/src/global.h +In file /home/kelvie/src/git/basket/src/htmlexporter.h at line 25 column 21: qtextstream.h -> q3textstream.h +In file /home/kelvie/src/git/basket/src/htmlexporter.h at line 71 column 12: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/src/kcolorcombo2.h: Added the following include directives: + #include #include #include #include #include #include +No changes made to file /home/kelvie/src/git/basket/src/keyboard.h +In file /home/kelvie/src/git/basket/src/kgpgme.h at line 43 column 18: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/kgpgme.h at line 71 column 10: QCString -> Q3CString +In file /home/kelvie/src/git/basket/src/kgpgme.h: Added the following include directives: + #include #include +In file /home/kelvie/src/git/basket/src/kiconcanvas.h at line 25 column 17: QDragObject -> Q3DragObject +In file /home/kelvie/src/git/basket/src/kiconcanvas.h at line 64 column 41: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/kiconcanvas.h at line 73 column 23: QDragObject -> Q3DragObject +In file /home/kelvie/src/git/basket/src/kicondialog.h: Added the following include directives: + #include +No changes made to file /home/kelvie/src/git/basket/src/likeback.h +In file /home/kelvie/src/git/basket/src/likeback_private.h at line 30 column 15: QTextEdit -> Q3TextEdit +In file /home/kelvie/src/git/basket/src/likeback_private.h at line 32 column 18: QButtonGroup -> Q3ButtonGroup +In file /home/kelvie/src/git/basket/src/likeback_private.h at line 91 column 13: QButtonGroup -> Q3ButtonGroup +In file /home/kelvie/src/git/basket/src/likeback_private.h at line 92 column 10: QTextEdit -> Q3TextEdit +In file /home/kelvie/src/git/basket/src/linklabel.h at line 29 column 16: qframe.h -> q3frame.h +In file /home/kelvie/src/git/basket/src/linklabel.h at line 35 column 16: QBoxLayout -> Q3BoxLayout +In file /home/kelvie/src/git/basket/src/linklabel.h at line 100 column 31: QFrame -> Q3Frame +In file /home/kelvie/src/git/basket/src/linklabel.h at line 121 column 11: QBoxLayout -> Q3BoxLayout +In file /home/kelvie/src/git/basket/src/linklabel.h: Added the following include directives: + #include #include #include #include +In file /home/kelvie/src/git/basket/src/mainwindow.h at line 34 column 18: qptrlist.h -> q3ptrlist.h +In file /home/kelvie/src/git/basket/src/mainwindow.h at line 47 column 16: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/mainwindow.h at line 100 column 9: QPtrList -> Q3PtrList +In file /home/kelvie/src/git/basket/src/mainwindow.h at line 103 column 12: QVBoxLayout -> Q3VBoxLayout +In file /home/kelvie/src/git/basket/src/mainwindow.h: Added the following include directives: + #include #include #include #include +In file /home/kelvie/src/git/basket/src/newbasketdialog.h at line 30 column 17: QDragObject -> Q3DragObject +In file /home/kelvie/src/git/basket/src/newbasketdialog.h at line 31 column 19: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/newbasketdialog.h at line 43 column 12: QDragObject -> Q3DragObject +In file /home/kelvie/src/git/basket/src/newbasketdialog.h at line 44 column 14: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/newbasketdialog.h at line 46 column 40: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/newbasketdialog.h at line 49 column 14: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/newbasketdialog.h at line 79 column 38: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/notecontent.h at line 26 column 25: qsimplerichtext.h -> q3simplerichtext.h +In file /home/kelvie/src/git/basket/src/notecontent.h at line 31 column 15: qhttp.h -> q3http.h +In file /home/kelvie/src/git/basket/src/notecontent.h at line 176 column 16: QSimpleRichText -> Q3SimpleRichText +In file /home/kelvie/src/git/basket/src/notecontent.h at line 218 column 16: QSimpleRichText -> Q3SimpleRichText +In file /home/kelvie/src/git/basket/src/notecontent.h at line 444 column 6: QHttp -> Q3Http +In file /home/kelvie/src/git/basket/src/notecontent.h at line 449 column 45: QHttpResponseHeader -> Q3HttpResponseHeader +In file /home/kelvie/src/git/basket/src/notedrag.h at line 27 column 21: qdragobject.h -> q3dragobject.h +In file /home/kelvie/src/git/basket/src/notedrag.h at line 30 column 20: qvaluelist.h -> q3valuelist.h +In file /home/kelvie/src/git/basket/src/notedrag.h at line 52 column 19: QDragObject -> Q3DragObject +In file /home/kelvie/src/git/basket/src/notedrag.h at line 56 column 18: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/notedrag.h at line 63 column 41: QTextDrag -> Q3TextDrag +In file /home/kelvie/src/git/basket/src/notedrag.h at line 68 column 64: QCString -> Q3CString +In file /home/kelvie/src/git/basket/src/notedrag.h: Added the following include directives: + #include +In file /home/kelvie/src/git/basket/src/noteedit.h at line 27 column 19: qtextedit.h -> q3textedit.h +In file /home/kelvie/src/git/basket/src/noteedit.h: Added the following include directives: + #include +In file /home/kelvie/src/git/basket/src/notefactory.h: Added the following include directives: + #include #include +In file /home/kelvie/src/git/basket/src/note.h at line 41 column 21: QSimpleRichText -> Q3SimpleRichText +In file /home/kelvie/src/git/basket/src/note.h at line 170 column 36: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.h at line 175 column 11: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.h at line 276 column 38: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.h at line 301 column 27: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.h at line 303 column 29: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/note.h: Added the following include directives: + #include +No changes made to file /home/kelvie/src/git/basket/src/password.h +In file /home/kelvie/src/git/basket/src/popupmenu.h at line 26 column 16: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/popupmenu.h at line 33 column 33: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/popupmenu.h at line 36 column 33: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/popupmenu.h at line 39 column 32: QPopupMenu -> Q3PopupMenu +In file /home/kelvie/src/git/basket/src/popupmenu.h: Added the following include directives: + #include +In file /home/kelvie/src/git/basket/src/qeffects.h at line 86 column 24: qguardedptr.h -> qpointer.h +In file /home/kelvie/src/git/basket/src/qeffects.h at line 128 column 13: QGuardedPtr -> QPointer +In file /home/kelvie/src/git/basket/src/qeffects.h at line 155 column 13: QGuardedPtr -> QPointer +In file /home/kelvie/src/git/basket/src/qeffects.h: Added the following include directives: + #include #include #include +In file /home/kelvie/src/git/basket/src/regiongrabber.h: Added the following include directives: + #include #include +In file /home/kelvie/src/git/basket/src/settings.h at line 43 column 15: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/settings.h at line 44 column 18: QButtonGroup -> Q3ButtonGroup +In file /home/kelvie/src/git/basket/src/settings.h: Added the following include directives: + #include +In file /home/kelvie/src/git/basket/src/softwareimporters.h at line 28 column 19: QVButtonGroup -> Q3VButtonGroup +In file /home/kelvie/src/git/basket/src/softwareimporters.h at line 44 column 14: QVButtonGroup -> Q3VButtonGroup +In file /home/kelvie/src/git/basket/src/softwareimporters.h at line 58 column 14: QVButtonGroup -> Q3VButtonGroup +In file /home/kelvie/src/git/basket/src/softwareimporters.h at line 60 column 10: QTextEdit -> Q3TextEdit +In file /home/kelvie/src/git/basket/src/systemtray.h: Added the following include directives: + #include #include #include #include #include #include #include #include +In file /home/kelvie/src/git/basket/src/tag.h at line 27 column 20: qvaluelist.h -> q3valuelist.h +In file /home/kelvie/src/git/basket/src/tag.h at line 145 column 18: qiconset.h -> qicon.h +In file /home/kelvie/src/git/basket/src/tag.h at line 41 column 19: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/tag.h at line 107 column 19: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/tag.h at line 114 column 34: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/tag.h at line 180 column 16: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/tag.h at line 181 column 16: QIconSet -> QIcon +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 30 column 19: qlistview.h -> q3listview.h +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 31 column 20: qvaluelist.h -> q3valuelist.h +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 33 column 15: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 53 column 19: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 64 column 19: QValueList -> Q3ValueList +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 74 column 44: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 77 column 26: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 78 column 30: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 79 column 26: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 79 column 53: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 80 column 30: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 80 column 53: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 81 column 26: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 82 column 30: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 83 column 26: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 83 column 53: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 84 column 30: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 84 column 53: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 92 column 59: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 101 column 36: QListView -> Q3ListView +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 140 column 38: QListViewItem -> Q3ListViewItem +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 163 column 10: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/tagsedit.h at line 164 column 10: QGroupBox -> Q3GroupBox +In file /home/kelvie/src/git/basket/src/tagsedit.h: Added the following include directives: + #include #include #include +In file /home/kelvie/src/git/basket/src/tools.h at line 37 column 17: QMemArray -> Q3MemArray +In file /home/kelvie/src/git/basket/src/tools.h at line 38 column 17: QMemArray -> Q3MemArray +In file /home/kelvie/src/git/basket/src/tools.h at line 39 column 17: QMemArray -> Q3MemArray +In file /home/kelvie/src/git/basket/src/tools.h: Added the following include directives: + #include #include +In file /home/kelvie/src/git/basket/src/variouswidgets.h at line 36 column 19: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/variouswidgets.h at line 108 column 26: QIconViewItem -> Q3IconViewItem +In file /home/kelvie/src/git/basket/src/variouswidgets.h: Added the following include directives: + #include #include +No changes made to file /home/kelvie/src/git/basket/src/xmlwork.h +In file /home/kelvie/src/git/basket/file-integration/basketthumbcreator.cpp at line 25 column 21: qtextstream.h -> q3textstream.h +In file /home/kelvie/src/git/basket/file-integration/basketthumbcreator.cpp at line 41 column 26: IO_ReadOnly -> QIODevice::ReadOnly +In file /home/kelvie/src/git/basket/file-integration/basketthumbcreator.cpp at line 42 column 13: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/file-integration/basketthumbcreator.cpp at line 43 column 32: QTextStream -> Q3TextStream +In file /home/kelvie/src/git/basket/file-integration/basketthumbcreator.cpp at line 71 column 37: IO_WriteOnly -> QIODevice::WriteOnly +No changes made to file /home/kelvie/src/git/basket/file-integration/basketthumbcreator.h + diff --git a/src/archive.cpp b/src/archive.cpp index ed929ee..0b2fbe3 100644 --- a/src/archive.cpp +++ b/src/archive.cpp @@ -20,9 +20,11 @@ #include #include -#include +#include #include #include +//Added by qt3to4: +#include #include #include #include @@ -67,7 +69,7 @@ void Archive::save(Basket *basket, bool withSubBaskets, const QString &destinati // Create the temporar archive file: QString tempDestination = tempFolder + "temp-archive.tar.gz"; KTar tar(tempDestination, "application/x-gzip"); - tar.open(IO_WriteOnly); + tar.open(QIODevice::WriteOnly); tar.writeDir("baskets", "", ""); progress->advance(1); // Preparation finished @@ -87,7 +89,7 @@ void Archive::save(Basket *basket, bool withSubBaskets, const QString &destinati dir.remove(tempFolder + "baskets.xml"); // Save a Small tags.xml Document: - QValueList tags; + Q3ValueList tags; listUsedTags(basket, withSubBaskets, tags); Tag::saveTagsTo(tags, tempFolder + "tags.xml"); tar.addLocalFile(tempFolder + "tags.xml", "tags.xml"); @@ -137,11 +139,11 @@ void Archive::save(Basket *basket, bool withSubBaskets, const QString &destinati // Finaly Save to the Real Destination file: QFile file(destination); - if (file.open(IO_WriteOnly)) { + if (file.open(QIODevice::WriteOnly)) { ulong previewSize = QFile(tempFolder + "preview.png").size(); ulong archiveSize = QFile(tempDestination).size(); - QTextStream stream(&file); - stream.setEncoding(QTextStream::Latin1); + Q3TextStream stream(&file); + stream.setEncoding(Q3TextStream::Latin1); stream << "BasKetNP:archive\n" << "version:0.6.1\n" // << "read-compatible:0.6.1\n" @@ -152,14 +154,14 @@ void Archive::save(Basket *basket, bool withSubBaskets, const QString &destinati char *buffer = new char[BUFFER_SIZE]; Q_LONG sizeRead; QFile previewFile(tempFolder + "preview.png"); - if (previewFile.open(IO_ReadOnly)) { + if (previewFile.open(QIODevice::ReadOnly)) { while ((sizeRead = previewFile.readBlock(buffer, BUFFER_SIZE)) > 0) file.writeBlock(buffer, sizeRead); } stream << "archive*:" << archiveSize << "\n"; // Copy the Archive File: QFile archiveFile(tempDestination); - if (archiveFile.open(IO_ReadOnly)) { + if (archiveFile.open(QIODevice::ReadOnly)) { while ((sizeRead = archiveFile.readBlock(buffer, BUFFER_SIZE)) > 0) file.writeBlock(buffer, sizeRead); } @@ -231,7 +233,7 @@ void Archive::saveBasketToArchive(Basket *basket, bool recursive, KTar *tar, QSt } } -void Archive::listUsedTags(Basket *basket, bool recursive, QValueList &list) +void Archive::listUsedTags(Basket *basket, bool recursive, Q3ValueList &list) { basket->listUsedTags(list); BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket); @@ -251,9 +253,9 @@ void Archive::open(const QString &path) const Q_ULONG BUFFER_SIZE = 1024; QFile file(path); - if (file.open(IO_ReadOnly)) { - QTextStream stream(&file); - stream.setEncoding(QTextStream::Latin1); + if (file.open(QIODevice::ReadOnly)) { + Q3TextStream stream(&file); + stream.setEncoding(Q3TextStream::Latin1); QString line = stream.readLine(); if (line != "BasKetNP:archive") { KMessageBox::error(0, i18n("This file is not a basket archive."), i18n("Basket Archive Error")); @@ -343,7 +345,7 @@ void Archive::open(const QString &path) // Get the archive file: QString tempArchive = tempFolder + "temp-archive.tar.gz"; QFile archiveFile(tempArchive); - if (archiveFile.open(IO_WriteOnly)) { + if (archiveFile.open(QIODevice::WriteOnly)) { char *buffer = new char[BUFFER_SIZE]; Q_LONG sizeRead; while ((sizeRead = file.readBlock(buffer, QMIN(BUFFER_SIZE, size))) > 0) { @@ -358,7 +360,7 @@ void Archive::open(const QString &path) QDir dir; dir.mkdir(extractionFolder); KTar tar(tempArchive, "application/x-gzip"); - tar.open(IO_ReadOnly); + tar.open(QIODevice::ReadOnly); tar.directory()->copyTo(extractionFolder); tar.close(); diff --git a/src/archive.h b/src/archive.h index 32c337a..b7076e0 100644 --- a/src/archive.h +++ b/src/archive.h @@ -21,7 +21,7 @@ #ifndef ARCHIVE_H #define ARCHIVE_H -#include +#include #include class Basket; @@ -44,7 +44,7 @@ class Archive private: // Convenient Methods for Saving: static void saveBasketToArchive(Basket *basket, bool recursive, KTar *tar, QStringList &backgrounds, const QString &tempFolder, KProgress *progress); - static void listUsedTags(Basket *basket, bool recursive, QValueList &list); + static void listUsedTags(Basket *basket, bool recursive, Q3ValueList &list); // Convenient Methods for Loading: static void renameBasketFolders(const QString &extractionFolder, QMap &mergedStates); static void renameBasketFolder(const QString &extractionFolder, QDomNode &basketNode, QMap &folderMap, QMap &mergedStates); diff --git a/src/backgroundmanager.cpp b/src/backgroundmanager.cpp index 4333ea5..84da55c 100644 --- a/src/backgroundmanager.cpp +++ b/src/backgroundmanager.cpp @@ -25,6 +25,8 @@ #include #include #include +//Added by qt3to4: +#include #include diff --git a/src/backgroundmanager.h b/src/backgroundmanager.h index d70c444..d0b18c3 100644 --- a/src/backgroundmanager.h +++ b/src/backgroundmanager.h @@ -22,7 +22,7 @@ #define BACKGROUNDMANAGER_H #include -#include +#include #include #include #include @@ -90,8 +90,8 @@ class BackgroundManager : private QObject Q_OBJECT private: /// LIST OF IMAGES: - typedef QValueList BackgroundsList; - typedef QValueList OpaqueBackgroundsList; + typedef Q3ValueList BackgroundsList; + typedef Q3ValueList OpaqueBackgroundsList; public: /// CONTRUCTOR AND DESTRUCTOR: diff --git a/src/backup.cpp b/src/backup.cpp index 612ba92..1884830 100644 --- a/src/backup.cpp +++ b/src/backup.cpp @@ -26,16 +26,19 @@ #include "tools.h" #include "formatimporter.h" // To move a folder -#include -#include +#include +#include #include #include #include +//Added by qt3to4: +#include +#include #include #include #include #include -#include +#include #include #include #include @@ -57,16 +60,16 @@ BackupDialog::BackupDialog(QWidget *parent, const char *name) : KDialogBase(parent, name, /*modal=*/true, i18n("Backup & Restore"), KDialogBase::Close, KDialogBase::Close, /*separator=*/false) { - QVBox *page = makeVBoxMainWidget(); + Q3VBox *page = makeVBoxMainWidget(); // page->setSpacing(spacingHint()); QString savesFolder = Global::savesFolder(); savesFolder = savesFolder.left(savesFolder.length() - 1); // savesFolder ends with "/" - QGroupBox *folderGroup = new QGroupBox(1, Qt::Horizontal, i18n("Save Folder"), page); + Q3GroupBox *folderGroup = new Q3GroupBox(1, Qt::Horizontal, i18n("Save Folder"), page); new QLabel("" + i18n("Your baskets are currently stored in that folder:
%1").arg(savesFolder), folderGroup); QWidget *folderWidget = new QWidget(folderGroup); - QHBoxLayout *folderLayout = new QHBoxLayout(folderWidget, 0, spacingHint()); + Q3HBoxLayout *folderLayout = new Q3HBoxLayout(folderWidget, 0, spacingHint()); QPushButton *moveFolder = new QPushButton(i18n("&Move to Another Folder..."), folderWidget); QPushButton *useFolder = new QPushButton(i18n("&Use Another Existing Folder..."), folderWidget); HelpLabel *helpLabel = new HelpLabel(i18n("Why to do that?"), i18n( @@ -87,9 +90,9 @@ BackupDialog::BackupDialog(QWidget *parent, const char *name) connect( moveFolder, SIGNAL(clicked()), this, SLOT(moveToAnotherFolder()) ); connect( useFolder, SIGNAL(clicked()), this, SLOT(useAnotherExistingFolder()) ); - QGroupBox *backupGroup = new QGroupBox(1, Qt::Horizontal, i18n("Backups"), page); + Q3GroupBox *backupGroup = new Q3GroupBox(1, Qt::Horizontal, i18n("Backups"), page); QWidget *backupWidget = new QWidget(backupGroup); - QHBoxLayout *backupLayout = new QHBoxLayout(backupWidget, 0, spacingHint()); + Q3HBoxLayout *backupLayout = new Q3HBoxLayout(backupWidget, 0, spacingHint()); QPushButton *backupButton = new QPushButton(i18n("&Backup..."), backupWidget); QPushButton *restoreButton = new QPushButton(i18n("&Restore a Backup..."), backupWidget); m_lastBackup = new QLabel("", backupWidget); @@ -242,8 +245,8 @@ void BackupDialog::restore() // Add the README file for user to cancel a bad restoration: QString readmePath = safetyPath + i18n("README.txt"); QFile file(readmePath); - if (file.open(IO_WriteOnly)) { - QTextStream stream(&file); + if (file.open(QIODevice::WriteOnly)) { + Q3TextStream stream(&file); stream << i18n("This is a safety copy of your baskets like they were before you started to restore the backup %1.").arg(KURL(path).fileName()) + "\n\n" << i18n("If the restoration was a success and you restored what you wanted to restore, you can remove this folder.") + "\n\n" << i18n("If something went wrong during the restoration process, you can re-use this folder to store your baskets and nothing will be lost.") + "\n\n" @@ -370,7 +373,7 @@ BackupThread::BackupThread(const QString &tarFile, const QString &folderToBackup void BackupThread::run() { KTar tar(m_tarFile, "application/x-gzip"); - tar.open(IO_WriteOnly); + tar.open(QIODevice::WriteOnly); tar.addLocalDirectory(m_folderToBackup, backupMagicFolder); // KArchive does not add hidden files. Basket description files (".basket") are hidden, we add them manually: QDir dir(m_folderToBackup + "baskets/"); @@ -396,7 +399,7 @@ void RestoreThread::run() { m_success = false; KTar tar(m_tarFile, "application/x-gzip"); - tar.open(IO_ReadOnly); + tar.open(QIODevice::ReadOnly); if (tar.isOpened()) { const KArchiveDirectory *directory = tar.directory(); if (directory->entries().contains(backupMagicFolder)) { diff --git a/src/backup.h b/src/backup.h index 746c4cf..e58dd70 100644 --- a/src/backup.h +++ b/src/backup.h @@ -24,6 +24,8 @@ #include #include #include +//Added by qt3to4: +#include /** * @author Sébastien Laoût diff --git a/src/basket.cpp b/src/basket.cpp index f5a9fda..b4dce05 100644 --- a/src/basket.cpp +++ b/src/basket.cpp @@ -18,15 +18,36 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include +#include #include #include #include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include #include -#include +#include #include #include #include @@ -45,7 +66,7 @@ #include #include #include -#include +#include #include // For sleep() @@ -53,7 +74,7 @@ #include #include -#include +#include #include #include @@ -164,9 +185,9 @@ int NoteSelection::count() return count; } -QValueList NoteSelection::parentGroups() +Q3ValueList NoteSelection::parentGroups() { - QValueList groups; + Q3ValueList groups; // For each note: for (NoteSelection *node = firstStacked(); node; node = node->nextStacked()) @@ -184,7 +205,7 @@ QValueList NoteSelection::parentGroups() DecoratedBasket::DecoratedBasket(QWidget *parent, const QString &folderName, const char *name, WFlags fl) : QWidget(parent, name, fl) { - m_layout = new QVBoxLayout(this); + m_layout = new Q3VBoxLayout(this); m_filter = new FilterBar(this); m_basket = new Basket(this, folderName); m_layout->addWidget(m_basket); @@ -311,7 +332,7 @@ void drawGradient( QPainter *p, const QColor &colorTop, const QColor & colorBott /* * Defined in note.cpp: */ -extern void substractRectOnAreas(const QRect &rectToSubstract, QValueList &areas, bool andRemove = true); +extern void substractRectOnAreas(const QRect &rectToSubstract, Q3ValueList &areas, bool andRemove = true); void debugZone(int zone) { @@ -1337,7 +1358,7 @@ void Basket::countsChangedTimeOut() Basket::Basket(QWidget *parent, const QString &folderName) - : QScrollView(parent), + : Q3ScrollView(parent), QToolTip(viewport()), m_noActionOnMouseRelease(false), m_ignoreCloseEditorOnNextMouseRelease(false), m_pressPos(-100, -100), m_canDrag(false), m_firstNote(0), m_columnsCount(1), m_mindMap(false), m_resizingNote(0L), m_pickedResizer(0), m_movingNote(0L), m_pickedHandle(0, 0), @@ -1490,7 +1511,7 @@ void Basket::contentsMousePressEvent(QMouseEvent *event) m_canDrag = true; // Saving where we were editing, because during a drag, the mouse can fly over the text edit and move the cursor position: if (m_editor && m_editor->textEdit()) { - QTextEdit *editor = m_editor->textEdit(); + Q3TextEdit *editor = m_editor->textEdit(); editor->getCursorPosition(&m_editParagraph, &m_editIndex); } } @@ -1609,7 +1630,7 @@ void Basket::contentsMousePressEvent(QMouseEvent *event) clicked->setSelected(true); } m_startOfShiftSelectionNote = (clicked->isGroup() ? clicked->firstRealChild() : clicked); - QPopupMenu* menu = Global::bnpView->popupMenu("note_popup"); + Q3PopupMenu* menu = Global::bnpView->popupMenu("note_popup"); connect( menu, SIGNAL(aboutToHide()), this, SLOT(unlockHovering()) ); connect( menu, SIGNAL(aboutToHide()), this, SLOT(disableNextClick()) ); doHoverEffects(clicked, zone); // In the case where another popup menu was open, we should do that manually! @@ -1699,7 +1720,7 @@ void Basket::contentsContextMenuEvent(QContextMenuEvent *event) if (event->reason() == QContextMenuEvent::Keyboard) { if (countFounds/*countShown*/() == 0) { // TODO: Count shown!! QRect basketRect( mapToGlobal(QPoint(0,0)), size() ); - QPopupMenu *menu = Global::bnpView->popupMenu("insert_popup"); + Q3PopupMenu *menu = Global::bnpView->popupMenu("insert_popup"); setInsertPopupMenu(); connect( menu, SIGNAL(aboutToHide()), this, SLOT(delayedCancelInsertPopupMenu()) ); connect( menu, SIGNAL(aboutToHide()), this, SLOT(unlockHovering()) ); @@ -1713,7 +1734,7 @@ void Basket::contentsContextMenuEvent(QContextMenuEvent *event) setFocusedNote(m_focusedNote); /// /// /// m_startOfShiftSelectionNote = (m_focusedNote->isGroup() ? m_focusedNote->firstRealChild() : m_focusedNote); // Popup at bottom (or top) of the focused note, if visible : - QPopupMenu *menu = Global::bnpView->popupMenu("note_popup"); + Q3PopupMenu *menu = Global::bnpView->popupMenu("note_popup"); connect( menu, SIGNAL(aboutToHide()), this, SLOT(unlockHovering()) ); connect( menu, SIGNAL(aboutToHide()), this, SLOT(disableNextClick()) ); doHoverEffects(m_focusedNote, Note::Content); // In the case where another popup menu was open, we should do that manually! @@ -1766,7 +1787,7 @@ void Basket::recomputeAllStyles() note->recomputeAllStyles(); } -void Basket::removedStates(const QValueList &deletedStates) +void Basket::removedStates(const Q3ValueList &deletedStates) { bool modifiedBasket = false; @@ -1985,7 +2006,7 @@ void Basket::contentsDropEvent(QDropEvent *event) // This is because during a drag, the mouse can fly over the text edit and move the cursor position, and even HIDE the cursor. // So we re-show the cursor, and re-position it at the right place: if (m_editor && m_editor->textEdit()) { - QTextEdit *editor = m_editor->textEdit(); + Q3TextEdit *editor = m_editor->textEdit(); editor->setCursorPosition(m_editParagraph, m_editIndex); } } @@ -2364,7 +2385,7 @@ void Basket::contentsMouseReleaseEvent(QMouseEvent *event) // TODO: ask confirmation: "Do you really want to delete the welcome baskets?\n You can re-add them at any time in the Help menu." Global::bnpView->doBasketDeletion(this); } else if (link == "basket-internal-import") { - QPopupMenu *menu = Global::bnpView->popupMenu("fileimport"); + Q3PopupMenu *menu = Global::bnpView->popupMenu("fileimport"); menu->exec(event->globalPos()); } else { KRun *run = new KRun(link); // open the URL. @@ -2417,7 +2438,7 @@ void Basket::contentsMouseMoveEvent(QMouseEvent *event) m_selectionStarted = false; NoteSelection *selection = selectedNotes(); if (selection->firstStacked()) { - QDragObject *d = NoteDrag::dragObject(selection, /*cutting=*/false, /*source=*/this); // d will be deleted by QT + Q3DragObject *d = NoteDrag::dragObject(selection, /*cutting=*/false, /*source=*/this); // d will be deleted by QT /*bool shouldRemove = */d->drag(); // delete selection; @@ -2809,7 +2830,7 @@ void Basket::maybeTip(const QPoint &pos) if (!note && isFreeLayout()) { message = i18n("Insert note here\nRight click for more options"); QRect itRect; - for (QValueList::iterator it = m_blankAreas.begin(); it != m_blankAreas.end(); ++it) { + for (Q3ValueList::iterator it = m_blankAreas.begin(); it != m_blankAreas.end(); ++it) { itRect = QRect(0, 0, visibleWidth(), visibleHeight()).intersect(*it); if (itRect.contains(contentPos)) { rect = itRect; @@ -2999,7 +3020,7 @@ void Basket::viewportResizeEvent(QResizeEvent *event) } // if (isDuringEdit()) // ensureNoteVisible(editedNote()); - QScrollView::viewportResizeEvent(event); + Q3ScrollView::viewportResizeEvent(event); } void Basket::animateLoad() @@ -3069,12 +3090,12 @@ void Basket::drawContents(QPainter *painter, int clipX, int clipY, int clipWidth { if(!m_decryptBox) { - m_decryptBox = new QFrame( this, "m_decryptBox" ); - m_decryptBox->setFrameShape( QFrame::StyledPanel ); - m_decryptBox->setFrameShadow( QFrame::Plain ); + m_decryptBox = new Q3Frame( this, "m_decryptBox" ); + m_decryptBox->setFrameShape( Q3Frame::StyledPanel ); + m_decryptBox->setFrameShadow( Q3Frame::Plain ); m_decryptBox->setLineWidth( 1 ); - QGridLayout* layout = new QGridLayout( m_decryptBox, 1, 1, 11, 6, "decryptBoxLayout"); + Q3GridLayout* layout = new Q3GridLayout( m_decryptBox, 1, 1, 11, 6, "decryptBoxLayout"); #ifdef HAVE_LIBGPGME m_button = new QPushButton( m_decryptBox, "button" ); @@ -3136,7 +3157,7 @@ void Basket::drawContents(QPainter *painter, int clipX, int clipY, int clipWidth if (!m_loaded) { QPixmap pixmap(visibleWidth(), visibleHeight()); // TODO: Clip it to asked size only! QPainter painter2(&pixmap); - QSimpleRichText rt(QString("
%1
").arg(i18n("Loading...")), QScrollView::font()); + Q3SimpleRichText rt(QString("
%1
").arg(i18n("Loading...")), Q3ScrollView::font()); rt.setWidth(visibleWidth()); int hrt = rt.height(); painter2.fillRect(0, 0, visibleWidth(), visibleHeight(), brush); @@ -3160,7 +3181,7 @@ void Basket::drawContents(QPainter *painter, int clipX, int clipY, int clipWidth QPixmap pixmap; QPainter painter2; QRect rect; - for (QValueList::iterator it = m_blankAreas.begin(); it != m_blankAreas.end(); ++it) { + for (Q3ValueList::iterator it = m_blankAreas.begin(); it != m_blankAreas.end(); ++it) { rect = clipRect.intersect(*it); if (rect.width() > 0 && rect.height() > 0) { // If there is an inserter to draw, draw the image off screen, @@ -3312,7 +3333,7 @@ void Basket::updateNote(Note *note) void Basket::animateObjects() { - QValueList::iterator it; + Q3ValueList::iterator it; for (it = m_animatedNotes.begin(); it != m_animatedNotes.end(); ) // if ((*it)->y() >= contentsY() && (*it)->bottom() <= contentsY() + contentsWidth()) // updateNote(*it); @@ -3387,7 +3408,7 @@ void Basket::popupEmblemMenu(Note *note, int emblemNumber) menu.insertItem( SmallIconSet("filter"), i18n("&Filter by this Tag"), 3 ); } else { menu.insertTitle(tag->name()); - QValueList::iterator it; + Q3ValueList::iterator it; State *currentState; int i = 10; @@ -3608,11 +3629,11 @@ void Basket::updateEditorAppearance() int para, index; m_editor->textEdit()->getCursorPosition(¶, &index); if (para == 0 && index == 0) { - m_editor->textEdit()->moveCursor(QTextEdit::MoveForward, /*select=*/false); - m_editor->textEdit()->moveCursor(QTextEdit::MoveBackward, /*select=*/false); + m_editor->textEdit()->moveCursor(Q3TextEdit::MoveForward, /*select=*/false); + m_editor->textEdit()->moveCursor(Q3TextEdit::MoveBackward, /*select=*/false); } else { - m_editor->textEdit()->moveCursor(QTextEdit::MoveBackward, /*select=*/false); - m_editor->textEdit()->moveCursor(QTextEdit::MoveForward, /*select=*/false); + m_editor->textEdit()->moveCursor(Q3TextEdit::MoveBackward, /*select=*/false); + m_editor->textEdit()->moveCursor(Q3TextEdit::MoveForward, /*select=*/false); } htmlEditor->cursorPositionChanged(); // Does not work anyway :-( (when clicking on a red bold text, the toolbar still show black normal text) } @@ -3622,7 +3643,7 @@ void Basket::updateEditorAppearance() void Basket::editorPropertiesChanged() { if (isDuringEdit() && m_editor->note()->content()->type() == NoteType::Html) { - m_editor->textEdit()->setAutoFormatting(Settings::autoBullet() ? QTextEdit::AutoAll : QTextEdit::AutoNone); + m_editor->textEdit()->setAutoFormatting(Settings::autoBullet() ? Q3TextEdit::AutoAll : Q3TextEdit::AutoNone); } } @@ -3754,7 +3775,7 @@ void Basket::placeEditor(bool /*andEnsureVisible*/ /*= false*/) if (!isDuringEdit()) return; - QFrame *editorQFrame = dynamic_cast(m_editor->widget()); + Q3Frame *editorQFrame = dynamic_cast(m_editor->widget()); KTextEdit *textEdit = m_editor->textEdit(); // QLineEdit *lineEdit = m_editor->lineEdit(); Note *note = m_editor->note(); @@ -4206,7 +4227,7 @@ void Basket::doCopy(CopyMode copyMode) NoteSelection *selection = selectedNotes(); int countCopied = countSelecteds(); if (selection->firstStacked()) { - QDragObject *d = NoteDrag::dragObject(selection, copyMode == CutToClipboard, /*source=*/0); // d will be deleted by QT + Q3DragObject *d = NoteDrag::dragObject(selection, copyMode == CutToClipboard, /*source=*/0); // d will be deleted by QT // /*bool shouldRemove = */d->drag(); // delete selection; cb->setData(d, mode); // NoteMultipleDrag will be deleted by QT @@ -4597,7 +4618,7 @@ void Basket::noteMoveNoteDown() void Basket::wheelEvent(QWheelEvent *event) { - QScrollView::wheelEvent(event); + Q3ScrollView::wheelEvent(event); } void Basket::linkLookChanged() @@ -4647,9 +4668,9 @@ void Basket::deleteFiles() Tools::deleteRecursively(fullPath()); } -QValueList Basket::usedStates() +Q3ValueList Basket::usedStates() { - QValueList states; + Q3ValueList states; FOR_EACH_NOTE (note) note->usedStates(states); return states; @@ -4682,7 +4703,7 @@ QString Basket::saveGradientBackground(const QColor &color, const QFont &font, c return fileName; } -void Basket::listUsedTags(QValueList &list) +void Basket::listUsedTags(Q3ValueList &list) { if (!isLoaded()) { load(); @@ -5160,7 +5181,7 @@ void Basket::watchedFileDeleted(const QString &fullPath) void Basket::updateModifiedNotes() { - for (QValueList::iterator it = m_modifiedFiles.begin(); it != m_modifiedFiles.end(); ++it) { + for (Q3ValueList::iterator it = m_modifiedFiles.begin(); it != m_modifiedFiles.end(); ++it) { Note *note = noteForFullPath(*it); if (note) note->content()->loadFromFile(/*lazyLoad=*/false); @@ -5246,7 +5267,7 @@ bool Basket::isFileEncrypted() { QFile file(fullPath() + ".basket"); - if (file.open(IO_ReadOnly)){ + if (file.open(QIODevice::ReadOnly)){ QString line; file.readLine(line, 32); @@ -5261,7 +5282,7 @@ bool Basket::loadFromFile(const QString &fullPath, QByteArray *array) QFile file(fullPath); bool encrypted = false; - if (file.open(IO_ReadOnly)){ + if (file.open(QIODevice::ReadOnly)){ *array = file.readAll(); const char* magic = "-----BEGIN PGP MESSAGE-----"; uint i = 0; @@ -5302,7 +5323,7 @@ bool Basket::loadFromFile(const QString &fullPath, QByteArray *array) bool Basket::saveToFile(const QString& fullPath, const QString& string, bool isLocalEncoding) { - QCString bytes = (isLocalEncoding ? string.local8Bit() : string.utf8()); + Q3CString bytes = (isLocalEncoding ? string.local8Bit() : string.utf8()); return saveToFile(fullPath, bytes, bytes.length()); } @@ -5425,7 +5446,7 @@ bool Basket::saveToFile(const QString& fullPath, const QByteArray& array, Q_ULON /*static*/ bool Basket::safelySaveToFile(const QString& fullPath, const QString& string, bool isLocalEncoding) { - QCString bytes = (isLocalEncoding ? string.local8Bit() : string.utf8()); + Q3CString bytes = (isLocalEncoding ? string.local8Bit() : string.utf8()); return safelySaveToFile(fullPath, bytes, bytes.length() - 1); } @@ -5443,7 +5464,7 @@ DiskErrorDialog::DiskErrorDialog(const QString &titleMessage, const QString &mes //enableButton(Close, false); //enableButtonOK(false); setModal(true); - QHBoxLayout *layout = new QHBoxLayout(plainPage(), /*margin=*/0, spacingHint()); + Q3HBoxLayout *layout = new Q3HBoxLayout(plainPage(), /*margin=*/0, spacingHint()); QPixmap icon = kapp->iconLoader()->loadIcon("hdd_unmount", KIcon::NoGroup, 64, KIcon::DefaultState, /*path_store=*/0L, /*canReturnNull=*/true); QLabel *iconLabel = new QLabel(plainPage()); iconLabel->setPixmap(icon); @@ -5485,7 +5506,7 @@ void Basket::lock() #if 0 #include -#include +#include #include #include #include @@ -5502,7 +5523,7 @@ void Basket::lock() #include #include #include -#include +#include #include #include #include diff --git a/src/basket.h b/src/basket.h index 6a89b38..8dc8851 100644 --- a/src/basket.h +++ b/src/basket.h @@ -21,13 +21,31 @@ #ifndef BASKET_H #define BASKET_H -#include +#include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -38,7 +56,7 @@ #include "note.h" // For Note::Zone #include "config.h" -class QVBoxLayout; +class Q3VBoxLayout; class QDomDocument; class QDomElement; @@ -100,7 +118,7 @@ class NoteSelection void append(NoteSelection *node); int count(); - QValueList parentGroups(); + Q3ValueList parentGroups(); }; /** This store all needed information when exporting to HTML @@ -136,7 +154,7 @@ class DecoratedBasket : public QWidget FilterBar* filterBar() { return m_filter; } Basket* basket() { return m_basket; } private: - QVBoxLayout *m_layout; + Q3VBoxLayout *m_layout; FilterBar *m_filter; Basket *m_basket; }; @@ -161,7 +179,7 @@ class TransparentWidget : public QWidget /** * @author S�astien Laot */ -class Basket : public QScrollView, public QToolTip +class Basket : public Q3ScrollView, public QToolTip { /// CONSTRUCTOR AND DESTRUCTOR: Q_OBJECT @@ -276,7 +294,7 @@ class Basket : public QScrollView, public QToolTip /// ANIMATIONS: private: - QValueList m_animatedNotes; + Q3ValueList m_animatedNotes; QTimer m_animationTimer; int m_deltaY; QTime m_lastFrameTime; @@ -294,7 +312,7 @@ class Basket : public QScrollView, public QToolTip bool m_loadingLaunched; bool m_locked; bool m_shouldConvertPlainTextNotes; - QFrame* m_decryptBox; + Q3Frame* m_decryptBox; QPushButton* m_button; int m_encryptionType; QString m_encryptionKey; @@ -411,7 +429,7 @@ public slots: public slots: void activatedTagShortcut(Tag *tag); void recomputeAllStyles(); - void removedStates(const QValueList &deletedStates); + void removedStates(const Q3ValueList &deletedStates); private slots: void toggledTagInMenu(int id); void toggledStateInMenu(int id); @@ -452,7 +470,7 @@ public slots: /// BLANK SPACES DRAWING: private: - QValueList m_blankAreas; + Q3ValueList m_blankAreas; void recomputeBlankRects(); QWidget *m_cornerWidget; @@ -574,13 +592,13 @@ public slots: /// DRAG AND DROP: private: bool m_isDuringDrag; - QValueList m_draggedNotes; + Q3ValueList m_draggedNotes; public: static void acceptDropEvent(QDropEvent *event, bool preCond = true); void contentsDropEvent(QDropEvent *event); void blindDrop(QDropEvent* event); bool isDuringDrag() { return m_isDuringDrag; } - QValueList draggedNotes() { return m_draggedNotes; } + Q3ValueList draggedNotes() { return m_draggedNotes; } protected: void contentsDragEnterEvent(QDragEnterEvent*); void contentsDragMoveEvent(QDragMoveEvent *event); @@ -592,11 +610,11 @@ public slots: /// EXPORTATION: public: - QValueList usedStates(); + Q3ValueList usedStates(); static QString saveGradientBackground(const QColor &color, const QFont &font, const QString &folder); public: - void listUsedTags(QValueList &list); + void listUsedTags(Q3ValueList &list); /// MANAGE FOCUS: private: @@ -645,7 +663,7 @@ public slots: private: KDirWatch *m_watcher; QTimer m_watcherTimer; - QValueList m_modifiedFiles; + Q3ValueList m_modifiedFiles; public: void addWatchedFile(const QString &fullPath); void removeWatchedFile(const QString &fullPath); @@ -686,17 +704,17 @@ public slots: #if 0 #include -#include +#include #include -#include +#include #include #include #include #include "filter.h" -class QFrame; -class QVBoxLayout; +class Q3Frame; +class Q3VBoxLayout; class QCheckBox; class QString; class QColor; @@ -734,7 +752,7 @@ class FileEvent /** Basket that contain some Notes. * @author S�astien Laot */ -clas s Bas ket : public QScrollView +clas s Bas ket : public Q3ScrollView { Q_OBJECT public: @@ -815,7 +833,7 @@ clas s Bas ket : public QScrollView void selectionChanged(); private: QTimer m_updateTimer; - QPtrList m_updateQueue; + Q3PtrList m_updateQueue; QStringList m_dontCare; static const int c_updateTime; private: diff --git a/src/basket_part.h b/src/basket_part.h index 23b3de5..736c379 100644 --- a/src/basket_part.h +++ b/src/basket_part.h @@ -27,7 +27,7 @@ class QWidget; class QPainter; class KURL; -class QMultiLineEdit; +class Q3MultiLineEdit; class BNPView; /** diff --git a/src/basketfactory.cpp b/src/basketfactory.cpp index a8bbe1f..a134c7d 100644 --- a/src/basketfactory.cpp +++ b/src/basketfactory.cpp @@ -19,6 +19,8 @@ ***************************************************************************/ #include +//Added by qt3to4: +#include #include #include @@ -64,9 +66,9 @@ QString BasketFactory::unpackTemplate(const QString &templateName) // Unpack the template file to that folder: // TODO: REALLY unpack (this hand-creation is temporary, or it could be used in case the template can't be found) QFile file(fullPath + "/.basket"); - if (file.open(IO_WriteOnly)) { - QTextStream stream(&file); - stream.setEncoding(QTextStream::UnicodeUTF8); + if (file.open(QIODevice::WriteOnly)) { + Q3TextStream stream(&file); + stream.setEncoding(Q3TextStream::UnicodeUTF8); int nbColumns = (templateName == "mindmap" || templateName == "free" ? 0 : templateName.left(1).toInt()); Basket *currentBasket = Global::bnpView->currentBasket(); int columnWidth = (currentBasket && nbColumns > 0 ? (currentBasket->visibleWidth() - (nbColumns-1)*Note::RESIZER_WIDTH) / nbColumns : 0); diff --git a/src/basketlistview.cpp b/src/basketlistview.cpp index 45aa86e..07f34c2 100644 --- a/src/basketlistview.cpp +++ b/src/basketlistview.cpp @@ -20,6 +20,14 @@ #include "basketlistview.h" #include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -39,32 +47,32 @@ /** class BasketListViewItem: */ -BasketListViewItem::BasketListViewItem(QListView *parent, Basket *basket) - : QListViewItem(parent), m_basket(basket) +BasketListViewItem::BasketListViewItem(Q3ListView *parent, Basket *basket) + : Q3ListViewItem(parent), m_basket(basket) , m_isUnderDrag(false) , m_isAbbreviated(false) { setDropEnabled(true); } -BasketListViewItem::BasketListViewItem(QListViewItem *parent, Basket *basket) - : QListViewItem(parent), m_basket(basket) +BasketListViewItem::BasketListViewItem(Q3ListViewItem *parent, Basket *basket) + : Q3ListViewItem(parent), m_basket(basket) , m_isUnderDrag(false) , m_isAbbreviated(false) { setDropEnabled(true); } -BasketListViewItem::BasketListViewItem(QListView *parent, QListViewItem *after, Basket *basket) - : QListViewItem(parent, after), m_basket(basket) +BasketListViewItem::BasketListViewItem(Q3ListView *parent, Q3ListViewItem *after, Basket *basket) + : Q3ListViewItem(parent, after), m_basket(basket) , m_isUnderDrag(false) , m_isAbbreviated(false) { setDropEnabled(true); } -BasketListViewItem::BasketListViewItem(QListViewItem *parent, QListViewItem *after, Basket *basket) - : QListViewItem(parent, after), m_basket(basket) +BasketListViewItem::BasketListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after, Basket *basket) + : Q3ListViewItem(parent, after), m_basket(basket) , m_isUnderDrag(false) , m_isAbbreviated(false) { @@ -88,7 +96,7 @@ void BasketListViewItem::dropped(QDropEvent *event) //Global::bnpView->currentBasket()->contentsDropEvent(event); // FIXME } -int BasketListViewItem::width(const QFontMetrics &/* fontMetrics */, const QListView */*listView*/, int /* column */) const +int BasketListViewItem::width(const QFontMetrics &/* fontMetrics */, const Q3ListView */*listView*/, int /* column */) const { return listView()->visibleWidth() + 100; /* @@ -145,7 +153,7 @@ void BasketListViewItem::setup() BasketListViewItem* BasketListViewItem::lastChild() { - QListViewItem *child = firstChild(); + Q3ListViewItem *child = firstChild(); while (child) { if (child->nextSibling()) child = child->nextSibling(); @@ -191,7 +199,7 @@ BasketListViewItem* BasketListViewItem::shownItemBelow() QStringList BasketListViewItem::childNamesTree(int deep) { QStringList result; - for (QListViewItem *child = firstChild(); child; child = child->nextSibling()) { + for (Q3ListViewItem *child = firstChild(); child; child = child->nextSibling()) { BasketListViewItem *item = (BasketListViewItem*)child; // Compute indentation spaces: QString spaces; @@ -211,9 +219,9 @@ QStringList BasketListViewItem::childNamesTree(int deep) void BasketListViewItem::moveChildsBaskets() { - QListViewItem *insertAfterThis = this; - QListViewItem *nextOne; - for (QListViewItem *child = firstChild(); child; child = nextOne) { + Q3ListViewItem *insertAfterThis = this; + Q3ListViewItem *nextOne; + for (Q3ListViewItem *child = firstChild(); child; child = nextOne) { nextOne = child->nextSibling(); // Re-insert the item with the good parent: takeItem(child); @@ -238,7 +246,7 @@ void BasketListViewItem::ensureVisible() bool BasketListViewItem::isShown() { - QListViewItem *item = parent(); + Q3ListViewItem *item = parent(); while (item) { if (!item->isOpen()) return false; @@ -352,7 +360,7 @@ QPixmap BasketListViewItem::foundCountPixmap(bool isLoading, int countFound, boo bool BasketListViewItem::haveChildsLoading() { - QListViewItem *child = firstChild(); + Q3ListViewItem *child = firstChild(); while (child) { BasketListViewItem *childItem = (BasketListViewItem*)child; if (!childItem->basket()->isLoaded() && !childItem->basket()->isLocked()) @@ -373,7 +381,7 @@ bool BasketListViewItem::haveHiddenChildsLoading() bool BasketListViewItem::haveChildsLocked() { - QListViewItem *child = firstChild(); + Q3ListViewItem *child = firstChild(); while (child) { BasketListViewItem *childItem = (BasketListViewItem*)child; if (/*!*/childItem->basket()->isLocked()) @@ -395,7 +403,7 @@ bool BasketListViewItem::haveHiddenChildsLocked() int BasketListViewItem::countChildsFound() { int count = 0; - QListViewItem *child = firstChild(); + Q3ListViewItem *child = firstChild(); while (child) { BasketListViewItem *childItem = (BasketListViewItem*)child; count += childItem->basket()->countFounds(); @@ -620,7 +628,7 @@ public: public: void maybeTip(const QPoint& pos) { - QListViewItem *item = m_basketView->itemAt(m_basketView->contentsToViewport(pos)); + Q3ListViewItem *item = m_basketView->itemAt(m_basketView->contentsToViewport(pos)); BasketListViewItem* bitem = dynamic_cast(item); if (bitem && bitem->isAbbreviated()) { tip(m_basketView->itemRect(bitem), bitem->basket()->basketName()); @@ -653,9 +661,9 @@ void BasketTreeListView::viewportResizeEvent(QResizeEvent *event) void BasketTreeListView::contentsDragEnterEvent(QDragEnterEvent *event) { if (event->provides("application/x-qlistviewitem")) { - QListViewItemIterator it(this); // TODO: Don't show expanders if it's not a basket drag... + Q3ListViewItemIterator it(this); // TODO: Don't show expanders if it's not a basket drag... while (it.current()) { - QListViewItem *item = it.current(); + Q3ListViewItem *item = it.current(); if (!item->firstChild()) { item->setExpandable(true); item->setOpen(true); @@ -670,9 +678,9 @@ void BasketTreeListView::contentsDragEnterEvent(QDragEnterEvent *event) void BasketTreeListView::removeExpands() { - QListViewItemIterator it(this); + Q3ListViewItemIterator it(this); while (it.current()) { - QListViewItem *item = it.current(); + Q3ListViewItem *item = it.current(); if (!item->firstChild()) item->setExpandable(false); ++it; @@ -699,7 +707,7 @@ void BasketTreeListView::contentsDropEvent(QDropEvent *event) } else { std::cout << "Forwarding dropped data to the basket" << std::endl; - QListViewItem *item = itemAt(contentsToViewport(event->pos())); + Q3ListViewItem *item = itemAt(contentsToViewport(event->pos())); BasketListViewItem* bitem = dynamic_cast(item); if (bitem) { bitem->basket()->blindDrop(event); @@ -723,7 +731,7 @@ void BasketTreeListView::contentsDragMoveEvent(QDragMoveEvent *event) if (event->provides("application/x-qlistviewitem")) KListView::contentsDragMoveEvent(event); else { - QListViewItem *item = itemAt(contentsToViewport(event->pos())); + Q3ListViewItem *item = itemAt(contentsToViewport(event->pos())); BasketListViewItem* bitem = dynamic_cast(item); if (m_autoOpenItem != item) { m_autoOpenItem = item; @@ -772,7 +780,7 @@ void BasketTreeListView::resizeEvent(QResizeEvent *event) void BasketTreeListView::paintEmptyArea(QPainter *painter, const QRect &rect) { - QListView::paintEmptyArea(painter, rect); + Q3ListView::paintEmptyArea(painter, rect); BasketListViewItem *last = Global::bnpView->lastListViewItem(); if (last && !last->isShown()) diff --git a/src/basketlistview.h b/src/basketlistview.h index 82f1a34..a37111a 100644 --- a/src/basketlistview.h +++ b/src/basketlistview.h @@ -23,24 +23,32 @@ #include #include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include +#include class Basket; -class BasketListViewItem : public QListViewItem +class BasketListViewItem : public Q3ListViewItem { public: /// CONSTRUCTOR AND DESTRUCTOR: - BasketListViewItem(QListView *parent, Basket *basket); - BasketListViewItem(QListViewItem *parent, Basket *basket); - BasketListViewItem(QListView *parent, QListViewItem *after, Basket *basket); - BasketListViewItem(QListViewItem *parent, QListViewItem *after, Basket *basket); + BasketListViewItem(Q3ListView *parent, Basket *basket); + BasketListViewItem(Q3ListViewItem *parent, Basket *basket); + BasketListViewItem(Q3ListView *parent, Q3ListViewItem *after, Basket *basket); + BasketListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after, Basket *basket); ~BasketListViewItem(); /// bool acceptDrop(const QMimeSource *mime) const; void dropped(QDropEvent *event); Basket *basket() { return m_basket; } void setup(); - int width(const QFontMetrics &fontMetrics, const QListView *listView, int column) const; + int width(const QFontMetrics &fontMetrics, const Q3ListView *listView, int column) const; BasketListViewItem* lastChild(); BasketListViewItem* prevSibling(); BasketListViewItem* shownItemAbove(); @@ -91,7 +99,7 @@ class BasketTreeListView : public KListView void viewportResizeEvent(QResizeEvent *event); private: QTimer m_autoOpenTimer; - QListViewItem *m_autoOpenItem; + Q3ListViewItem *m_autoOpenItem; private slots: void autoOpen(); private: diff --git a/src/basketproperties.cpp b/src/basketproperties.cpp index a89fcba..3de1961 100644 --- a/src/basketproperties.cpp +++ b/src/basketproperties.cpp @@ -21,11 +21,16 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include #include #include -#include +#include #include #include #include @@ -48,10 +53,10 @@ BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, QWidget *parent) m_basket(basket) { QWidget *page = new QWidget(this); - QVBoxLayout *topLayout = new QVBoxLayout(page, /*margin=*/0, spacingHint()); + Q3VBoxLayout *topLayout = new Q3VBoxLayout(page, /*margin=*/0, spacingHint()); // Icon and Name: - QHBoxLayout *nameLayout = new QHBoxLayout(0, marginHint()*2/3, spacingHint()); + Q3HBoxLayout *nameLayout = new Q3HBoxLayout(0, marginHint()*2/3, spacingHint()); m_icon = new KIconButton(page); m_icon->setIconType(KIcon::NoGroup, KIcon::Action); m_icon->setIconSize(16); @@ -67,9 +72,9 @@ BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, QWidget *parent) topLayout->addLayout(nameLayout); // Appearance: - QGroupBox *appearance = new QGroupBox(1, Qt::Horizontal, i18n("Appearance"), page); + Q3GroupBox *appearance = new Q3GroupBox(1, Qt::Horizontal, i18n("Appearance"), page); QWidget *appearanceWidget = new QWidget(appearance); - QGridLayout *grid = new QGridLayout(appearanceWidget, /*nRows=*/3, /*nCols=*/2, /*margin=*/0, spacingHint()); + Q3GridLayout *grid = new Q3GridLayout(appearanceWidget, /*nRows=*/3, /*nCols=*/2, /*margin=*/0, spacingHint()); m_backgroundImage = new QComboBox(appearanceWidget); m_backgroundColor = new KColorCombo2(m_basket->backgroundColorSetting(), KGlobalSettings::baseColor(), appearanceWidget); m_textColor = new KColorCombo2(m_basket->textColorSetting(), KGlobalSettings::textColor(), appearanceWidget); @@ -104,9 +109,9 @@ BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, QWidget *parent) m_backgroundImage->setMinimumHeight(75 + 2 * BUTTON_MARGIN); // Disposition: - m_disposition = new QVButtonGroup(i18n("Disposition"), page); + m_disposition = new Q3VButtonGroup(i18n("Disposition"), page); QWidget *columnsWidget = new QWidget(m_disposition); - QHBoxLayout *dispoLayout = new QHBoxLayout(columnsWidget, /*margin=*/0, spacingHint()); + Q3HBoxLayout *dispoLayout = new Q3HBoxLayout(columnsWidget, /*margin=*/0, spacingHint()); QRadioButton *radio = new QRadioButton(i18n("Col&umns:"), columnsWidget); m_columnCount = new KIntNumInput(m_basket->columnsCount(), columnsWidget); m_columnCount->setRange(1, 20, /*step=*/1, /*slider=*/false); @@ -125,9 +130,9 @@ BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, QWidget *parent) mindMap->hide(); // Keyboard Shortcut: - m_shortcutRole = new QVButtonGroup(i18n("&Keyboard Shortcut"), page); + m_shortcutRole = new Q3VButtonGroup(i18n("&Keyboard Shortcut"), page); QWidget *shortcutWidget = new QWidget(m_shortcutRole); - QHBoxLayout *shortcutLayout = new QHBoxLayout(shortcutWidget, /*margin=*/0, spacingHint()); + Q3HBoxLayout *shortcutLayout = new Q3HBoxLayout(shortcutWidget, /*margin=*/0, spacingHint()); m_shortcut = new KKeyButton(shortcutWidget); m_shortcut->setShortcut(m_basket->shortcut(), /*bQtShortcut=*/true); HelpLabel *helpLabel = new HelpLabel(i18n("Learn some tips..."), i18n( diff --git a/src/basketproperties.h b/src/basketproperties.h index cefbf93..addf857 100644 --- a/src/basketproperties.h +++ b/src/basketproperties.h @@ -28,7 +28,7 @@ class KIconButton; class QLineEdit; class QComboBox; -class QVButtonGroup; +class Q3VButtonGroup; class KIntNumInput; class KKeyButton; class KShortcut; @@ -59,10 +59,10 @@ class BasketPropertiesDialog : public KDialogBase QComboBox *m_backgroundImage; KColorCombo2 *m_backgroundColor; KColorCombo2 *m_textColor; - QVButtonGroup *m_disposition; + Q3VButtonGroup *m_disposition; KIntNumInput *m_columnCount; KKeyButton *m_shortcut; - QVButtonGroup *m_shortcutRole; + Q3VButtonGroup *m_shortcutRole; QMap m_backgroundImagesMap; }; diff --git a/src/basketstatusbar.cpp b/src/basketstatusbar.cpp index e1a1f55..bbd8f62 100644 --- a/src/basketstatusbar.cpp +++ b/src/basketstatusbar.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "basketstatusbar.h" #include "clickablelabel.h" #include "global.h" diff --git a/src/basketstatusbar.h b/src/basketstatusbar.h index 10d7508..080b926 100644 --- a/src/basketstatusbar.h +++ b/src/basketstatusbar.h @@ -22,6 +22,8 @@ #include #include +//Added by qt3to4: +#include class KStatusBar; namespace KParts { class StatusBarExtension; } diff --git a/src/bnpview.cpp b/src/bnpview.cpp index 4ab0c45..3a3f91e 100644 --- a/src/bnpview.cpp +++ b/src/bnpview.cpp @@ -20,13 +20,22 @@ /// NEW: -#include +#include #include #include #include #include #include -#include +#include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -258,7 +267,7 @@ void BNPView::onFirstShow() int treeWidth = Settings::basketTreeWidth(); if (treeWidth < 0) treeWidth = m_tree->fontMetrics().maxWidth() * 11; - QValueList splitterSizes; + Q3ValueList splitterSizes; splitterSizes.append(treeWidth); setSizes(splitterSizes); } @@ -340,7 +349,7 @@ void BNPView::initialize() /// Configure the List View Columns: m_tree = new BasketTreeListView(this); m_tree->addColumn(i18n("Baskets")); - m_tree->setColumnWidthMode(0, QListView::Maximum); + m_tree->setColumnWidthMode(0, Q3ListView::Maximum); m_tree->setFullWidth(true); m_tree->setSorting(-1/*Disabled*/); m_tree->setRootIsDecorated(true); @@ -358,7 +367,7 @@ void BNPView::initialize() m_tree->setDropHighlighter(true); /// Configure the Splitter: - m_stack = new QWidgetStack(this); + m_stack = new Q3WidgetStack(this); setOpaqueResize(true); @@ -368,17 +377,17 @@ void BNPView::initialize() setResizeMode(m_stack, QSplitter::Stretch); /// Configure the List View Signals: - connect( m_tree, SIGNAL(returnPressed(QListViewItem*)), this, SLOT(slotPressed(QListViewItem*)) ); - connect( m_tree, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotPressed(QListViewItem*)) ); - connect( m_tree, SIGNAL(pressed(QListViewItem*)), this, SLOT(slotPressed(QListViewItem*)) ); - connect( m_tree, SIGNAL(expanded(QListViewItem*)), this, SLOT(needSave(QListViewItem*)) ); - connect( m_tree, SIGNAL(collapsed(QListViewItem*)), this, SLOT(needSave(QListViewItem*)) ); - connect( m_tree, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&)) ); - connect( m_tree, SIGNAL(mouseButtonPressed(int, QListViewItem*, const QPoint&, int)), this, SLOT(slotMouseButtonPressed(int, QListViewItem*, const QPoint&, int)) ); - connect( m_tree, SIGNAL(doubleClicked(QListViewItem*, const QPoint&, int)), this, SLOT(slotShowProperties(QListViewItem*, const QPoint&, int)) ); - - connect( m_tree, SIGNAL(expanded(QListViewItem*)), this, SIGNAL(basketChanged()) ); - connect( m_tree, SIGNAL(collapsed(QListViewItem*)), this, SIGNAL(basketChanged()) ); + connect( m_tree, SIGNAL(returnPressed(Q3ListViewItem*)), this, SLOT(slotPressed(Q3ListViewItem*)) ); + connect( m_tree, SIGNAL(selectionChanged(Q3ListViewItem*)), this, SLOT(slotPressed(Q3ListViewItem*)) ); + connect( m_tree, SIGNAL(pressed(Q3ListViewItem*)), this, SLOT(slotPressed(Q3ListViewItem*)) ); + connect( m_tree, SIGNAL(expanded(Q3ListViewItem*)), this, SLOT(needSave(Q3ListViewItem*)) ); + connect( m_tree, SIGNAL(collapsed(Q3ListViewItem*)), this, SLOT(needSave(Q3ListViewItem*)) ); + connect( m_tree, SIGNAL(contextMenu(KListView*, Q3ListViewItem*, const QPoint&)), this, SLOT(slotContextMenu(KListView*, Q3ListViewItem*, const QPoint&)) ); + connect( m_tree, SIGNAL(mouseButtonPressed(int, Q3ListViewItem*, const QPoint&, int)), this, SLOT(slotMouseButtonPressed(int, Q3ListViewItem*, const QPoint&, int)) ); + connect( m_tree, SIGNAL(doubleClicked(Q3ListViewItem*, const QPoint&, int)), this, SLOT(slotShowProperties(Q3ListViewItem*, const QPoint&, int)) ); + + connect( m_tree, SIGNAL(expanded(Q3ListViewItem*)), this, SIGNAL(basketChanged()) ); + connect( m_tree, SIGNAL(collapsed(Q3ListViewItem*)), this, SIGNAL(basketChanged()) ); connect( this, SIGNAL(basketNumberChanged(int)), this, SIGNAL(basketChanged()) ); connect( this, SIGNAL(basketNumberChanged(int)), this, SLOT(slotBasketNumberChanged(int)) ); @@ -398,7 +407,7 @@ void BNPView::initialize() setupActions(); /// What's This Help for the tree: - QWhatsThis::add(m_tree, i18n( + Q3WhatsThis::add(m_tree, i18n( "

Basket Tree

" "Here is the list of your baskets. " "You can organize your data by putting them in different baskets. " @@ -630,25 +639,25 @@ void BNPView::setupActions() new KAction( i18n("&Welcome Baskets"), "", "", this, SLOT(addWelcomeBaskets()), actionCollection(), "help_welcome_baskets" ); } -QListViewItem* BNPView::firstListViewItem() +Q3ListViewItem* BNPView::firstListViewItem() { return m_tree->firstChild(); } -void BNPView::slotShowProperties(QListViewItem *item, const QPoint&, int) +void BNPView::slotShowProperties(Q3ListViewItem *item, const QPoint&, int) { if (item) propBasket(); } -void BNPView::slotMouseButtonPressed(int button, QListViewItem *item, const QPoint &/*pos*/, int /*column*/) +void BNPView::slotMouseButtonPressed(int button, Q3ListViewItem *item, const QPoint &/*pos*/, int /*column*/) { if (item && (button & Qt::MidButton)) { // TODO: Paste into ((BasketListViewItem*)listViewItem)->basket() } } -void BNPView::slotContextMenu(KListView */*listView*/, QListViewItem *item, const QPoint &pos) +void BNPView::slotContextMenu(KListView */*listView*/, Q3ListViewItem *item, const QPoint &pos) { QString menuName; if (item) { @@ -668,7 +677,7 @@ void BNPView::slotContextMenu(KListView */*listView*/, QListViewItem *item, cons setNewBasketPopup(); } - QPopupMenu *menu = popupMenu(menuName); + Q3PopupMenu *menu = popupMenu(menuName); connect( menu, SIGNAL(aboutToHide()), this, SLOT(aboutToHideNewBasketPopup()) ); menu->exec(pos); } @@ -698,9 +707,9 @@ void BNPView::save() // } } -void BNPView::save(QListViewItem *firstItem, QDomDocument &document, QDomElement &parentElement) +void BNPView::save(Q3ListViewItem *firstItem, QDomDocument &document, QDomElement &parentElement) { - QListViewItem *item = firstItem; + Q3ListViewItem *item = firstItem; while (item) { // Basket *basket = ((BasketListViewItem*)item)->basket(); QDomElement basketElement = this->basketElement(item, document, parentElement); @@ -726,7 +735,7 @@ void BNPView::save(QListViewItem *firstItem, QDomDocument &document, QDomElement } } -QDomElement BNPView::basketElement(QListViewItem *item, QDomDocument &document, QDomElement &parentElement) +QDomElement BNPView::basketElement(Q3ListViewItem *item, QDomDocument &document, QDomElement &parentElement) { Basket *basket = ((BasketListViewItem*)item)->basket(); QDomElement basketElement = document.createElement("basket"); @@ -744,7 +753,7 @@ QDomElement BNPView::basketElement(QListViewItem *item, QDomDocument &document, return basketElement; } -void BNPView::saveSubHierarchy(QListViewItem *item, QDomDocument &document, QDomElement &parentElement, bool recursive) +void BNPView::saveSubHierarchy(Q3ListViewItem *item, QDomDocument &document, QDomElement &parentElement, bool recursive) { QDomElement element = basketElement(item, document, parentElement); if (recursive && item->firstChild()) @@ -765,7 +774,7 @@ void BNPView::load() m_loading = false; } -void BNPView::load(KListView */*listView*/, QListViewItem *item, const QDomElement &baskets) +void BNPView::load(KListView */*listView*/, Q3ListViewItem *item, const QDomElement &baskets) { QDomNode n = baskets.firstChild(); while ( ! n.isNull() ) { @@ -804,11 +813,11 @@ Basket* BNPView::loadBasket(const QString &folderName) return basket; } -int BNPView::basketCount(QListViewItem *parent) +int BNPView::basketCount(Q3ListViewItem *parent) { int count = 0; - QListViewItem *item = (parent ? parent->firstChild() : m_tree->firstChild()); + Q3ListViewItem *item = (parent ? parent->firstChild() : m_tree->firstChild()); while (item) { count += 1 + basketCount(item); item = item->nextSibling(); @@ -833,14 +842,14 @@ bool BNPView::canExpand() return item->firstChild(); } -BasketListViewItem* BNPView::appendBasket(Basket *basket, QListViewItem *parentItem) +BasketListViewItem* BNPView::appendBasket(Basket *basket, Q3ListViewItem *parentItem) { BasketListViewItem *newBasketItem; if (parentItem) newBasketItem = new BasketListViewItem(parentItem, ((BasketListViewItem*)parentItem)->lastChild(), basket); else { - QListViewItem *child = m_tree->firstChild(); - QListViewItem *lastChild = 0; + Q3ListViewItem *child = m_tree->firstChild(); + Q3ListViewItem *lastChild = 0; while (child) { lastChild = child; child = child->nextSibling(); @@ -864,8 +873,8 @@ void BNPView::loadNewBasket(const QString &folderName, const QDomElement &proper BasketListViewItem* BNPView::lastListViewItem() { - QListViewItem *child = m_tree->firstChild(); - QListViewItem *lastChild = 0; + Q3ListViewItem *child = m_tree->firstChild(); + Q3ListViewItem *lastChild = 0; // Set lastChild to the last primary child of the list view: while (child) { lastChild = child; @@ -937,7 +946,7 @@ void BNPView::expandBasket() void BNPView::closeAllEditors() { - QListViewItemIterator it(m_tree); + Q3ListViewItemIterator it(m_tree); while (it.current()) { BasketListViewItem *item = (BasketListViewItem*)(it.current()); item->basket()->closeEditor(); @@ -957,7 +966,7 @@ bool BNPView::convertTexts() dialog.progressBar()->setTotalSteps(basketCount()); dialog.show(); //setMinimumDuration(50/*ms*/); - QListViewItemIterator it(m_tree); + Q3ListViewItemIterator it(m_tree); while (it.current()) { BasketListViewItem *item = (BasketListViewItem*)(it.current()); if (item->basket()->convertTexts()) @@ -988,7 +997,7 @@ void BNPView::toggleFilterAllBaskets(bool doFilter) //currentBasket()->decoration()->filterBar()->setFilterAll(doFilter); // Basket *current = currentBasket(); - QListViewItemIterator it(m_tree); + Q3ListViewItemIterator it(m_tree); while (it.current()) { BasketListViewItem *item = ((BasketListViewItem*)it.current()); item->basket()->decoration()->filterBar()->setFilterAll(doFilter); @@ -1027,7 +1036,7 @@ void BNPView::newFilter() const FilterData &filterData = current->decoration()->filterBar()->filterData(); // Set the filter data for every other baskets, or reset the filter for every other baskets if we just disabled the filterInAllBaskets: - QListViewItemIterator it(m_tree); + Q3ListViewItemIterator it(m_tree); while (it.current()) { BasketListViewItem *item = ((BasketListViewItem*)it.current()); if (item->basket() != current) @@ -1046,7 +1055,7 @@ void BNPView::newFilter() // Load every baskets for filtering, if they are not already loaded, and if necessary: if (filterData.isFiltering) { Basket *current = currentBasket(); - QListViewItemIterator it(m_tree); + Q3ListViewItemIterator it(m_tree); while (it.current()) { BasketListViewItem *item = ((BasketListViewItem*)it.current()); if (item->basket() != current) { @@ -1088,7 +1097,7 @@ bool BNPView::isFilteringAllBaskets() BasketListViewItem* BNPView::listViewItemForBasket(Basket *basket) { - QListViewItemIterator it(m_tree); + Q3ListViewItemIterator it(m_tree); while (it.current()) { BasketListViewItem *item = ((BasketListViewItem*)it.current()); if (item->basket() == basket) @@ -1195,7 +1204,7 @@ void BNPView::setTreePlacement(bool onLeft) void BNPView::relayoutAllBaskets() { - QListViewItemIterator it(m_tree); + Q3ListViewItemIterator it(m_tree); while (it.current()) { BasketListViewItem *item = ((BasketListViewItem*)it.current()); //item->basket()->unbufferizeAll(); @@ -1207,7 +1216,7 @@ void BNPView::relayoutAllBaskets() void BNPView::recomputeAllStyles() { - QListViewItemIterator it(m_tree); + Q3ListViewItemIterator it(m_tree); while (it.current()) { BasketListViewItem *item = ((BasketListViewItem*)it.current()); item->basket()->recomputeAllStyles(); @@ -1217,9 +1226,9 @@ void BNPView::recomputeAllStyles() } } -void BNPView::removedStates(const QValueList &deletedStates) +void BNPView::removedStates(const Q3ValueList &deletedStates) { - QListViewItemIterator it(m_tree); + Q3ListViewItemIterator it(m_tree); while (it.current()) { BasketListViewItem *item = ((BasketListViewItem*)it.current()); item->basket()->removedStates(deletedStates); @@ -1229,7 +1238,7 @@ void BNPView::removedStates(const QValueList &deletedStates) void BNPView::linkLookChanged() { - QListViewItemIterator it(m_tree); + Q3ListViewItemIterator it(m_tree); while (it.current()) { BasketListViewItem *item = ((BasketListViewItem*)it.current()); item->basket()->linkLookChanged(); @@ -1239,7 +1248,7 @@ void BNPView::linkLookChanged() void BNPView::filterPlacementChanged(bool onTop) { - QListViewItemIterator it(m_tree); + Q3ListViewItemIterator it(m_tree); while (it.current()) { BasketListViewItem *item = static_cast(it.current()); DecoratedBasket *decoration = static_cast(item->basket()->parent()); @@ -1265,14 +1274,14 @@ void BNPView::updateBasketListViewItem(Basket *basket) save(); } -void BNPView::needSave(QListViewItem*) +void BNPView::needSave(Q3ListViewItem*) { if (!m_loading) // A basket has been collapsed/expanded or a new one is select: this is not urgent: QTimer::singleShot(500/*ms*/, this, SLOT(save())); } -void BNPView::slotPressed(QListViewItem *item, const QPoint &/*pos*/, int /*column*/) +void BNPView::slotPressed(Q3ListViewItem *item, const QPoint &/*pos*/, int /*column*/) { Basket *basket = currentBasket(); if (basket == 0) @@ -1514,9 +1523,9 @@ void BNPView::slotConvertTexts() KMessageBox::information(this, i18n("There are no plain text notes to convert."), i18n("Conversion Finished")); } -QPopupMenu* BNPView::popupMenu(const QString &menuName) +Q3PopupMenu* BNPView::popupMenu(const QString &menuName) { - QPopupMenu *menu = 0; + Q3PopupMenu *menu = 0; bool hack = false; // TODO fix this // When running in kontact and likeback Information message is shown // factory is 0. Don't show error then and don't crash either :-) @@ -1526,7 +1535,7 @@ QPopupMenu* BNPView::popupMenu(const QString &menuName) KXMLGUIFactory* factory = m_guiClient->factory(); if(factory) { - menu = (QPopupMenu *)factory->container(menuName, m_guiClient); + menu = (Q3PopupMenu *)factory->container(menuName, m_guiClient); } else hack = isPart(); @@ -1657,7 +1666,7 @@ Basket* BNPView::basketForFolderName(const QString &folderName) if (!name.endsWith("/")) name += "/"; - QListViewItemIterator it(m_tree); + Q3ListViewItemIterator it(m_tree); while (it.current()) { BasketListViewItem *item = ((BasketListViewItem*)it.current()); if (item->basket()->folderName() == name) @@ -1778,9 +1787,9 @@ void BNPView::doBasketDeletion(Basket *basket) { basket->closeEditor(); - QListViewItem *basketItem = listViewItemForBasket(basket); - QListViewItem *nextOne; - for (QListViewItem *child = basketItem->firstChild(); child; child = nextOne) { + Q3ListViewItem *basketItem = listViewItemForBasket(basket); + Q3ListViewItem *nextOne; + for (Q3ListViewItem *child = basketItem->firstChild(); child; child = nextOne) { nextOne = child->nextSibling(); // First delete the child baskets: doBasketDeletion(((BasketListViewItem*)child)->basket()); @@ -1986,7 +1995,7 @@ void BNPView::showPassiveDroppedDelayed() delete m_passivePopup; // Delete previous one (if exists): it will then hide it (only one at a time) m_passivePopup = new KPassivePopup(Settings::useSystray() ? (QWidget*)Global::systemTray : this); QPixmap contentsPixmap = NoteDrag::feedbackPixmap(m_passiveDroppedSelection); - QMimeSourceFactory::defaultFactory()->setPixmap("_passivepopup_image_", contentsPixmap); + Q3MimeSourceFactory::defaultFactory()->setPixmap("_passivepopup_image_", contentsPixmap); m_passivePopup->setView( title.arg(Tools::textToHTMLWithoutP(currentBasket()->basketName())), (contentsPixmap.isNull() ? "" : ""), @@ -2214,7 +2223,7 @@ QStringList BNPView::listBaskets() { QStringList basketList; - QListViewItemIterator it(m_tree); + Q3ListViewItemIterator it(m_tree); while (it.current()) { BasketListViewItem *item = ((BasketListViewItem*)it.current()); basketList.append(item->basket()->basketName()); @@ -2229,7 +2238,7 @@ void BNPView::handleCommandLine() KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); /* Custom data folder */ - QCString customDataFolder = args->getOption("data-folder"); + Q3CString customDataFolder = args->getOption("data-folder"); if (customDataFolder != 0 && !customDataFolder.isEmpty()) { Global::setCustomSavesFolder(customDataFolder); @@ -2379,7 +2388,7 @@ void BNPView::populateTagsMenu(KPopupMenu &menu, Note *referenceNote) currentBasket()->m_tagPopupNote = referenceNote; bool enable = currentBasket()->countSelecteds() > 0; - QValueList::iterator it; + Q3ValueList::iterator it; Tag *currentTag; State *currentState; int i = 10; diff --git a/src/bnpview.h b/src/bnpview.h index b307b0d..7736007 100644 --- a/src/bnpview.h +++ b/src/bnpview.h @@ -26,19 +26,27 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include +#include #include #include "global.h" #include "basketdcopiface.h" /// NEW: -class QWidgetStack; +class Q3WidgetStack; class QDomDocument; class QDomElement; class KToggleAction; class KPassivePopup; -class QPopupMenu; +class Q3PopupMenu; class KPopupMenu; class KTar; @@ -66,7 +74,7 @@ class BNPView : public QSplitter, virtual public BasketDcopInterface void setTreePlacement(bool onLeft); void relayoutAllBaskets(); void recomputeAllStyles(); - void removedStates(const QValueList &deletedStates); + void removedStates(const Q3ValueList &deletedStates); void linkLookChanged(); void filterPlacementChanged(bool onTop); /// MANAGE BASKETS: @@ -76,16 +84,16 @@ class BNPView : public QSplitter, virtual public BasketDcopInterface void setCurrentBasket(Basket *basket); void removeBasket(Basket *basket); /// For NewBasketDialog (and later some other classes): - QListViewItem* firstListViewItem(); + Q3ListViewItem* firstListViewItem(); /// BasketListViewItem* lastListViewItem(); - int basketCount(QListViewItem *parent = 0); + int basketCount(Q3ListViewItem *parent = 0); bool canFold(); bool canExpand(); void enableActions(); private: - QDomElement basketElement(QListViewItem *item, QDomDocument &document, QDomElement &parentElement); + QDomElement basketElement(Q3ListViewItem *item, QDomDocument &document, QDomElement &parentElement); public slots: void countsChanged(Basket *basket); void notesStateChanged(); @@ -93,10 +101,10 @@ class BNPView : public QSplitter, virtual public BasketDcopInterface void updateBasketListViewItem(Basket *basket); void save(); - void save(QListViewItem *firstItem, QDomDocument &document, QDomElement &parentElement); - void saveSubHierarchy(QListViewItem *item, QDomDocument &document, QDomElement &parentElement, bool recursive); + void save(Q3ListViewItem *firstItem, QDomDocument &document, QDomElement &parentElement); + void saveSubHierarchy(Q3ListViewItem *item, QDomDocument &document, QDomElement &parentElement, bool recursive); void load(); - void load(KListView *listView, QListViewItem *item, const QDomElement &baskets); + void load(KListView *listView, Q3ListViewItem *item, const QDomElement &baskets); void loadNewBasket(const QString &folderName, const QDomElement &properties, Basket *parent); void goToPreviousBasket(); void goToNextBasket(); @@ -260,7 +268,7 @@ class BNPView : public QSplitter, virtual public BasketDcopInterface KAction *m_actInsertLauncher; KAction *m_actImportIcon; KAction *m_actLoadFile; - QPtrList m_insertActions; + Q3PtrList m_insertActions; // Basket actions : KToggleAction *m_actShowFilter; KAction *m_actResetFilter; @@ -278,11 +286,11 @@ class BNPView : public QSplitter, virtual public BasketDcopInterface public: Basket* loadBasket(const QString &folderName); // Public only for class Archive - BasketListViewItem* appendBasket(Basket *basket, QListViewItem *parentItem); // Public only for class Archive + BasketListViewItem* appendBasket(Basket *basket, Q3ListViewItem *parentItem); // Public only for class Archive Basket* basketForFolderName(const QString &folderName); Note* noteForFileName(const QString &fileName, Basket &basket, Note* note = 0); - QPopupMenu* popupMenu(const QString &menuName); + Q3PopupMenu* popupMenu(const QString &menuName); bool isPart(); bool isMainWindowActive(); void showMainWindow(); @@ -319,11 +327,11 @@ class BNPView : public QSplitter, virtual public BasketDcopInterface KPopupMenu *m_lastOpenedTagsMenu; private slots: - void slotPressed(QListViewItem *item, const QPoint &/*pos*/ = QPoint(), int /*column*/ = 0); - void needSave(QListViewItem*); - void slotContextMenu(KListView *listView, QListViewItem *item, const QPoint &pos); - void slotMouseButtonPressed(int button, QListViewItem *item, const QPoint &pos, int column); - void slotShowProperties(QListViewItem *item, const QPoint&, int); + void slotPressed(Q3ListViewItem *item, const QPoint &/*pos*/ = QPoint(), int /*column*/ = 0); + void needSave(Q3ListViewItem*); + void slotContextMenu(KListView *listView, Q3ListViewItem *item, const QPoint &pos); + void slotMouseButtonPressed(int button, Q3ListViewItem *item, const QPoint &pos, int column); + void slotShowProperties(Q3ListViewItem *item, const QPoint&, int); void initialize(); signals: @@ -338,7 +346,7 @@ class BNPView : public QSplitter, virtual public BasketDcopInterface private: KListView *m_tree; - QWidgetStack *m_stack; + Q3WidgetStack *m_stack; bool m_loading; bool m_newBasketPopup; bool m_firstShow; diff --git a/src/clickablelabel.cpp b/src/clickablelabel.cpp index d605cfc..8b5f8c9 100644 --- a/src/clickablelabel.cpp +++ b/src/clickablelabel.cpp @@ -19,6 +19,8 @@ ***************************************************************************/ #include "clickablelabel.h" +//Added by qt3to4: +#include void ClickableLabel::mousePressEvent(QMouseEvent *event) { diff --git a/src/clickablelabel.h b/src/clickablelabel.h index fba947d..bb8431e 100644 --- a/src/clickablelabel.h +++ b/src/clickablelabel.h @@ -22,6 +22,8 @@ #define CLICKABLELABEL_H #include +//Added by qt3to4: +#include /** This class is a QLabel that can emit a clicked() signal when clicked ! * @author S�astien Laot diff --git a/src/colorpicker.cpp b/src/colorpicker.cpp index aa95c00..d636e59 100644 --- a/src/colorpicker.cpp +++ b/src/colorpicker.cpp @@ -20,6 +20,9 @@ #include "colorpicker.h" #include "qtimer.h" +//Added by qt3to4: +#include +#include #include /// /// diff --git a/src/colorpicker.h b/src/colorpicker.h index fde6c04..62ff039 100644 --- a/src/colorpicker.h +++ b/src/colorpicker.h @@ -22,6 +22,9 @@ #define COLORPICKER_H #include +//Added by qt3to4: +#include +#include /** Class to pick a color on the screen * @author S�astien Laot diff --git a/src/crashhandler.cpp b/src/crashhandler.cpp index 39b29fe..b6498aa 100644 --- a/src/crashhandler.cpp +++ b/src/crashhandler.cpp @@ -24,7 +24,9 @@ #include #include -#include +#include +//Added by qt3to4: +#include #include //popen, fread #include @@ -49,7 +51,7 @@ #endif static QString - runCommand( const QCString &command ) + runCommand( const Q3CString &command ) { static const uint SIZE = 40960; //40 KiB static char stdoutBuf[ SIZE ]; @@ -118,7 +120,7 @@ // "bt\n" "echo \\n\n" // "thread apply all bt\n"; - const QCString gdb_batch = + const Q3CString gdb_batch = "bt\n" "echo \\n\\n\n" "bt full\n" @@ -133,11 +135,11 @@ ::dup2( fileno( stdout ), fileno( stderr ) ); - QCString gdb; + Q3CString gdb; gdb = "gdb --nw -n --batch -x "; gdb += temp.name().latin1(); gdb += " basket "; - gdb += QCString().setNum( ::getppid() ); + gdb += Q3CString().setNum( ::getppid() ); QString bt = runCommand( gdb ); diff --git a/src/debugwindow.cpp b/src/debugwindow.cpp index cfe9f9d..46f2b3b 100644 --- a/src/debugwindow.cpp +++ b/src/debugwindow.cpp @@ -19,9 +19,12 @@ ***************************************************************************/ #include -#include +#include #include #include +//Added by qt3to4: +#include +#include #include #include "global.h" @@ -33,10 +36,10 @@ DebugWindow::DebugWindow(QWidget *parent, const char *name ) Global::debugWindow = this; setCaption(i18n("Debug Window")); - layout = new QVBoxLayout(this); - textBrowser = new QTextBrowser(this); + layout = new Q3VBoxLayout(this); + textBrowser = new Q3TextBrowser(this); - textBrowser->setWordWrap(QTextBrowser::NoWrap); + textBrowser->setWordWrap(Q3TextBrowser::NoWrap); layout->addWidget(textBrowser); textBrowser->show(); diff --git a/src/debugwindow.h b/src/debugwindow.h index 479d7f9..2b405ef 100644 --- a/src/debugwindow.h +++ b/src/debugwindow.h @@ -22,9 +22,12 @@ #define DEBUGWINDOW_H #include +//Added by qt3to4: +#include +#include -class QVBoxLayout; -class QTextBrowser; +class Q3VBoxLayout; +class Q3TextBrowser; class QString; class QCloseEvent; @@ -45,8 +48,8 @@ class DebugWindow : public QWidget { protected: virtual void closeEvent(QCloseEvent *event); private: - QVBoxLayout *layout; - QTextBrowser *textBrowser; + Q3VBoxLayout *layout; + Q3TextBrowser *textBrowser; }; #define DEBUG_WIN if (Global::debugWindow) *Global::debugWindow diff --git a/src/exporterdialog.cpp b/src/exporterdialog.cpp index 2e770eb..9843836 100644 --- a/src/exporterdialog.cpp +++ b/src/exporterdialog.cpp @@ -23,10 +23,12 @@ #include #include #include -#include -#include +#include +#include #include #include +//Added by qt3to4: +#include #include #include @@ -38,10 +40,10 @@ ExporterDialog::ExporterDialog(Basket *basket, QWidget *parent, const char *name KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, /*separator=*/true), m_basket(basket) { - QVBox *page = makeVBoxMainWidget(); + Q3VBox *page = makeVBoxMainWidget(); QWidget *wid = new QWidget(page); - QHBoxLayout *hLay = new QHBoxLayout(wid, /*margin=*/0, KDialogBase::spacingHint()); + Q3HBoxLayout *hLay = new Q3HBoxLayout(wid, /*margin=*/0, KDialogBase::spacingHint()); m_url = new KURLRequester("", wid); m_url->setCaption(i18n("HTML Page Filename")); m_url->setFilter("text/html"); diff --git a/src/filter.cpp b/src/filter.cpp index fcbee91..4242640 100644 --- a/src/filter.cpp +++ b/src/filter.cpp @@ -22,6 +22,8 @@ //#include #include #include +//Added by qt3to4: +#include //#include //#include #include @@ -48,11 +50,11 @@ FilterBar::FilterBar(QWidget *parent, const char *name) : QWidget(parent, name)/*, m_blinkTimer(this), m_blinkedTimes(0)*/ { - QHBoxLayout *hBox = new QHBoxLayout(this, /*margin*/0, /*spacing*/0); + Q3HBoxLayout *hBox = new Q3HBoxLayout(this, /*margin*/0, /*spacing*/0); // Create every widgets: - QIconSet resetIconSet = kapp->iconLoader()->loadIconSet("locationbar_erase", KIcon::Toolbar); - QIconSet inAllIconSet = kapp->iconLoader()->loadIconSet("find", KIcon::Toolbar); + QIcon resetIconSet = kapp->iconLoader()->loadIconSet("locationbar_erase", KIcon::Toolbar); + QIcon inAllIconSet = kapp->iconLoader()->loadIconSet("find", KIcon::Toolbar); m_resetButton = new QToolButton(this); diff --git a/src/focusedwidgets.cpp b/src/focusedwidgets.cpp index 1c3c0ae..496c5fa 100644 --- a/src/focusedwidgets.cpp +++ b/src/focusedwidgets.cpp @@ -18,7 +18,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include +#include +//Added by qt3to4: +#include +#include #include #include @@ -181,9 +184,9 @@ void FocusedTextEdit::enterEvent(QEvent *event) KTextEdit::enterEvent(event); } -QPopupMenu* FocusedTextEdit::createPopupMenu(const QPoint &pos) +Q3PopupMenu* FocusedTextEdit::createPopupMenu(const QPoint &pos) { - QPopupMenu *menu = KTextEdit::createPopupMenu(pos); + Q3PopupMenu *menu = KTextEdit::createPopupMenu(pos); int index = 0; int id = 0; diff --git a/src/focusedwidgets.h b/src/focusedwidgets.h index 380200e..657d1d4 100644 --- a/src/focusedwidgets.h +++ b/src/focusedwidgets.h @@ -28,6 +28,11 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include +#include class FocusedTextEdit : public KTextEdit { @@ -42,7 +47,7 @@ class FocusedTextEdit : public KTextEdit void keyPressEvent(QKeyEvent *event); void wheelEvent(QWheelEvent *event); void enterEvent(QEvent *event); - QPopupMenu* createPopupMenu(const QPoint &pos); + Q3PopupMenu* createPopupMenu(const QPoint &pos); signals: void escapePressed(); void mouseEntered(); diff --git a/src/formatimporter.cpp b/src/formatimporter.cpp index f9cdc4e..4f3f6fc 100644 --- a/src/formatimporter.cpp +++ b/src/formatimporter.cpp @@ -23,6 +23,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include #include @@ -159,9 +161,9 @@ void FormatImporter::importBaskets() std::cout << "Import Baskets: Finalizing..." << std::endl; QFile file(Global::basketsFolder() + "baskets.xml"); - if (file.open(IO_WriteOnly)) { - QTextStream stream(&file); - stream.setEncoding(QTextStream::UnicodeUTF8); + if (file.open(QIODevice::WriteOnly)) { + Q3TextStream stream(&file); + stream.setEncoding(Q3TextStream::UnicodeUTF8); QString xml = document.toString(); stream << "\n"; stream << xml; @@ -234,8 +236,8 @@ QDomElement FormatImporter::importBasket(const QString &folderName) QString annotFileName = Tools::fileNameForNewFile("annotations1.txt", Basket::fullPathForFolderName(folderName)); QString annotFullPath = Basket::fullPathForFolderName(folderName) + "/" + annotFileName; QFile file(annotFullPath); - if (file.open(IO_WriteOnly)) { - QTextStream stream(&file); + if (file.open(QIODevice::WriteOnly)) { + Q3TextStream stream(&file); stream << annotations; file.close(); } @@ -263,9 +265,9 @@ QDomElement FormatImporter::importBasket(const QString &folderName) QString launcherFileName = Tools::fileNameForNewFile("launcher.desktop", Global::basketsFolder() + folderName /*+ "/"*/); QString launcherFullPath = Global::basketsFolder() + folderName /*+ "/"*/ + launcherFileName; QFile file(launcherFullPath); - if (file.open(IO_WriteOnly)) { - QTextStream stream(&file); - stream.setEncoding(QTextStream::UnicodeUTF8); + if (file.open(QIODevice::WriteOnly)) { + Q3TextStream stream(&file); + stream.setEncoding(Q3TextStream::UnicodeUTF8); stream << launcherContent; file.close(); } @@ -289,9 +291,9 @@ QDomElement FormatImporter::importBasket(const QString &folderName) // Save the resulting XML file: QFile file(Global::basketsFolder() + folderName + "/.basket"); - if (file.open(IO_WriteOnly)) { - QTextStream stream(&file); - stream.setEncoding(QTextStream::UnicodeUTF8); + if (file.open(QIODevice::WriteOnly)) { + Q3TextStream stream(&file); + stream.setEncoding(Q3TextStream::UnicodeUTF8); // QString xml = document->toString(); // stream << "\n"; // stream << xml; diff --git a/src/htmlexporter.cpp b/src/htmlexporter.cpp index 2e6b4e6..7d08d6d 100644 --- a/src/htmlexporter.cpp +++ b/src/htmlexporter.cpp @@ -36,6 +36,10 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -195,17 +199,17 @@ void HTMLExporter::exportBasket(Basket *basket, bool isSubBasket) // Open the file to write: QFile file(basketFilePath); - if (!file.open(IO_WriteOnly)) + if (!file.open(QIODevice::WriteOnly)) return; stream.setDevice(&file); - stream.setEncoding(QTextStream::UnicodeUTF8); + stream.setEncoding(Q3TextStream::UnicodeUTF8); // Compute the colors to draw dragient for notes: QColor topBgColor; QColor bottomBgColor; Note::getGradientColors(basket->backgroundColor(), &topBgColor, &bottomBgColor); // Compute the gradient image for notes: - QString gradientImageFileName = Basket::saveGradientBackground(basket->backgroundColor(), basket->QScrollView::font(), imagesFolderPath); + QString gradientImageFileName = Basket::saveGradientBackground(basket->backgroundColor(), basket->Q3ScrollView::font(), imagesFolderPath); // Output the header: QString borderColor = Tools::mixColor(basket->backgroundColor(), basket->textColor()).name(); @@ -238,7 +242,7 @@ void HTMLExporter::exportBasket(Basket *basket, bool isSubBasket) } stream << " .basket { background-color: " << basket->backgroundColor().name() << "; border: solid " << borderColor << " 1px; " - "font: " << Tools::cssFontDefinition(basket->QScrollView::font()) << "; color: " << basket->textColor().name() << "; padding: 1px; width: 100%; }\n" + "font: " << Tools::cssFontDefinition(basket->Q3ScrollView::font()) << "; color: " << basket->textColor().name() << "; padding: 1px; width: 100%; }\n" " table.basket { border-collapse: collapse; }\n" " .basket * { padding: 0; margin: 0; }\n" " .basket table { width: 100%; border-spacing: 0; _border-collapse: collapse; }\n" @@ -259,10 +263,10 @@ void HTMLExporter::exportBasket(Basket *basket, bool isSubBasket) << LinkLook::launcherLook->toCSS("launcher", basket->textColor()) << " .unknown { margin: 1px 2px; border: 1px solid " << borderColor << "; -moz-border-radius: 4px; }\n"; - QValueList states = basket->usedStates(); + Q3ValueList states = basket->usedStates(); QString statesCss; for (State::List::Iterator it = states.begin(); it != states.end(); ++it) - statesCss += (*it)->toCSS(imagesFolderPath, imagesFolderName, basket->QScrollView::font()); + statesCss += (*it)->toCSS(imagesFolderPath, imagesFolderName, basket->Q3ScrollView::font()); stream << statesCss << " .credits { text-align: right; margin: 3px 0 0 0; _margin-top: -17px; font-size: 80%; color: " << borderColor << "; }\n" @@ -323,7 +327,7 @@ void HTMLExporter::exportBasket(Basket *basket, bool isSubBasket) // Copy a transparent GIF image in the folder, needed for the JavaScript hack: QString gifFileName = "spacer.gif"; QFile transGIF(imagesFolderPath + gifFileName); - if (!transGIF.exists() && transGIF.open(IO_WriteOnly)) { + if (!transGIF.exists() && transGIF.open(QIODevice::WriteOnly)) { QDataStream streamGIF(&transGIF); // This is a 1px*1px transparent GIF image: const uchar blankGIF[] = { @@ -547,7 +551,7 @@ QString HTMLExporter::copyFile(const QString &srcPath, bool createIt) if (createIt) { // We create the file to be sure another very near call to copyFile() willn't choose the same name: QFile file(KURL(fullPath).path()); - if (file.open(IO_WriteOnly)) + if (file.open(QIODevice::WriteOnly)) file.close(); // And then we copy the file AND overwriting the file we juste created: new KIO::FileCopyJob( diff --git a/src/htmlexporter.h b/src/htmlexporter.h index 0cbb267..545e41c 100644 --- a/src/htmlexporter.h +++ b/src/htmlexporter.h @@ -22,7 +22,7 @@ #define HTMLEXPORTER_H #include -#include +#include class KProgress; @@ -70,7 +70,7 @@ class HTMLExporter QString backgroundColorName; // Variables used by every export methods: - QTextStream stream; + Q3TextStream stream; Basket *exportedBasket; bool withBasketTree; KProgress *progress; diff --git a/src/kcolorcombo2.cpp b/src/kcolorcombo2.cpp index 513dffb..2800e8b 100644 --- a/src/kcolorcombo2.cpp +++ b/src/kcolorcombo2.cpp @@ -22,7 +22,14 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include #include #include #include @@ -669,7 +676,7 @@ void KColorCombo2::popup() // The combo box is now shown pressed. Make it show not pressed again // by causing its (invisible) list box to emit a 'selected' signal. // Simulate an Enter to unpress it: - QListBox *lb = listBox(); + Q3ListBox *lb = listBox(); if (lb) { lb->setCurrentItem(0); QKeyEvent* keyEvent = new QKeyEvent(QEvent::KeyPress, Qt::Key_Enter, 0, 0); diff --git a/src/kcolorcombo2.h b/src/kcolorcombo2.h index 099c8a5..93a973a 100644 --- a/src/kcolorcombo2.h +++ b/src/kcolorcombo2.h @@ -24,6 +24,13 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include class KColorPopup; diff --git a/src/kgpgme.cpp b/src/kgpgme.cpp index 78d372e..85c83ac 100644 --- a/src/kgpgme.cpp +++ b/src/kgpgme.cpp @@ -31,6 +31,10 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include #include @@ -50,7 +54,7 @@ class KGpgSelKey : public KDialogBase const KGpgMe& gpg): KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel) { QString keyname; - QVBoxLayout* vbox; + Q3VBoxLayout* vbox; QWidget* page = new QWidget(this); QLabel* labeltxt; KIconLoader* loader = KGlobal::iconLoader(); @@ -67,7 +71,7 @@ class KGpgSelKey : public KDialogBase keysListpr->setAllColumnsShowFocus(true); labeltxt = new QLabel(i18n("Choose a secret key:"),page); - vbox = new QVBoxLayout(page); + vbox = new Q3VBoxLayout(page); KGpgKeyList list = gpg.keys(true); @@ -91,7 +95,7 @@ class KGpgSelKey : public KDialogBase }; QString key() { - QListViewItem* item = keysListpr->selectedItem(); + Q3ListViewItem* item = keysListpr->selectedItem(); if(item) return item->text(2); @@ -420,7 +424,7 @@ gpgme_error_t KGpgMe::passphrase(const char* uid_hint, s += gpg_hint; if(m_cache.isEmpty()){ - QCString password; + Q3CString password; if(m_saving) result = KPasswordDialog::getNewPassword(password, s); diff --git a/src/kgpgme.h b/src/kgpgme.h index 0158b9b..6dcbab5 100644 --- a/src/kgpgme.h +++ b/src/kgpgme.h @@ -21,6 +21,9 @@ #define KGPGME_H #include +//Added by qt3to4: +#include +#include #ifdef HAVE_LIBGPGME @@ -39,7 +42,7 @@ class KGpgKey QString email; }; -typedef QValueList< KGpgKey > KGpgKeyList; +typedef Q3ValueList< KGpgKey > KGpgKeyList; class KGpgMe { @@ -67,7 +70,7 @@ class KGpgMe QString m_text; bool m_saving; bool m_useGnuPGAgent; - QCString m_cache; + Q3CString m_cache; void init(gpgme_protocol_t proto); gpgme_error_t readToBuffer(gpgme_data_t in, QByteArray* outBuffer) const; diff --git a/src/kiconcanvas.cpp b/src/kiconcanvas.cpp index 13ec6ce..25ec51e 100644 --- a/src/kiconcanvas.cpp +++ b/src/kiconcanvas.cpp @@ -30,12 +30,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include @@ -45,11 +45,11 @@ #include #endif -class KIconCanvasItem : public QIconViewItem +class KIconCanvasItem : public Q3IconViewItem { public: - KIconCanvasItem ( QIconView * parent, const QString & key, const QPixmap & pixmap ) - : QIconViewItem(parent) + KIconCanvasItem ( Q3IconView * parent, const QString & key, const QPixmap & pixmap ) + : Q3IconViewItem(parent) { setText(QFileInfo(key).baseName()); setKey(key); @@ -59,7 +59,7 @@ class KIconCanvasItem : public QIconViewItem } - int compare(QIconViewItem *rhs) const + int compare(Q3IconViewItem *rhs) const { return QString::localeAwareCompare(text().lower(), rhs->text().lower()); } @@ -96,8 +96,8 @@ KIconCanvas::KIconCanvas(QWidget *parent, const char *name) mpLoader = KGlobal::iconLoader(); mpTimer = new QTimer(this); connect(mpTimer, SIGNAL(timeout()), SLOT(slotLoadFiles())); - connect(this, SIGNAL(currentChanged(QIconViewItem *)), - SLOT(slotCurrentChanged(QIconViewItem *))); + connect(this, SIGNAL(currentChanged(Q3IconViewItem *)), + SLOT(slotCurrentChanged(Q3IconViewItem *))); setAcceptDrops(false); setShowToolTips(true); setStrictIconSize(false); @@ -210,7 +210,7 @@ void KIconCanvas::stopLoading() d->m_bLoading = false; } -void KIconCanvas::slotCurrentChanged(QIconViewItem *item) +void KIconCanvas::slotCurrentChanged(Q3IconViewItem *item) { emit nameChanged((item != 0L) ? item->text() : QString::null); } @@ -227,7 +227,7 @@ void KIconCanvas::setStrictIconSize( bool strictIconSize ) d->mStrictIconSize = strictIconSize; } -QDragObject *KIconCanvas::dragObject() +Q3DragObject *KIconCanvas::dragObject() { // We use QImageDrag rather than KURLDrag so that the user can't drag an icon out of the theme! // TODO: support SVG? @@ -236,7 +236,7 @@ QDragObject *KIconCanvas::dragObject() QPoint hot; hot.setX(pos.x() - currentItem()->pos().x() - (currentItem()->width() - pixmap->width()) / 2); hot.setY(pos.y() - currentItem()->pos().y() - (currentItem()->height() - pixmap->height()) / 2); - QImageDrag *drag = new QImageDrag( pixmap->convertToImage(), this ); + Q3ImageDrag *drag = new Q3ImageDrag( pixmap->convertToImage(), this ); drag->setPixmap(*pixmap, hot); return drag; } diff --git a/src/kiconcanvas.h b/src/kiconcanvas.h index fe8f58a..9efb635 100644 --- a/src/kiconcanvas.h +++ b/src/kiconcanvas.h @@ -22,7 +22,7 @@ class QTimer; class KIconLoader; -class QDragObject; +class Q3DragObject; class QIconLoader; /** @@ -69,7 +69,7 @@ signals: private slots: void slotLoadFiles(); - void slotCurrentChanged(QIconViewItem *item); + void slotCurrentChanged(Q3IconViewItem *item); private: QStringList mFiles; @@ -78,7 +78,7 @@ private: protected: virtual void virtual_hook( int id, void* data ); - virtual QDragObject *dragObject(); + virtual Q3DragObject *dragObject(); void loadIcon(const QString &path); private: diff --git a/src/kicondialog.cpp b/src/kicondialog.cpp index e5bf262..5c372b7 100644 --- a/src/kicondialog.cpp +++ b/src/kicondialog.cpp @@ -36,19 +36,19 @@ #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include -#include +#include #include -#include +#include /* NOTE: Must be in the same order as listbox */ enum ExtendedContext @@ -122,8 +122,8 @@ void KIconDialog::init() connect(d->ui->browseButton, SIGNAL(clicked()), SLOT(slotBrowse())); connect(d->ui->listBox, SIGNAL(highlighted(int)), SLOT(slotContext(int))); - connect(d->ui->iconCanvas, SIGNAL(executed(QIconViewItem *)), SLOT(slotOk())); - connect(d->ui->iconCanvas, SIGNAL(returnPressed(QIconViewItem *)), SLOT(slotOk())); + connect(d->ui->iconCanvas, SIGNAL(executed(Q3IconViewItem *)), SLOT(slotOk())); + connect(d->ui->iconCanvas, SIGNAL(returnPressed(Q3IconViewItem *)), SLOT(slotOk())); connect(d->ui->iconCanvas, SIGNAL(startLoading(int)), SLOT(slotStartLoading(int))); connect(d->ui->iconCanvas, SIGNAL(progress(int)), SLOT(slotProgress(int))); connect(d->ui->iconCanvas, SIGNAL(finished()), SLOT(slotFinished())); @@ -523,7 +523,7 @@ void KIconButton::setCustomLocation(const QString &custom) void KIconButton::resetIcon() { mIcon = QString::null; - setIconSet(QIconSet()); + setIconSet(QIcon()); } void KIconButton::slotChangeIcon() @@ -543,7 +543,7 @@ void KIconButton::newIconName(const QString& name) if (name.isEmpty()) return; - QIconSet iconset = mpLoader->loadIconSet(name, mGroup, d->iconSize); + QIcon iconset = mpLoader->loadIconSet(name, mGroup, d->iconSize); setIconSet(iconset); mIcon = name; diff --git a/src/kicondialog.h b/src/kicondialog.h index e61df2b..7000269 100644 --- a/src/kicondialog.h +++ b/src/kicondialog.h @@ -19,6 +19,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include diff --git a/src/likeback.cpp b/src/likeback.cpp index 5beafc8..8281f2b 100644 --- a/src/likeback.cpp +++ b/src/likeback.cpp @@ -29,18 +29,23 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include #include @@ -62,12 +67,12 @@ LikeBackBar::LikeBackBar(LikeBack *likeBack) : QWidget(0, "LikeBackBar", Qt::WX11BypassWM | Qt::WStyle_NoBorder | Qt::WNoAutoErase | Qt::WStyle_StaysOnTop | Qt::WStyle_NoBorder | Qt::Qt::WGroupLeader) , m_likeBack(likeBack) { - QHBoxLayout *layout = new QHBoxLayout(this); + Q3HBoxLayout *layout = new Q3HBoxLayout(this); - QIconSet likeIconSet = kapp->iconLoader()->loadIconSet("likeback_like", KIcon::Small); - QIconSet dislikeIconSet = kapp->iconLoader()->loadIconSet("likeback_dislike", KIcon::Small); - QIconSet bugIconSet = kapp->iconLoader()->loadIconSet("likeback_bug", KIcon::Small); - QIconSet featureIconSet = kapp->iconLoader()->loadIconSet("likeback_feature", KIcon::Small); + QIcon likeIconSet = kapp->iconLoader()->loadIconSet("likeback_like", KIcon::Small); + QIcon dislikeIconSet = kapp->iconLoader()->loadIconSet("likeback_dislike", KIcon::Small); + QIcon bugIconSet = kapp->iconLoader()->loadIconSet("likeback_bug", KIcon::Small); + QIcon featureIconSet = kapp->iconLoader()->loadIconSet("likeback_feature", KIcon::Small); m_likeButton = new QToolButton(this, "likeback_like"); m_likeButton->setIconSet(likeIconSet); @@ -415,10 +420,10 @@ void LikeBack::showInformationMessage() QPixmap dislikeIcon = kapp->iconLoader()->loadIcon("likeback_dislike", KIcon::Small); QPixmap bugIcon = kapp->iconLoader()->loadIcon("likeback_bug", KIcon::Small); QPixmap featureIcon = kapp->iconLoader()->loadIcon("likeback_feature", KIcon::Small); - QMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_like", likeIcon); - QMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_dislike", dislikeIcon); - QMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_bug", bugIcon); - QMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_feature", featureIcon); + Q3MimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_like", likeIcon); + Q3MimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_dislike", dislikeIcon); + Q3MimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_bug", bugIcon); + Q3MimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_feature", featureIcon); // Show a message reflecting the allowed types of comment: Button buttons = d->buttons; @@ -480,10 +485,10 @@ void LikeBack::showInformationMessage() i18n("Help Improve the Application")); // Reset the images from the factory: - QMimeSourceFactory::defaultFactory()->setData("likeback_icon_like", 0L); - QMimeSourceFactory::defaultFactory()->setData("likeback_icon_dislike", 0L); - QMimeSourceFactory::defaultFactory()->setData("likeback_icon_bug", 0L); - QMimeSourceFactory::defaultFactory()->setData("likeback_icon_feature", 0L); + Q3MimeSourceFactory::defaultFactory()->setData("likeback_icon_like", 0L); + Q3MimeSourceFactory::defaultFactory()->setData("likeback_icon_dislike", 0L); + Q3MimeSourceFactory::defaultFactory()->setData("likeback_icon_bug", 0L); + Q3MimeSourceFactory::defaultFactory()->setData("likeback_icon_feature", 0L); } QString LikeBack::activeWindowPath() @@ -652,20 +657,20 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const QString &initialCo m_windowPath = LikeBack::activeWindowPath(); QWidget *page = new QWidget(this); - QVBoxLayout *pageLayout = new QVBoxLayout(page, /*margin=*/0, spacingHint()); + Q3VBoxLayout *pageLayout = new Q3VBoxLayout(page, /*margin=*/0, spacingHint()); // The introduction message: QLabel *introduction = new QLabel(introductionText(), page); pageLayout->addWidget(introduction); // The comment group: - m_group = new QButtonGroup(0);//i18n("Send Application Developers a Comment About:"), page); - QVGroupBox *box = new QVGroupBox(i18n("Send Application Developers a Comment About:"), page); + m_group = new Q3ButtonGroup(0);//i18n("Send Application Developers a Comment About:"), page); + Q3VGroupBox *box = new Q3VGroupBox(i18n("Send Application Developers a Comment About:"), page); pageLayout->addWidget(box); // The radio buttons: QWidget *buttons = new QWidget(box); - QGridLayout *buttonsGrid = new QGridLayout(buttons, /*nbRows=*/4, /*nbColumns=*/2, /*margin=*/0, spacingHint()); + Q3GridLayout *buttonsGrid = new Q3GridLayout(buttons, /*nbRows=*/4, /*nbColumns=*/2, /*margin=*/0, spacingHint()); if (m_likeBack->buttons() & LikeBack::Like) { QPixmap likePixmap = kapp->iconLoader()->loadIcon("likeback_like", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true); QLabel *likeIcon = new QLabel(buttons); @@ -709,9 +714,9 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const QString &initialCo m_group->setButton(reason); // The comment text box: - m_comment = new QTextEdit(box); + m_comment = new Q3TextEdit(box); m_comment->setTabChangesFocus(true); - m_comment->setTextFormat(QTextEdit::PlainText); + m_comment->setTextFormat(Q3TextEdit::PlainText); m_comment->setText(initialComment); m_showButtons = new QCheckBox(i18n("Show comment buttons below &window titlebars"), page); @@ -815,13 +820,13 @@ void LikeBackDialog::send() "context=" + KURL::encode_string(m_context) + '&' + "comment=" + KURL::encode_string(m_comment->text()) + '&' + "email=" + KURL::encode_string(emailAddress); - QHttp *http = new QHttp(m_likeBack->hostName(), m_likeBack->hostPort()); + Q3Http *http = new Q3Http(m_likeBack->hostName(), m_likeBack->hostPort()); std::cout << "http://" << m_likeBack->hostName() << ":" << m_likeBack->hostPort() << m_likeBack->remotePath() << std::endl; std::cout << data << std::endl; connect( http, SIGNAL(requestFinished(int, bool)), this, SLOT(requestFinished(int, bool)) ); - QHttpRequestHeader header("POST", m_likeBack->remotePath()); + Q3HttpRequestHeader header("POST", m_likeBack->remotePath()); header.setValue("Host", m_likeBack->hostName()); header.setValue("Content-Type", "application/x-www-form-urlencoded"); http->setHost(m_likeBack->hostName()); diff --git a/src/likeback_private.h b/src/likeback_private.h index 37ed60f..ed2e0e5 100644 --- a/src/likeback_private.h +++ b/src/likeback_private.h @@ -27,9 +27,9 @@ #include "likeback.h" class QToolButton; -class QTextEdit; +class Q3TextEdit; class QCheckBox; -class QButtonGroup; +class Q3ButtonGroup; class Kaction; class LikeBackPrivate @@ -88,8 +88,8 @@ class LikeBackDialog : public KDialogBase LikeBack *m_likeBack; QString m_windowPath; QString m_context; - QButtonGroup *m_group; - QTextEdit *m_comment; + Q3ButtonGroup *m_group; + Q3TextEdit *m_comment; QCheckBox *m_showButtons; QString introductionText(); private slots: diff --git a/src/linklabel.cpp b/src/linklabel.cpp index 49631ff..cfc5320 100644 --- a/src/linklabel.cpp +++ b/src/linklabel.cpp @@ -19,6 +19,14 @@ ***************************************************************************/ #include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -27,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -166,14 +174,14 @@ QString LinkLook::toCSS(const QString &cssClass, const QColor &defaultTextColor) /** LinkLabel */ LinkLabel::LinkLabel(int hAlign, int vAlign, QWidget *parent, const char *name, WFlags f) - : QFrame(parent, name, f), m_isSelected(false), m_isHovered(false), m_look(0) + : Q3Frame(parent, name, f), m_isSelected(false), m_isHovered(false), m_look(0) { initLabel(hAlign, vAlign); } LinkLabel::LinkLabel(const QString &title, const QString &icon, LinkLook *look, int hAlign, int vAlign, QWidget *parent, const char *name, WFlags f) - : QFrame(parent, name, f), m_isSelected(false), m_isHovered(false), m_look(0) + : Q3Frame(parent, name, f), m_isSelected(false), m_isHovered(false), m_look(0) { initLabel(hAlign, vAlign); setLink(title, icon, look); @@ -181,7 +189,7 @@ LinkLabel::LinkLabel(const QString &title, const QString &icon, LinkLook *look, void LinkLabel::initLabel(int hAlign, int vAlign) { - m_layout = new QBoxLayout(this, QBoxLayout::LeftToRight); + m_layout = new Q3BoxLayout(this, Q3BoxLayout::LeftToRight); m_icon = new QLabel(this); m_title = new QLabel(this); m_spacer1 = new QSpacerItem(0, 0, QSizePolicy::Preferred/*Expanding*/, QSizePolicy::Preferred/*Expanding*/); @@ -274,7 +282,7 @@ void LinkLabel::setAlign(int hAlign, int vAlign) // And re-populate the widget with the appropriates things and order bool addSpacers = hAlign == 1; - m_layout->setDirection(QBoxLayout::LeftToRight); + m_layout->setDirection(Q3BoxLayout::LeftToRight); //m_title->setSizePolicy( QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Maximum/*Expanding*/, 0, 0, false) ); m_icon->setSizePolicy( QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred/*Expanding*/, 0, 0, false) ); m_spacer1->changeSize( 0, 0, QSizePolicy::Expanding, QSizePolicy::Preferred/*Expanding*/ ); @@ -332,7 +340,7 @@ void LinkLabel::setSelected(bool selected) void LinkLabel::setPaletteBackgroundColor(const QColor &color) { - QFrame::setPaletteBackgroundColor(color); + Q3Frame::setPaletteBackgroundColor(color); m_title->setPaletteBackgroundColor(color); } @@ -364,9 +372,9 @@ QString LinkLabel::toHtml(const QString &imageName) if (m_icon->pixmap()) { QPixmap icon(*m_icon->pixmap()); begin.prepend(" "); - QMimeSourceFactory::defaultFactory()->setPixmap(imageName, icon); + Q3MimeSourceFactory::defaultFactory()->setPixmap(imageName, icon); } else - QMimeSourceFactory::defaultFactory()->setData(imageName, 0L); + Q3MimeSourceFactory::defaultFactory()->setData(imageName, 0L); return begin + Tools::textToHTMLWithoutP(m_title->text()) + end; } @@ -559,7 +567,7 @@ LinkLookEditWidget::LinkLookEditWidget(KCModule *module, const QString exTitle, : QWidget(parent, name, fl) { QLabel *label; - QVBoxLayout *layout = new QVBoxLayout(this, KDialogBase::marginHint(), KDialogBase::spacingHint()); + Q3VBoxLayout *layout = new Q3VBoxLayout(this, KDialogBase::marginHint(), KDialogBase::spacingHint()); m_italic = new QCheckBox(i18n("I&talic"), this); layout->addWidget(m_italic); @@ -567,7 +575,7 @@ LinkLookEditWidget::LinkLookEditWidget(KCModule *module, const QString exTitle, m_bold = new QCheckBox(i18n("&Bold"), this); layout->addWidget(m_bold); - QGridLayout *gl = new QGridLayout(layout, /*rows=*//*(look->canPreview() ? 5 : 4)*/5, /*columns=*//*3*/4); + Q3GridLayout *gl = new Q3GridLayout(layout, /*rows=*//*(look->canPreview() ? 5 : 4)*/5, /*columns=*//*3*/4); gl->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding), 1, /*2*/3); m_underlining = new QComboBox(false, this); @@ -589,7 +597,7 @@ LinkLookEditWidget::LinkLookEditWidget(KCModule *module, const QString exTitle, gl->addWidget(label, 2, 0); gl->addWidget(m_hoverColor, 2, 1); - QHBoxLayout *icoLay = new QHBoxLayout(/*parent=*/0L, /*margin=*/0, KDialogBase::spacingHint()); + Q3HBoxLayout *icoLay = new Q3HBoxLayout(/*parent=*/0L, /*margin=*/0, KDialogBase::spacingHint()); m_iconSize = new IconSizeCombo(false, this); icoLay->addWidget(m_iconSize); label = new QLabel(m_iconSize, i18n("&Icon size:"), this); @@ -620,7 +628,7 @@ LinkLookEditWidget::LinkLookEditWidget(KCModule *module, const QString exTitle, gl->addWidget(m_preview, 4, 1); gl->addMultiCellWidget(m_hLabel, /*fromRow=*/5, /*toRow=*/5, /*fromCol=*/1, /*toCol*/2); - QGroupBox *gb = new QHGroupBox(i18n("Example"), this); + Q3GroupBox *gb = new Q3HGroupBox(i18n("Example"), this); m_exLook = new LinkLook; m_example = new LinkLabel(exTitle, exIcon, m_exLook, 1, 1, gb); m_example->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); diff --git a/src/linklabel.h b/src/linklabel.h index 9f73cd2..8084534 100644 --- a/src/linklabel.h +++ b/src/linklabel.h @@ -21,13 +21,18 @@ #ifndef LINKLABEL_H #define LINKLABEL_H -#include +#include +//Added by qt3to4: +#include +#include +#include +#include class QString; class KURL; class QColor; class QLabel; -class QBoxLayout; +class Q3BoxLayout; class QSpacerItem; class QPushButton; class QCheckBox; @@ -97,7 +102,7 @@ class LinkLook * Note : This label will appear blank while LinkLook willn't be set * @author S�astien Laot */ -class LinkLabel : public QFrame +class LinkLabel : public Q3Frame { Q_OBJECT public: @@ -118,7 +123,7 @@ class LinkLabel : public QFrame void enterEvent(QEvent*); void leaveEvent(QEvent*); private: - QBoxLayout *m_layout; + Q3BoxLayout *m_layout; QLabel *m_icon; QLabel *m_title; QSpacerItem *m_spacer1; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 918a5e5..2284bef 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -22,10 +22,13 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include +//Added by qt3to4: +#include +#include #include #include @@ -35,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/mainwindow.h b/src/mainwindow.h index cee5f8f..c3b77c7 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -25,8 +25,13 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include -#include +#include #include #include #include @@ -39,7 +44,7 @@ class QWidget; class QPoint; class KAction; class KToggleAction; -class QPopupMenu; +class Q3PopupMenu; class QSignalMapper; class QStringList; class QToolTipGroup; @@ -94,10 +99,10 @@ class MainWindow : public KMainWindow KToggleAction *m_actShowStatusbar; KAction *actQuit; KAction *actAppConfig; - QPtrList actBasketsList; + Q3PtrList actBasketsList; private: - QVBoxLayout *m_layout; + Q3VBoxLayout *m_layout; BNPView *m_baskets; bool m_startDocked; KSettings::Dialog *m_settings; diff --git a/src/newbasketdialog.cpp b/src/newbasketdialog.cpp index 7969389..ee5e46b 100644 --- a/src/newbasketdialog.cpp +++ b/src/newbasketdialog.cpp @@ -19,6 +19,10 @@ ***************************************************************************/ #include +//Added by qt3to4: +#include +#include +#include #include #include #include @@ -49,16 +53,16 @@ SingleSelectionKIconView::SingleSelectionKIconView(QWidget *parent, const char *name, WFlags f) : KIconView(parent, name, f), m_lastSelected(0) { - connect( this, SIGNAL(selectionChanged(QIconViewItem*)), this, SLOT(slotSelectionChanged(QIconViewItem*)) ); + connect( this, SIGNAL(selectionChanged(Q3IconViewItem*)), this, SLOT(slotSelectionChanged(Q3IconViewItem*)) ); connect( this, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged()) ); } -QDragObject* SingleSelectionKIconView::dragObject() +Q3DragObject* SingleSelectionKIconView::dragObject() { return 0; } -void SingleSelectionKIconView::slotSelectionChanged(QIconViewItem *item) +void SingleSelectionKIconView::slotSelectionChanged(Q3IconViewItem *item) { if (item) m_lastSelected = item; @@ -90,10 +94,10 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro , m_defaultProperties(defaultProperties) { QWidget *page = new QWidget(this); - QVBoxLayout *topLayout = new QVBoxLayout(page, /*margin=*/0, spacingHint()); + Q3VBoxLayout *topLayout = new Q3VBoxLayout(page, /*margin=*/0, spacingHint()); // Icon, Name and Background Color: - QHBoxLayout *nameLayout = new QHBoxLayout(0, marginHint()*2/3, spacingHint()); + Q3HBoxLayout *nameLayout = new Q3HBoxLayout(0, marginHint()*2/3, spacingHint()); m_icon = new KIconButton(page); m_icon->setIconType(KIcon::NoGroup, KIcon::Action); m_icon->setIconSize(16); @@ -116,7 +120,7 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro nameLayout->addWidget(m_backgroundColor); topLayout->addLayout(nameLayout); - QHBoxLayout *layout = new QHBoxLayout(/*parent=*/0, /*margin=*/0, spacingHint()); + Q3HBoxLayout *layout = new Q3HBoxLayout(/*parent=*/0, /*margin=*/0, spacingHint()); KPushButton *button = new KPushButton( KGuiItem(i18n("&Manage Templates..."), "configure"), page ); connect( button, SIGNAL(clicked()), this, SLOT(manageTemplates()) ); button->hide(); @@ -209,7 +213,7 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro topLayout->addLayout(layout); topLayout->addWidget(m_templates); - layout = new QHBoxLayout(/*parent=*/0, /*margin=*/0, spacingHint()); + layout = new Q3HBoxLayout(/*parent=*/0, /*margin=*/0, spacingHint()); m_createIn = new QComboBox(page); m_createIn->insertItem(i18n("(Baskets)")); label = new QLabel(m_createIn, i18n("C&reate in:"), page); @@ -229,8 +233,8 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro m_basketsMap.insert(/*index=*/0, /*basket=*/0L); populateBasketsList(Global::bnpView->firstListViewItem(), /*indent=*/1, /*index=*/1); - connect( m_templates, SIGNAL(doubleClicked(QIconViewItem*)), this, SLOT(slotOk()) ); - connect( m_templates, SIGNAL(returnPressed(QIconViewItem*)), this, SLOT(returnPressed()) ); + connect( m_templates, SIGNAL(doubleClicked(Q3IconViewItem*)), this, SLOT(slotOk()) ); + connect( m_templates, SIGNAL(returnPressed(Q3IconViewItem*)), this, SLOT(returnPressed()) ); if (parentBasket) { int index = 0; @@ -255,7 +259,7 @@ void NewBasketDialog::returnPressed() actionButton(KDialogBase::Ok)->animateClick(); } -int NewBasketDialog::populateBasketsList(QListViewItem *item, int indent, int index) +int NewBasketDialog::populateBasketsList(Q3ListViewItem *item, int indent, int index) { static const int ICON_SIZE = 16; @@ -297,7 +301,7 @@ void NewBasketDialog::nameChanged(const QString &newName) void NewBasketDialog::slotOk() { - QIconViewItem *item = ((SingleSelectionKIconView*)m_templates)->selectedItem(); + Q3IconViewItem *item = ((SingleSelectionKIconView*)m_templates)->selectedItem(); QString templateName; if (item->text() == i18n("One column")) templateName = "1column"; diff --git a/src/newbasketdialog.h b/src/newbasketdialog.h index be7319a..b1a893d 100644 --- a/src/newbasketdialog.h +++ b/src/newbasketdialog.h @@ -27,8 +27,8 @@ class KIconButton; class QLineEdit; -class QDragObject; -class QListViewItem; +class Q3DragObject; +class Q3ListViewItem; class Basket; @@ -43,13 +43,13 @@ class SingleSelectionKIconView : public KIconView Q_OBJECT public: SingleSelectionKIconView(QWidget *parent = 0, const char *name = 0, WFlags f = 0); - QDragObject* dragObject(); - QIconViewItem* selectedItem() { return m_lastSelected; } + Q3DragObject* dragObject(); + Q3IconViewItem* selectedItem() { return m_lastSelected; } private slots: - void slotSelectionChanged(QIconViewItem *item); + void slotSelectionChanged(Q3IconViewItem *item); void slotSelectionChanged(); private: - QIconViewItem *m_lastSelected; + Q3IconViewItem *m_lastSelected; }; /** Struct to store default properties of a new basket. @@ -87,7 +87,7 @@ class NewBasketDialog : public KDialogBase void manageTemplates(); void nameChanged(const QString &newName); private: - int populateBasketsList(QListViewItem *item, int indent, int index); + int populateBasketsList(Q3ListViewItem *item, int indent, int index); NewBasketDefaultProperties m_defaultProperties; KIconButton *m_icon; QLineEdit *m_name; diff --git a/src/note.cpp b/src/note.cpp index d5a2bb6..3868774 100644 --- a/src/note.cpp +++ b/src/note.cpp @@ -19,6 +19,9 @@ ***************************************************************************/ #include +//Added by qt3to4: +#include +#include #include #include #include @@ -284,7 +287,7 @@ void Note::selectIn(const QRect &rect, bool invertSelection, bool unselectOthers // Only intersects with visible areas. // If the note is not visible, the user don't think it will be selected while selecting the note(s) that hide this, so act like the user think: bool intersects = false; - for (QValueList::iterator it = m_areas.begin(); it != m_areas.end(); ++it) { + for (Q3ValueList::iterator it = m_areas.begin(); it != m_areas.end(); ++it) { QRect &r = *it; if (r.intersects(rect)) { intersects = true; @@ -1029,7 +1032,7 @@ Note* Note::noteAt(int x, int y) if ((x >= right) && (x < right + RESIZER_WIDTH) && (y >= m_y) && (y < m_y + resizerHeight())) { if ( ! m_computedAreas ) recomputeAreas(); - for (QValueList::iterator it = m_areas.begin(); it != m_areas.end(); ++it) { + for (Q3ValueList::iterator it = m_areas.begin(); it != m_areas.end(); ++it) { QRect &rect = *it; if (rect.contains(x, y)) return this; @@ -1041,7 +1044,7 @@ Note* Note::noteAt(int x, int y) if ((x >= m_x) && (x < m_x + width()) && (y >= m_y) && (y < m_y + m_height)) { if ( ! m_computedAreas ) recomputeAreas(); - for (QValueList::iterator it = m_areas.begin(); it != m_areas.end(); ++it) { + for (Q3ValueList::iterator it = m_areas.begin(); it != m_areas.end(); ++it) { QRect &rect = *it; if (rect.contains(x, y)) return this; @@ -1063,7 +1066,7 @@ Note* Note::noteAt(int x, int y) } else if (matching() && y >= m_y && y < m_y + m_height && x >= m_x && x < m_x + m_width) { if ( ! m_computedAreas ) recomputeAreas(); - for (QValueList::iterator it = m_areas.begin(); it != m_areas.end(); ++it) { + for (Q3ValueList::iterator it = m_areas.begin(); it != m_areas.end(); ++it) { QRect &rect = *it; if (rect.contains(x, y)) return this; @@ -1640,9 +1643,9 @@ void Note::setOnTop(bool onTop) } } -void substractRectOnAreas(const QRect &rectToSubstract, QValueList &areas, bool andRemove) +void substractRectOnAreas(const QRect &rectToSubstract, Q3ValueList &areas, bool andRemove) { - for (QValueList::iterator it = areas.begin(); it != areas.end(); ) { + for (Q3ValueList::iterator it = areas.begin(); it != areas.end(); ) { QRect &rect = *it; // Split the rectangle if it intersects with rectToSubstract: if (rect.intersects(rectToSubstract)) { @@ -1823,7 +1826,7 @@ void Note::draw(QPainter *painter, const QRect &clipRect) recomputeAreas(); if (m_areas.isEmpty()) return; - for (QValueList::iterator it = m_areas.begin(); it != m_areas.end(); ++it) { + for (Q3ValueList::iterator it = m_areas.begin(); it != m_areas.end(); ++it) { QRect &rect = *it; painter->drawPixmap(rect.x(), rect.y(), pixmap, rect.x() - right, rect.y() - y(), rect.width(), rect.height()); } @@ -2018,7 +2021,7 @@ void Note::draw(QPainter *painter, const QRect &clipRect) void Note::drawBufferOnScreen(QPainter *painter, const QPixmap &contentPixmap) { - for (QValueList::iterator it = m_areas.begin(); it != m_areas.end(); ++it) { + for (Q3ValueList::iterator it = m_areas.begin(); it != m_areas.end(); ++it) { QRect &rect = *it; if (rect.x() >= x() + width()) // It's a rect of the resizer, don't draw it! continue; @@ -2121,7 +2124,7 @@ void Note::addState(State *state, bool orReplace) QFont Note::font() { - return m_computedState.font( basket()->QScrollView::font() ); + return m_computedState.font( basket()->Q3ScrollView::font() ); } QColor Note::backgroundColor() @@ -2159,12 +2162,12 @@ void Note::recomputeAllStyles() child->recomputeAllStyles(); } -bool Note::removedStates(const QValueList &deletedStates) +bool Note::removedStates(const Q3ValueList &deletedStates) { bool modifiedBasket = false; if (!states().isEmpty()) { - for (QValueList::const_iterator it = deletedStates.begin(); it != deletedStates.end(); ++it) + for (Q3ValueList::const_iterator it = deletedStates.begin(); it != deletedStates.end(); ++it) if (hasState(*it)) { removeState(*it); modifiedBasket = true; @@ -2382,7 +2385,7 @@ void Note::bufferizeSelectionPixmap() QRect Note::visibleRect() { - QValueList areas; + Q3ValueList areas; areas.append(rect()); // When we are folding a parent group, if this note is bigger than the first real note of the group, cut the top of this: @@ -2399,7 +2402,7 @@ QRect Note::visibleRect() return QRect(); } -void Note::recomputeBlankRects(QValueList &blankAreas) +void Note::recomputeBlankRects(Q3ValueList &blankAreas) { if (!matching()) return; @@ -2450,7 +2453,7 @@ Note* Note::noteForFullPath(const QString &path) return 0; } -void Note::listUsedTags(QValueList &list) +void Note::listUsedTags(Q3ValueList &list) { for (State::List::Iterator it = m_states.begin(); it != m_states.end(); ++it) { Tag *tag = (*it)->parentTag(); @@ -2463,7 +2466,7 @@ void Note::listUsedTags(QValueList &list) } -void Note::usedStates(QValueList &states) +void Note::usedStates(Q3ValueList &states) { if (content()) for (State::List::Iterator it = m_states.begin(); it != m_states.end(); ++it) @@ -2826,7 +2829,7 @@ QString Note::toHtml(const QString &imageName) { if ( (m_type == Image && pixmap() == 0L) || (m_type == Animation && movie() == 0L) ) { - QMimeSourceFactory::defaultFactory()->setData(imageName, 0L); + Q3MimeSourceFactory::defaultFactory()->setData(imageName, 0L); return i18n("(Image)"); // Image or animation not yet loaded!! } @@ -2837,7 +2840,7 @@ QString Note::toHtml(const QString &imageName) image = movie()->framePixmap().convertToImage(); image = image.smoothScale(200, 150, QImage::ScaleMin); QPixmap pixmap = QPixmap(image); - QMimeSourceFactory::defaultFactory()->setPixmap(imageName, pixmap); + Q3MimeSourceFactory::defaultFactory()->setPixmap(imageName, pixmap); return ""; /// /* // FIXME: movie isn't loaded yet: CRASH! diff --git a/src/note.h b/src/note.h index 16dad1a..25aad3c 100644 --- a/src/note.h +++ b/src/note.h @@ -23,6 +23,8 @@ #include #include +//Added by qt3to4: +#include #include #include @@ -36,7 +38,7 @@ class HtmlExportData; class NoteSelection; class QPainter; -class QSimpleRichText; +class Q3SimpleRichText; /** Handle basket notes and groups!\n * After creation, the note is a group. You should create a NoteContent with this Note @@ -174,12 +176,12 @@ class Note void bufferizeSelectionPixmap(); inline void unbufferize() { m_bufferedPixmap.resize(0, 0); m_bufferedSelectionPixmap.resize(0, 0); } inline bool isBufferized() { return !m_bufferedPixmap.isNull(); } - void recomputeBlankRects(QValueList &blankAreas); + void recomputeBlankRects(Q3ValueList &blankAreas); static void drawInactiveResizer(QPainter *painter, int x, int y, int height, const QColor &background, bool column); /// VISIBLE AREAS COMPUTATION: private: - QValueList m_areas; + Q3ValueList m_areas; bool m_computedAreas; bool m_onTop; void recomputeAreas(); @@ -280,7 +282,7 @@ class Note bool stateForTagFromSelectedNotes(Tag *tag, State **state); void recomputeStyle(); void recomputeAllStyles(); - bool removedStates(const QValueList &deletedStates); + bool removedStates(const Q3ValueList &deletedStates); QFont font(); // Computed! QColor backgroundColor(); // Computed! QColor textColor(); // Computed! @@ -305,9 +307,9 @@ class Note void update(); void linkLookChanged(); - void usedStates(QValueList &states); + void usedStates(Q3ValueList &states); - void listUsedTags(QValueList &list); + void listUsedTags(Q3ValueList &list); Note* nextInStack(); diff --git a/src/notecontent.cpp b/src/notecontent.cpp index 6923ce2..58b68da 100644 --- a/src/notecontent.cpp +++ b/src/notecontent.cpp @@ -22,12 +22,15 @@ #include #include #include -#include +#include #include #include #include #include #include +//Added by qt3to4: +#include +#include #include #include #include @@ -377,7 +380,7 @@ QPixmap TextContent::feedbackPixmap(int width, int height) QPixmap HtmlContent::feedbackPixmap(int width, int height) { - QSimpleRichText richText(html(), note()->font()); + Q3SimpleRichText richText(html(), note()->font()); richText.setWidth(width); QColorGroup colorGroup(basket()->colorGroup()); colorGroup.setColor(QColorGroup::Text, note()->textColor()); @@ -552,7 +555,7 @@ bool TextContent::finishLazyLoad() int width = (m_simpleRichText ? m_simpleRichText->width() : 1); delete m_simpleRichText; QString html = "" + Tools::tagURLs(Tools::textToHTML(m_text)); // Don't collapse multiple spaces! - m_simpleRichText = new QSimpleRichText(html, note()->font()); + m_simpleRichText = new Q3SimpleRichText(html, note()->font()); m_simpleRichText->setWidth(1); // We put a width of 1 pixel, so usedWidth() is egual to the minimum width int minWidth = m_simpleRichText->widthUsed(); m_simpleRichText->setWidth(width); @@ -660,7 +663,7 @@ bool HtmlContent::finishLazyLoad() { int width = (m_simpleRichText ? m_simpleRichText->width() : 1); delete m_simpleRichText; - m_simpleRichText = new QSimpleRichText(Tools::tagURLs(m_html), note()->font()); + m_simpleRichText = new Q3SimpleRichText(Tools::tagURLs(m_html), note()->font()); m_simpleRichText->setWidth(1); // We put a width of 1 pixel, so usedWidth() is egual to the minimum width int minWidth = m_simpleRichText->widthUsed(); m_simpleRichText->setWidth(width); @@ -770,7 +773,7 @@ bool ImageContent::finishLazyLoad() { QBuffer buffer(content); - buffer.open(IO_ReadOnly); + buffer.open(QIODevice::ReadOnly); m_format = (char* /* from const char* */)QImageIO::imageFormat(&buffer); // See QImageIO to know what formats can be supported. buffer.close(); if (m_format) { @@ -796,7 +799,7 @@ bool ImageContent::saveToFile() QByteArray ba; QBuffer buffer(ba); - buffer.open(IO_WriteOnly); + buffer.open(QIODevice::WriteOnly); m_pixmap.save(&buffer, m_format); return basket()->saveToFile(fullPath(), ba); } @@ -1344,7 +1347,7 @@ void LinkContent::removePreview(const KFileItem*) } // QHttp slots for getting link title -void LinkContent::httpReadyRead(const QHttpResponseHeader& ) +void LinkContent::httpReadyRead(const Q3HttpResponseHeader& ) { Q_ULONG bytesAvailable = m_http->bytesAvailable(); if(bytesAvailable <= 0) @@ -1406,10 +1409,10 @@ void LinkContent::startFetchingLinkTitle() m_http = 0; } if(m_http == 0) { - m_http = new QHttp(this); + m_http = new Q3Http(this); connect(m_http, SIGNAL(done(bool)), this, SLOT(httpDone(bool))); - connect(m_http, SIGNAL(readyRead(const QHttpResponseHeader&)), this, - SLOT(httpReadyRead(const QHttpResponseHeader&))); + connect(m_http, SIGNAL(readyRead(const Q3HttpResponseHeader&)), this, + SLOT(httpReadyRead(const Q3HttpResponseHeader&))); } m_http->setHost(this->url().host(), this->url().port() == 0 ? 80: this->url().port()); QString path = this->url().encodedPathAndQuery(1); @@ -1844,7 +1847,7 @@ void ColorContent::setColor(const QColor &color) void ColorContent::addAlternateDragObjects(KMultipleDrag *dragObject) { - dragObject->addDragObject( new QColorDrag(color()) ); + dragObject->addDragObject( new Q3ColorDrag(color()) ); // addDragObject(new KColorDrag( note->color(), 0 )); // addDragObject(new QTextDrag( note->color().name(), 0 )); @@ -1930,7 +1933,7 @@ bool UnknownContent::loadFromFile(bool /*lazyLoad*/) { DEBUG_WIN << "Loading UnknownContent From " + basket()->folderName() + fileName(); QFile file(fullPath()); - if (file.open(IO_ReadOnly)) { + if (file.open(QIODevice::ReadOnly)) { QDataStream stream(&file); QString line; m_mimeTypes = ""; @@ -1957,10 +1960,10 @@ bool UnknownContent::loadFromFile(bool /*lazyLoad*/) void UnknownContent::addAlternateDragObjects(KMultipleDrag *dragObject) { QFile file(fullPath()); - if (file.open(IO_ReadOnly)) { + if (file.open(QIODevice::ReadOnly)) { QDataStream stream(&file); // Get the MIME types names: - QValueList mimes; + Q3ValueList mimes; QString line; do { if (!stream.atEnd()) { @@ -1972,7 +1975,7 @@ void UnknownContent::addAlternateDragObjects(KMultipleDrag *dragObject) // Add the streams: Q_UINT64 size; // TODO: It was Q_UINT32 in version 0.5.0 ! QByteArray *array; - QStoredDrag *storedDrag; + Q3StoredDrag *storedDrag; for (uint i = 0; i < mimes.count(); ++i) { // Get the size: stream >> size; @@ -1980,7 +1983,7 @@ void UnknownContent::addAlternateDragObjects(KMultipleDrag *dragObject) array = new QByteArray(size); stream.readRawBytes(array->data(), size); // Creata and add the QDragObject: - storedDrag = new QStoredDrag(*(mimes.at(i))); + storedDrag = new Q3StoredDrag(*(mimes.at(i))); storedDrag->setEncodedData(*array); dragObject->addDragObject(storedDrag); delete array; // FIXME: Should we? diff --git a/src/notecontent.h b/src/notecontent.h index 7fa49ec..d137a8b 100644 --- a/src/notecontent.h +++ b/src/notecontent.h @@ -23,12 +23,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include "linklabel.h" @@ -181,7 +181,7 @@ class TextContent : public NoteContent QString text() { return m_text; } /// << @return the text note-content. protected: QString m_text; - QSimpleRichText *m_simpleRichText; + Q3SimpleRichText *m_simpleRichText; }; /** Real implementation of rich text (HTML) notes: @@ -225,7 +225,7 @@ class HtmlContent : public NoteContent protected: QString m_html; QString m_textEquivalent; //OPTIM_FILTER - QSimpleRichText *m_simpleRichText; + Q3SimpleRichText *m_simpleRichText; }; /** Real implementation of image notes: @@ -461,12 +461,12 @@ class LinkContent : public QObject, public NoteContent bool m_autoTitle; bool m_autoIcon; LinkDisplay m_linkDisplay; - QHttp* m_http; + Q3Http* m_http; QString* m_httpBuff; // File Preview Management: protected slots: void httpDone(bool err); - void httpReadyRead(const QHttpResponseHeader& resp); + void httpReadyRead(const Q3HttpResponseHeader& resp); void newPreview(const KFileItem*, const QPixmap &preview); void removePreview(const KFileItem*); void startFetchingUrlPreview(); diff --git a/src/notedrag.cpp b/src/notedrag.cpp index 56eec35..6bb5791 100644 --- a/src/notedrag.cpp +++ b/src/notedrag.cpp @@ -18,11 +18,16 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include #include @@ -47,7 +52,7 @@ void NoteDrag::createAndEmptyCuttingTmpFolder() dir.mkdir(Global::tempCutFolder()); } -QDragObject* NoteDrag::dragObject(NoteSelection *noteList, bool cutting, QWidget *source) +Q3DragObject* NoteDrag::dragObject(NoteSelection *noteList, bool cutting, QWidget *source) { if (noteList->count() <= 0) return 0; @@ -61,22 +66,22 @@ QDragObject* NoteDrag::dragObject(NoteSelection *noteList, bool cutting, QWidget // The "Native Format" Serialization: QBuffer buffer; - if (buffer.open(IO_WriteOnly)) { + if (buffer.open(QIODevice::WriteOnly)) { QDataStream stream(&buffer); // First append a pointer to the basket: stream << (Q_UINT64)(noteList->firstStacked()->note->basket()); // Then a list of pointers to all notes, and parent groups: for (NoteSelection *node = noteList->firstStacked(); node; node = node->nextStacked()) stream << (Q_UINT64)(node->note); - QValueList groups = noteList->parentGroups(); - for (QValueList::iterator it = groups.begin(); it != groups.end(); ++it) + Q3ValueList groups = noteList->parentGroups(); + for (Q3ValueList::iterator it = groups.begin(); it != groups.end(); ++it) stream << (Q_UINT64)(*it); stream << (Q_UINT64)0; // And finally the notes themselves: serializeNotes(noteList, stream, cutting); // Append the object: buffer.close(); - QStoredDrag *dragObject = new QStoredDrag(NOTE_MIME_STRING, source); + Q3StoredDrag *dragObject = new Q3StoredDrag(NOTE_MIME_STRING, source); dragObject->setEncodedData(buffer.buffer()); multipleDrag->addDragObject(dragObject); } @@ -143,7 +148,7 @@ void NoteDrag::serializeText(NoteSelection *noteList, KMultipleDrag *multipleDra textEquivalent += (!textEquivalent.isEmpty() ? "\n" : "") + text; } if (!textEquivalent.isEmpty()) - multipleDrag->addDragObject( new QTextDrag(textEquivalent) ); + multipleDrag->addDragObject( new Q3TextDrag(textEquivalent) ); } void NoteDrag::serializeHtml(NoteSelection *noteList, KMultipleDrag *multipleDrag) @@ -157,12 +162,12 @@ void NoteDrag::serializeHtml(NoteSelection *noteList, KMultipleDrag *multipleDra } if (!htmlEquivalent.isEmpty()) { // Add HTML flavour: - QTextDrag *htmlDrag = new QTextDrag(htmlEquivalent); + Q3TextDrag *htmlDrag = new Q3TextDrag(htmlEquivalent); htmlDrag->setSubtype("html"); multipleDrag->addDragObject(htmlDrag); // But also QTextEdit flavour, to be able to paste several notes to a text edit: QByteArray byteArray = ("

" + htmlEquivalent).local8Bit(); - QStoredDrag *richTextDrag = new QStoredDrag("application/x-qrichtext"); + Q3StoredDrag *richTextDrag = new Q3StoredDrag("application/x-qrichtext"); richTextDrag->setEncodedData(byteArray); multipleDrag->addDragObject(richTextDrag); } @@ -170,7 +175,7 @@ void NoteDrag::serializeHtml(NoteSelection *noteList, KMultipleDrag *multipleDra void NoteDrag::serializeImage(NoteSelection *noteList, KMultipleDrag *multipleDrag) { - QValueList pixmaps; + Q3ValueList pixmaps; QPixmap pixmap; for (NoteSelection *node = noteList->firstStacked(); node; node = node->nextStacked()) { pixmap = node->note->content()->toPixmap(); @@ -185,7 +190,7 @@ void NoteDrag::serializeImage(NoteSelection *noteList, KMultipleDrag *multipleDr // Search the total size: int height = 0; int width = 0; - for (QValueList::iterator it = pixmaps.begin(); it != pixmaps.end(); ++it) { + for (Q3ValueList::iterator it = pixmaps.begin(); it != pixmaps.end(); ++it) { height += (*it).height(); if ((*it).width() > width) width = (*it).width(); @@ -195,12 +200,12 @@ void NoteDrag::serializeImage(NoteSelection *noteList, KMultipleDrag *multipleDr pixmapEquivalent.fill(Qt::white); QPainter painter(&pixmapEquivalent); height = 0; - for (QValueList::iterator it = pixmaps.begin(); it != pixmaps.end(); ++it) { + for (Q3ValueList::iterator it = pixmaps.begin(); it != pixmaps.end(); ++it) { painter.drawPixmap(0, height, *it); height += (*it).height(); } } - QImageDrag *imageDrag = new QImageDrag(pixmapEquivalent.convertToImage()); + Q3ImageDrag *imageDrag = new Q3ImageDrag(pixmapEquivalent.convertToImage()); multipleDrag->addDragObject(imageDrag); } } @@ -228,7 +233,7 @@ void NoteDrag::serializeLinks(NoteSelection *noteList, KMultipleDrag *multipleDr #else KURLDrag2 *urlsDrag = new KURLDrag2(urls); QByteArray byteArray = urlsDrag->encodedData2("text/uri-list"); - QStoredDrag *uriListDrag = new QStoredDrag("text/uri-list"); + Q3StoredDrag *uriListDrag = new Q3StoredDrag("text/uri-list"); uriListDrag->setEncodedData(byteArray); multipleDrag->addDragObject(uriListDrag); delete urlsDrag; @@ -243,16 +248,16 @@ void NoteDrag::serializeLinks(NoteSelection *noteList, KMultipleDrag *multipleDr /* Code for only one: =============== xMozUrl = note->title() + "\n" + note->url().prettyURL();*/ QByteArray baMozUrl; - QTextStream stream(baMozUrl, IO_WriteOnly); - stream.setEncoding(QTextStream::RawUnicode); // It's UTF16 (aka UCS2), but with the first two order bytes + Q3TextStream stream(baMozUrl, QIODevice::WriteOnly); + stream.setEncoding(Q3TextStream::RawUnicode); // It's UTF16 (aka UCS2), but with the first two order bytes stream << xMozUrl; - QStoredDrag *xMozUrlDrag = new QStoredDrag("text/x-moz-url"); + Q3StoredDrag *xMozUrlDrag = new Q3StoredDrag("text/x-moz-url"); xMozUrlDrag->setEncodedData(baMozUrl); multipleDrag->addDragObject(xMozUrlDrag); if (cutting) { QByteArray arrayCut(2); - QStoredDrag *storedDragCut = new QStoredDrag("application/x-kde-cutselection"); + Q3StoredDrag *storedDragCut = new Q3StoredDrag("application/x-kde-cutselection"); arrayCut[0] = '1'; arrayCut[1] = 0; storedDragCut->setEncodedData(arrayCut); @@ -279,9 +284,9 @@ QPixmap NoteDrag::feedbackPixmap(NoteSelection *noteList) QColor textColor = noteList->firstStacked()->note->basket()->textColor(); QColor backgroundColor = noteList->firstStacked()->note->basket()->backgroundColor().dark(NoteContent::FEEDBACK_DARKING); - QValueList pixmaps; - QValueList backgrounds; - QValueList spaces; + Q3ValueList pixmaps; + Q3ValueList backgrounds; + Q3ValueList spaces; QPixmap pixmap; int height = 0; int width = 0; @@ -324,9 +329,9 @@ QPixmap NoteDrag::feedbackPixmap(NoteSelection *noteList) QPainter painter(&result); // Draw all the images: height = MARGIN; - QValueList::iterator it; - QValueList::iterator it2; - QValueList::iterator it3; + Q3ValueList::iterator it; + Q3ValueList::iterator it2; + Q3ValueList::iterator it3; int i = 0; for (it = pixmaps.begin(), it2 = backgrounds.begin(), it3 = spaces.begin(); it != pixmaps.end(); ++it, ++it2, ++it3, ++i) { if (i != 0 && (*it3)) { @@ -376,7 +381,7 @@ bool NoteDrag::canDecode(QMimeSource *source) Basket* NoteDrag::basketOf(QMimeSource *source) { QBuffer buffer(source->encodedData(NOTE_MIME_STRING)); - if (buffer.open(IO_ReadOnly)) { + if (buffer.open(QIODevice::ReadOnly)) { QDataStream stream(&buffer); // Get the parent basket: Q_UINT64 basketPointer; @@ -386,17 +391,17 @@ Basket* NoteDrag::basketOf(QMimeSource *source) return 0; } -QValueList NoteDrag::notesOf(QMimeSource *source) +Q3ValueList NoteDrag::notesOf(QMimeSource *source) { QBuffer buffer(source->encodedData(NOTE_MIME_STRING)); - if (buffer.open(IO_ReadOnly)) { + if (buffer.open(QIODevice::ReadOnly)) { QDataStream stream(&buffer); // Get the parent basket: Q_UINT64 basketPointer; stream >> (Q_UINT64&)basketPointer; // Get the note list: Q_UINT64 notePointer; - QValueList notes; + Q3ValueList notes; do { stream >> notePointer; if (notePointer != 0) @@ -405,13 +410,13 @@ QValueList NoteDrag::notesOf(QMimeSource *source) // Done: return notes; } else - return QValueList(); + return Q3ValueList(); } Note* NoteDrag::decode(QMimeSource *source, Basket *parent, bool moveFiles, bool moveNotes) { QBuffer buffer(source->encodedData(NOTE_MIME_STRING)); - if (buffer.open(IO_ReadOnly)) { + if (buffer.open(QIODevice::ReadOnly)) { QDataStream stream(&buffer); // Get the parent basket: Q_UINT64 basketPointer; @@ -419,7 +424,7 @@ Note* NoteDrag::decode(QMimeSource *source, Basket *parent, bool moveFiles, bool Basket *basket = (Basket*)basketPointer; // Get the note list: Q_UINT64 notePointer; - QValueList notes; + Q3ValueList notes; do { stream >> notePointer; if (notePointer != 0) @@ -546,14 +551,14 @@ Note* NoteDrag::decodeHierarchy(QDataStream &stream, Basket *parent, bool moveFi bool ExtendedTextDrag::decode(const QMimeSource *e, QString &str) { - QCString subtype("plain"); + Q3CString subtype("plain"); return decode(e, str, subtype); } -bool ExtendedTextDrag::decode(const QMimeSource *e, QString &str, QCString &subtype) +bool ExtendedTextDrag::decode(const QMimeSource *e, QString &str, Q3CString &subtype) { // Get the string: - bool ok = QTextDrag::decode(e, str, subtype); + bool ok = Q3TextDrag::decode(e, str, subtype); // Test if it was a UTF-16 string (from eg. Mozilla): if (str.length() >= 2) { diff --git a/src/notedrag.h b/src/notedrag.h index c76eb96..4c3674f 100644 --- a/src/notedrag.h +++ b/src/notedrag.h @@ -22,10 +22,12 @@ #define NOTEDRAG_H #include -#include +#include #include #include -#include +#include +//Added by qt3to4: +#include #include class QDataStream; @@ -63,11 +65,11 @@ class NoteDrag static Note* decodeHierarchy(QDataStream &stream, Basket *parent, bool moveFiles, bool moveNotes, Basket *originalBasket); public: static QPixmap feedbackPixmap(NoteSelection *noteList); - static QDragObject* dragObject(NoteSelection *noteList, bool cutting, QWidget *source = 0); + static Q3DragObject* dragObject(NoteSelection *noteList, bool cutting, QWidget *source = 0); static bool canDecode(QMimeSource *source); static Note* decode(QMimeSource *source, Basket *parent, bool moveFiles, bool moveNotes); static Basket* basketOf(QMimeSource *source); - static QValueList notesOf(QMimeSource *source); + static Q3ValueList notesOf(QMimeSource *source); static void createAndEmptyCuttingTmpFolder(); static const char *NOTE_MIME_STRING; @@ -78,12 +80,12 @@ class NoteDrag * with local encoding! * @author Sébastien Laoût */ -class ExtendedTextDrag : public QTextDrag +class ExtendedTextDrag : public Q3TextDrag { Q_OBJECT public: static bool decode(const QMimeSource *e, QString &str); - static bool decode(const QMimeSource *e, QString &str, QCString &subtype); + static bool decode(const QMimeSource *e, QString &str, Q3CString &subtype); }; // Support KDE 3.3 and older PROTECTED KURLDrag::encodedData()! diff --git a/src/noteedit.cpp b/src/noteedit.cpp index 4ee2812..445040b 100644 --- a/src/noteedit.cpp +++ b/src/noteedit.cpp @@ -21,6 +21,10 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include #include @@ -138,7 +142,7 @@ TextEditor::TextEditor(TextContent *textContent, QWidget *parent) textEdit->setPaletteBackgroundColor(note()->backgroundColor()); textEdit->setPaletteForegroundColor(note()->textColor()); textEdit->setFont(note()->font()); - textEdit->setHScrollBarMode(QScrollView::AlwaysOff); + textEdit->setHScrollBarMode(Q3ScrollView::AlwaysOff); if (Settings::spellCheckTextNotes()) textEdit->setCheckSpellingEnabled(true); textEdit->setText(m_textContent->text()); @@ -206,11 +210,11 @@ HtmlEditor::HtmlEditor(HtmlContent *htmlContent, QWidget *parent) textEdit->setLineWidth(0); textEdit->setMidLineWidth(0); textEdit->setTextFormat(Qt::RichText); - textEdit->setAutoFormatting(Settings::autoBullet() ? QTextEdit::AutoAll : QTextEdit::AutoNone); + textEdit->setAutoFormatting(Settings::autoBullet() ? Q3TextEdit::AutoAll : Q3TextEdit::AutoNone); textEdit->setPaletteBackgroundColor(note()->backgroundColor()); textEdit->setPaletteForegroundColor(note()->textColor()); textEdit->setFont(note()->font()); - textEdit->setHScrollBarMode(QScrollView::AlwaysOff); + textEdit->setHScrollBarMode(Q3ScrollView::AlwaysOff); textEdit->setText(m_htmlContent->html()); textEdit->moveCursor(KTextEdit::MoveEnd, false); textEdit->verticalScrollBar()->setCursor(Qt::ArrowCursor); @@ -535,12 +539,12 @@ LinkEditDialog::LinkEditDialog(LinkContent *contentNote, QWidget *parent/*, QKey m_noteContent(contentNote) { QWidget *page = plainPage(); - QGridLayout *layout = new QGridLayout(page, /*nRows=*/4, /*nCols=*/2, /*margin=*/0, spacingHint()); + Q3GridLayout *layout = new Q3GridLayout(page, /*nRows=*/4, /*nCols=*/2, /*margin=*/0, spacingHint()); m_url = new KURLRequester(m_noteContent->url().url(), page); QWidget *wid1 = new QWidget(page); - QHBoxLayout *titleLay = new QHBoxLayout(wid1, /*margin=*/0, spacingHint()); + Q3HBoxLayout *titleLay = new Q3HBoxLayout(wid1, /*margin=*/0, spacingHint()); m_title = new DebuggedLineEdit(m_noteContent->title(), wid1); m_autoTitle = new QPushButton(i18n("Auto"), wid1); m_autoTitle->setToggleButton(true); @@ -549,7 +553,7 @@ LinkEditDialog::LinkEditDialog(LinkContent *contentNote, QWidget *parent/*, QKey titleLay->addWidget(m_autoTitle); QWidget *wid = new QWidget(page); - QHBoxLayout *hLay = new QHBoxLayout(wid, /*margin=*/0, spacingHint()); + Q3HBoxLayout *hLay = new Q3HBoxLayout(wid, /*margin=*/0, spacingHint()); m_icon = new KIconButton(wid); QLabel *label3 = new QLabel(m_icon, i18n("&Icon:"), page); KURL filteredURL = NoteFactory::filteredURL(KURL(m_url->lineEdit()->text()));//KURIFilter::self()->filteredURI(KURL(m_url->lineEdit()->text())); @@ -694,7 +698,7 @@ LauncherEditDialog::LauncherEditDialog(LauncherContent *contentNote, QWidget *pa m_noteContent(contentNote) { QWidget *page = plainPage(); - QGridLayout *layout = new QGridLayout(page, /*nRows=*/4, /*nCols=*/2, /*margin=*/0, spacingHint()); + Q3GridLayout *layout = new Q3GridLayout(page, /*nRows=*/4, /*nCols=*/2, /*margin=*/0, spacingHint()); KService service(contentNote->fullPath()); @@ -702,7 +706,7 @@ LauncherEditDialog::LauncherEditDialog(LauncherContent *contentNote, QWidget *pa m_name = new QLineEdit(service.name(), page); QWidget *wid = new QWidget(page); - QHBoxLayout *hLay = new QHBoxLayout(wid, /*margin=*/0, spacingHint()); + Q3HBoxLayout *hLay = new Q3HBoxLayout(wid, /*margin=*/0, spacingHint()); m_icon = new KIconButton(wid); QLabel *label = new QLabel(m_icon, i18n("&Icon:"), page); m_icon->setIconType(KIcon::NoGroup, KIcon::Application); diff --git a/src/noteedit.h b/src/noteedit.h index d31e413..960c16d 100644 --- a/src/noteedit.h +++ b/src/noteedit.h @@ -22,8 +22,10 @@ #define NOTEEDIT_H #include -#include +#include #include +//Added by qt3to4: +#include class QWidget; //class QLineEdit; diff --git a/src/notefactory.cpp b/src/notefactory.cpp index dc21537..6ced316 100644 --- a/src/notefactory.cpp +++ b/src/notefactory.cpp @@ -19,13 +19,18 @@ ***************************************************************************/ #include +//Added by qt3to4: +#include +#include +#include +#include #include #include #include #include #include #include -#include +#include #include #include #include @@ -233,7 +238,7 @@ Note* NoteFactory::createNoteFromText(const QString &text, Basket *parent) //QString newText = text.stripWhiteSpace(); // The text for a new note, without useless spaces /* Else, it's a text or an HTML note, so, create it */ - if (QStyleSheet::mightBeRichText(/*newT*/text)) + if (Q3StyleSheet::mightBeRichText(/*newT*/text)) return createNoteHtml(/*newT*/text, parent); else return createNoteText(/*newT*/text, parent); @@ -269,9 +274,9 @@ QString NoteFactory::createNoteLauncherFile(const QString &command, const QStrin QString fullPath = parent->fullPathForFileName(fileName); // parent->dontCareOfCreation(fullPath); QFile file(fullPath); - if ( file.open(IO_WriteOnly) ) { - QTextStream stream(&file); - stream.setEncoding(QTextStream::UnicodeUTF8); + if ( file.open(QIODevice::WriteOnly) ) { + Q3TextStream stream(&file); + stream.setEncoding(Q3TextStream::UnicodeUTF8); stream << content; file.close(); return fileName; @@ -297,7 +302,7 @@ Note* NoteFactory::createNoteLinkOrLauncher(const KURL &url, Basket *parent) return createNoteLink(url, parent); } -#include +#include #include bool NoteFactory::movingNotesInTheSameBasket(QMimeSource *source, Basket *parent, QDropEvent::Action action) @@ -346,7 +351,7 @@ Note* NoteFactory::dropNote(QMimeSource *source, Basket *parent, bool fromDrop, /* Else : Drop object to note */ QPixmap pixmap; - if ( QImageDrag::decode(source, pixmap) ) + if ( Q3ImageDrag::decode(source, pixmap) ) return createNoteImage(pixmap, parent); // KColorDrag::decode() is buggy and can trheat strings like "#include " as a black color @@ -359,7 +364,7 @@ Note* NoteFactory::dropNote(QMimeSource *source, Basket *parent, bool fromDrop, // And then the hack (if provide color MIME type or a text that contains color), using createNote Color RegExp: QString hack; QRegExp exp("^#(?:[a-fA-F\\d]{3}){1,4}$"); - if (source->provides("application/x-color") || (QTextDrag::decode(source, hack) && (exp.search(hack) != -1)) ) { + if (source->provides("application/x-color") || (Q3TextDrag::decode(source, hack) && (exp.search(hack) != -1)) ) { QColor color; if (KColorDrag::decode(source, color)) return createNoteColor(color, parent); @@ -400,7 +405,7 @@ Note* NoteFactory::dropNote(QMimeSource *source, Basket *parent, bool fromDrop, if (source->provides("text/x-moz-url")) { // FOR MOZILLA // Get the array and create a QChar array of 1/2 of the size QByteArray mozilla = source->encodedData("text/x-moz-url"); - QMemArray chars( mozilla.count() / 2 ); + Q3MemArray chars( mozilla.count() / 2 ); // A small debug work to know the value of each bytes if (Global::debugWindow) for (uint i = 0; i < mozilla.count(); i++) @@ -429,7 +434,7 @@ Note* NoteFactory::dropNote(QMimeSource *source, Basket *parent, bool fromDrop, if (source->provides("text/html")) { QString html; - QCString subtype("html"); + Q3CString subtype("html"); // If the text/html comes from Mozilla or GNOME it can be UTF-16 encoded: we need ExtendedTextDrag to check that ExtendedTextDrag::decode(source, html, subtype); return createNoteHtml(html, parent); @@ -456,7 +461,7 @@ Note* NoteFactory::createNoteUnknown(QMimeSource *source, Basket *parent/*, cons // Save the MimeSource in a file: create and open the file: QString fileName = createFileForNewNote(parent, "unknown"); QFile file(parent->fullPath() + fileName); - if ( ! file.open(IO_WriteOnly) ) + if ( ! file.open(QIODevice::WriteOnly) ) return 0L; QDataStream stream(&file); @@ -643,7 +648,7 @@ bool NoteFactory::maybeImageOrAnimation(const KURL &url) {"BMP", "GIF", "JPEG", "MNG", "PBM", "PGM", "PNG", "PPM", "XBM", "XPM"} QImageDecoder::inputFormats(): {"GIF", "MNG", "PNG"} */ - QStrList list = QImageIO::inputFormats(); + Q3StrList list = QImageIO::inputFormats(); list.prepend("jpg"); // Since QImageDrag return only "JPEG" and extensions can be "JPG"; preprend for heuristic optim. char *s; QString path = url.url().lower(); @@ -832,7 +837,7 @@ QString NoteFactory::createFileForNewNote(Basket *parent, const QString &extensi // Create the file // parent->dontCareOfCreation(fullName); QFile file(fullName); - file.open(IO_WriteOnly); + file.open(QIODevice::WriteOnly); file.close(); return fileName; diff --git a/src/notefactory.h b/src/notefactory.h index ae72da4..22c302f 100644 --- a/src/notefactory.h +++ b/src/notefactory.h @@ -22,6 +22,9 @@ #define NOTEFACTORY_H #include +//Added by qt3to4: +#include +#include #include #include diff --git a/src/password.cpp b/src/password.cpp index 2824612..4e030e1 100644 --- a/src/password.cpp +++ b/src/password.cpp @@ -24,8 +24,10 @@ #include #include -#include +#include #include +//Added by qt3to4: +#include #include #include #include @@ -37,7 +39,7 @@ PasswordDlg::PasswordDlg(QWidget *parent, const char *name) :KDialogBase(Plain, i18n("Password Protection"), Ok|Cancel, Ok, parent, name, /*modal=*/true, /*separator=*/true), w(0) { - QHBoxLayout* toplayout = new QHBoxLayout(plainPage(), 0, 0); + Q3HBoxLayout* toplayout = new Q3HBoxLayout(plainPage(), 0, 0); w = new Password(plainPage()); toplayout->addWidget(w, 1); } diff --git a/src/popupmenu.cpp b/src/popupmenu.cpp index 6efa8f8..e44f06c 100644 --- a/src/popupmenu.cpp +++ b/src/popupmenu.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include "popupmenu.h" @@ -40,7 +40,7 @@ * => Have those methods directly in Qt (or KDE) would be a great benefits ! */ -void PopupMenu::execAtRectCenter(QPopupMenu &menu, const QRect &rect) +void PopupMenu::execAtRectCenter(Q3PopupMenu &menu, const QRect &rect) { // Compute point where to popup the menu that should be centered : QSize menuSize = menu.sizeHint(); @@ -64,7 +64,7 @@ void PopupMenu::execAtRectCenter(QPopupMenu &menu, const QRect &rect) //#include //#include -void PopupMenu::execAtRectBottom(QPopupMenu &menu, const QRect &rect, bool centered) +void PopupMenu::execAtRectBottom(Q3PopupMenu &menu, const QRect &rect, bool centered) { QSize menuSize = menu.sizeHint() - QSize(1, 1); // A size is [1..n] => We want two lengths that are [0..(n-1)] int desktopWidth = kapp->desktop()->width(); // to be compared/added/substracted with QRects/QPoints... @@ -106,7 +106,7 @@ void PopupMenu::execAtRectBottom(QPopupMenu &menu, const QRect &rect, bool cente menu.exec( point + QPoint(0, MENU_Y_OFFSET) ); // Stupid offset (Qt bug ?) : we should show the menus 2 pixels more bottom ! } -void PopupMenu::execAtRectRight(QPopupMenu &menu, const QRect &rect, bool centered) +void PopupMenu::execAtRectRight(Q3PopupMenu &menu, const QRect &rect, bool centered) { QSize menuSize = menu.sizeHint() - QSize(1, 1); // A size is [1..n] => We want two lengths that are [0..(n-1)] int desktopWidth = kapp->desktop()->width(); // to be compared/added/substracted with QRects/QPoints... diff --git a/src/popupmenu.h b/src/popupmenu.h index ba376ad..654332e 100644 --- a/src/popupmenu.h +++ b/src/popupmenu.h @@ -1,3 +1,5 @@ +//Added by qt3to4: +#include /*************************************************************************** * Copyright (C) 2003 by Sébastien Laoût * * slaout@linux62.org * @@ -21,7 +23,7 @@ #ifndef POPUPMENU_H #define POPUPMENU_H -class QPopupMenu; +class Q3PopupMenu; class QRect; /** QPopupMenu/KPopupMenu doesn't provide metod to exec a menu @@ -33,7 +35,7 @@ namespace PopupMenu { /** Show the popup menu centered into rect. */ - void execAtRectCenter(QPopupMenu &menu, const QRect &rect); + void execAtRectCenter(Q3PopupMenu &menu, const QRect &rect); /** Show the popup menu at left-bottom of rect, or at right-bottom * if not possible (not enought place). @@ -42,7 +44,7 @@ namespace PopupMenu * If center is true, it will try to horizontaly center the popup with * rect, so it will try two positions : bottom center and then top center. */ - void execAtRectBottom(QPopupMenu &menu, const QRect &rect, bool centered = false); + void execAtRectBottom(Q3PopupMenu &menu, const QRect &rect, bool centered = false); /** Idem execAtRectBottom but on the right or left sides, * prior aligned with the top of the rect, and at the bottom @@ -50,7 +52,7 @@ namespace PopupMenu * If center is true, it will try to vertically center the popup with * rect, so it will try two positions : right center and then left center. */ - void execAtRectRight(QPopupMenu &menu, const QRect &rect, bool centered = false); + void execAtRectRight(Q3PopupMenu &menu, const QRect &rect, bool centered = false); } /** Test window of PopupMenu methods. diff --git a/src/qeffects.cpp b/src/qeffects.cpp index 4658373..c9e8c32 100644 --- a/src/qeffects.cpp +++ b/src/qeffects.cpp @@ -47,6 +47,11 @@ **********************************************************************/ #include "qapplication.h" +//Added by qt3to4: +#include +#include +#include +#include #ifndef QT_NO_EFFECTS #include "qwidget.h" #include "qeffects.h" @@ -54,8 +59,8 @@ #include "qimage.h" #include "qtimer.h" #include "qdatetime.h" -#include "qguardedptr.h" -#include "qscrollview.h" +#include "qpointer.h" +#include "q3scrollview.h" /* REMOVED CLASS DEFINITION HERE (MOVED TO qeffects.h) */ @@ -151,7 +156,7 @@ bool QAlphaWidget::eventFilter( QObject* o, QEvent* e ) break; case QEvent::MouseButtonPress: #ifndef QT_NO_SCROLLVIEW - if ( ::qt_cast(o) ) + if ( ::qt_cast(o) ) break; #endif case QEvent::MouseButtonDblClick: @@ -362,7 +367,7 @@ bool QRollEffect::eventFilter( QObject* o, QEvent* e ) break; case QEvent::MouseButtonPress: #ifndef QT_NO_SCROLLVIEW - if ( ::qt_cast(o) ) + if ( ::qt_cast(o) ) break; #endif case QEvent::MouseButtonDblClick: diff --git a/src/qeffects.h b/src/qeffects.h index b898ad4..09b53d5 100644 --- a/src/qeffects.h +++ b/src/qeffects.h @@ -1,3 +1,7 @@ +//Added by qt3to4: +#include +#include +#include #if 0 // Note: this file has been copied from the Qt source. @@ -86,7 +90,7 @@ extern void Q_EXPORT qFadeEffect( QWidget*, int time = -1 ); /******************* MOVED FROM qeffect.cpp: */ -#include "qguardedptr.h" +#include "qpointer.h" #include "qdatetime.h" #include "qtimer.h" #include "qpixmap.h" @@ -135,7 +139,7 @@ class QAlphaWidget: public QWidget, private QEffects QImage back; QImage front; QImage mixed; - QGuardedPtr widget; + QPointer widget; int duration; int elapsed; bool showWidget; @@ -167,7 +171,7 @@ class QRollEffect : public QWidget, private QEffects void scroll(); private: - QGuardedPtr widget; + QPointer widget; int currentHeight; int currentWidth; diff --git a/src/regiongrabber.cpp b/src/regiongrabber.cpp index f7924e6..b9ae5e9 100644 --- a/src/regiongrabber.cpp +++ b/src/regiongrabber.cpp @@ -27,6 +27,12 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include +#include +#include #include @@ -36,7 +42,7 @@ SizeTip::SizeTip( QWidget *parent, const char *name ) { setMargin( 2 ); setIndent( 0 ); - setFrameStyle( QFrame::Plain | QFrame::Box ); + setFrameStyle( Q3Frame::Plain | Q3Frame::Box ); setPalette( QToolTip::palette() ); } diff --git a/src/regiongrabber.h b/src/regiongrabber.h index 528c4ff..2c6c66f 100644 --- a/src/regiongrabber.h +++ b/src/regiongrabber.h @@ -24,6 +24,9 @@ #include #include +//Added by qt3to4: +#include +#include class QTimer; diff --git a/src/settings.cpp b/src/settings.cpp index ed29ae3..dd7b969 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -21,20 +21,25 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include #include #include #include #include -#include -#include +#include +#include #include #include #include @@ -357,12 +362,12 @@ void Settings::setAutoBullet(bool yes) GeneralPage::GeneralPage(QWidget * parent, const char * name) : KCModule(parent, name) { - QVBoxLayout *layout = new QVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint()); - QHBoxLayout *hLay; + Q3VBoxLayout *layout = new Q3VBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint()); + Q3HBoxLayout *hLay; QLabel *label; HelpLabel *hLabel; - QGridLayout *gl = new QGridLayout(layout, /*nRows=*/3, /*nCols=*/3); + Q3GridLayout *gl = new Q3GridLayout(layout, /*nRows=*/3, /*nCols=*/3); gl->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding), 0, 2); // Basket Tree Position: @@ -384,7 +389,7 @@ GeneralPage::GeneralPage(QWidget * parent, const char * name) connect( m_filterOnTop, SIGNAL(activated(int)), this, SLOT(changed()) ); // Use Baloons to Report Results of Global Actions: - hLay = new QHBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); + hLay = new Q3HBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); m_usePassivePopup = new QCheckBox(i18n("&Use balloons to report results of global actions"), this); connect( m_usePassivePopup, SIGNAL(stateChanged(int)), this, SLOT(changed()) ); hLabel = new HelpLabel( @@ -402,9 +407,9 @@ GeneralPage::GeneralPage(QWidget * parent, const char * name) layout->addLayout(hLay); // System Tray Icon: - QGroupBox *gbSys = new QGroupBox(3, Qt::Vertical, i18n("System Tray Icon"), this); + Q3GroupBox *gbSys = new Q3GroupBox(3, Qt::Vertical, i18n("System Tray Icon"), this); layout->addWidget(gbSys); - QVBoxLayout *sysLay = new QVBoxLayout(gbSys, /*margin=*/0, KDialogBase::spacingHint()); + Q3VBoxLayout *sysLay = new Q3VBoxLayout(gbSys, /*margin=*/0, KDialogBase::spacingHint()); // Dock in System Tray: m_useSystray = new QCheckBox(i18n("&Dock in system tray"), gbSys); @@ -412,7 +417,7 @@ GeneralPage::GeneralPage(QWidget * parent, const char * name) connect( m_useSystray, SIGNAL(stateChanged(int)), this, SLOT(changed()) ); m_systray = new QWidget(gbSys); - QVBoxLayout *subSysLay = new QVBoxLayout(m_systray, /*margin=*/0, KDialogBase::spacingHint()); + Q3VBoxLayout *subSysLay = new Q3VBoxLayout(m_systray, /*margin=*/0, KDialogBase::spacingHint()); sysLay->addWidget(m_systray); // Show Current Basket Icon in System Tray Icon: @@ -420,7 +425,7 @@ GeneralPage::GeneralPage(QWidget * parent, const char * name) subSysLay->addWidget(m_showIconInSystray); connect(m_showIconInSystray, SIGNAL(stateChanged(int)), this, SLOT(changed())); - QGridLayout *gs = new QGridLayout(0, /*nRows=*/2, /*nCols=*/3); + Q3GridLayout *gs = new Q3GridLayout(0, /*nRows=*/2, /*nCols=*/3); subSysLay->addLayout(gs); gs->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding), 0, 2); @@ -502,13 +507,13 @@ void GeneralPage::defaults() BasketsPage::BasketsPage(QWidget * parent, const char * name) : KCModule(parent, name) { - QVBoxLayout *layout = new QVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint()); - QHBoxLayout *hLay; + Q3VBoxLayout *layout = new Q3VBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint()); + Q3HBoxLayout *hLay; HelpLabel *hLabel; // Appearance: - QGroupBox *appearanceBox = new QGroupBox(3, Qt::Vertical, i18n("Appearance"), this); + Q3GroupBox *appearanceBox = new Q3GroupBox(3, Qt::Vertical, i18n("Appearance"), this); layout->addWidget(appearanceBox); m_playAnimations = new QCheckBox(i18n("Ani&mate changes in baskets"), appearanceBox); @@ -522,7 +527,7 @@ BasketsPage::BasketsPage(QWidget * parent, const char * name) // Behavior: - QGroupBox *behaviorBox = new QGroupBox(5, Qt::Vertical, i18n("Behavior"), this); + Q3GroupBox *behaviorBox = new Q3GroupBox(5, Qt::Vertical, i18n("Behavior"), this); layout->addWidget(behaviorBox); m_autoBullet = new QCheckBox(i18n("&Transform lines starting with * or - to lists in text editors"), behaviorBox); @@ -532,12 +537,12 @@ BasketsPage::BasketsPage(QWidget * parent, const char * name) connect( m_confirmNoteDeletion, SIGNAL(stateChanged(int)), this, SLOT(changed()) ); QWidget *widget = new QWidget(behaviorBox); - hLay = new QHBoxLayout(widget, /*margin=*/0, KDialogBase::spacingHint()); + hLay = new Q3HBoxLayout(widget, /*margin=*/0, KDialogBase::spacingHint()); m_exportTextTags = new QCheckBox(i18n("&Export tags in texts"), widget); connect( m_exportTextTags, SIGNAL(stateChanged(int)), this, SLOT(changed()) ); QPixmap pixmapHelp(KGlobal::dirs()->findResource("data", "basket/images/tag_export_help.png")); - QMimeSourceFactory::defaultFactory()->setPixmap("__resource_help_tag_export.png", pixmapHelp); + Q3MimeSourceFactory::defaultFactory()->setPixmap("__resource_help_tag_export.png", pixmapHelp); hLabel = new HelpLabel( i18n("When does this apply?"), "

" + i18n("It does apply when you copy and paste, or drag and drop notes to a text editor.") + "

" + @@ -551,10 +556,10 @@ BasketsPage::BasketsPage(QWidget * parent, const char * name) hLay->addStretch(); m_groupOnInsertionLineWidget = new QWidget(behaviorBox); - QHBoxLayout *hLayV = new QHBoxLayout(m_groupOnInsertionLineWidget, /*margin=*/0, KDialogBase::spacingHint()); + Q3HBoxLayout *hLayV = new Q3HBoxLayout(m_groupOnInsertionLineWidget, /*margin=*/0, KDialogBase::spacingHint()); m_groupOnInsertionLine = new QCheckBox(i18n("&Group a new note when clicking on the right of the insertion line"), m_groupOnInsertionLineWidget); QPixmap pixmap(KGlobal::dirs()->findResource("data", "basket/images/insertion_help.png")); - QMimeSourceFactory::defaultFactory()->setPixmap("__resource_help_insertion_line.png", pixmap); + Q3MimeSourceFactory::defaultFactory()->setPixmap("__resource_help_insertion_line.png", pixmap); HelpLabel *helpV = new HelpLabel( i18n("How to group a new note?"), i18n("

When this option is enabled, the insertion-line not only allows you to insert notes at the cursor position, but also allows you to group a new note with the one under the cursor:

") + @@ -570,7 +575,7 @@ BasketsPage::BasketsPage(QWidget * parent, const char * name) connect(m_groupOnInsertionLine, SIGNAL(stateChanged(int)), this, SLOT(changed())); widget = new QWidget(behaviorBox); - QGridLayout *ga = new QGridLayout(widget, /*nRows=*/3, /*nCols=*/4, /*margin=*/0, KDialogBase::spacingHint()); + Q3GridLayout *ga = new Q3GridLayout(widget, /*nRows=*/3, /*nCols=*/4, /*margin=*/0, KDialogBase::spacingHint()); ga->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding), 0, 3); m_middleAction = new QComboBox(widget); @@ -593,12 +598,12 @@ BasketsPage::BasketsPage(QWidget * parent, const char * name) // Protection: - QGroupBox *protectionBox = new QGroupBox(3, Qt::Vertical, i18n("Password Protection"), this); + Q3GroupBox *protectionBox = new Q3GroupBox(3, Qt::Vertical, i18n("Password Protection"), this); layout->addWidget(protectionBox); widget = new QWidget(protectionBox); // Re-Lock timeout configuration - hLay = new QHBoxLayout(widget, /*margin=*/0, KDialogBase::spacingHint()); + hLay = new Q3HBoxLayout(widget, /*margin=*/0, KDialogBase::spacingHint()); m_enableReLockTimeoutMinutes = new QCheckBox(i18n("A&utomatically lock protected baskets when closed for"), widget); hLay->addWidget(m_enableReLockTimeoutMinutes); m_reLockTimeoutMinutes = new KIntNumInput(widget); @@ -682,13 +687,13 @@ void BasketsPage::defaults() NewNotesPage::NewNotesPage(QWidget * parent, const char * name) : KCModule(parent, name) { - QVBoxLayout *layout = new QVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint()); - QHBoxLayout *hLay; + Q3VBoxLayout *layout = new Q3VBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint()); + Q3HBoxLayout *hLay; QLabel *label; // Place of New Notes: - hLay = new QHBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); + hLay = new Q3HBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); m_newNotesPlace = new QComboBox(this); label = new QLabel(m_newNotesPlace, i18n("&Place of new notes:"), this); m_newNotesPlace->insertItem(i18n("On top")); @@ -704,7 +709,7 @@ NewNotesPage::NewNotesPage(QWidget * parent, const char * name) // New Images Size: - hLay = new QHBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); + hLay = new Q3HBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); m_imgSizeX = new KIntNumInput(this); m_imgSizeX->setMinValue(1); m_imgSizeX->setMaxValue(4096); @@ -731,7 +736,7 @@ NewNotesPage::NewNotesPage(QWidget * parent, const char * name) // View File Content: - QVButtonGroup *buttonGroup = new QVButtonGroup(i18n("View Content of Added Files for the Following Types"), this); + Q3VButtonGroup *buttonGroup = new Q3VButtonGroup(i18n("View Content of Added Files for the Following Types"), this); m_viewTextFileContent = new QCheckBox( i18n("&Plain text"), buttonGroup ); m_viewHtmlFileContent = new QCheckBox( i18n("&HTML page"), buttonGroup ); m_viewImageFileContent = new QCheckBox( i18n("&Image or animation"), buttonGroup ); @@ -790,7 +795,7 @@ void NewNotesPage::visualize() NotesAppearancePage::NotesAppearancePage(QWidget * parent, const char * name) : KCModule(parent, name) { - QVBoxLayout *layout = new QVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint()); + Q3VBoxLayout *layout = new Q3VBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint()); QTabWidget *tabs = new QTabWidget(this); layout->addWidget(tabs); @@ -838,11 +843,11 @@ ApplicationsPage::ApplicationsPage(QWidget * parent, const char * name) : KCModule(parent, name) { /* Applications page */ - QVBoxLayout *layout = new QVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint()); + Q3VBoxLayout *layout = new Q3VBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint()); m_htmlUseProg = new QCheckBox(i18n("Open &text notes with a custom application:"), this); m_htmlProg = new RunCommandRequester("", i18n("Open text notes with:"), this); - QHBoxLayout *hLayH = new QHBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); + Q3HBoxLayout *hLayH = new Q3HBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); hLayH->insertSpacing(-1, 20); hLayH->addWidget(m_htmlProg); connect(m_htmlUseProg, SIGNAL(stateChanged(int)), this, SLOT(changed())); @@ -850,7 +855,7 @@ ApplicationsPage::ApplicationsPage(QWidget * parent, const char * name) m_imageUseProg = new QCheckBox(i18n("Open &image notes with a custom application:"), this); m_imageProg = new RunCommandRequester("", i18n("Open image notes with:"), this); - QHBoxLayout *hLayI = new QHBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); + Q3HBoxLayout *hLayI = new Q3HBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); hLayI->insertSpacing(-1, 20); hLayI->addWidget(m_imageProg); connect(m_imageUseProg, SIGNAL(stateChanged(int)), this, SLOT(changed())); @@ -858,7 +863,7 @@ ApplicationsPage::ApplicationsPage(QWidget * parent, const char * name) m_animationUseProg = new QCheckBox(i18n("Open a&nimation notes with a custom application:"), this); m_animationProg = new RunCommandRequester("", i18n("Open animation notes with:"), this); - QHBoxLayout *hLayA = new QHBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); + Q3HBoxLayout *hLayA = new Q3HBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); hLayA->insertSpacing(-1, 20); hLayA->addWidget(m_animationProg); connect(m_animationUseProg, SIGNAL(stateChanged(int)), this, SLOT(changed())); @@ -866,7 +871,7 @@ ApplicationsPage::ApplicationsPage(QWidget * parent, const char * name) m_soundUseProg = new QCheckBox(i18n("Open so&und notes with a custom application:"), this); m_soundProg = new RunCommandRequester("", i18n("Open sound notes with:"), this); - QHBoxLayout *hLayS = new QHBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); + Q3HBoxLayout *hLayS = new Q3HBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); hLayS->insertSpacing(-1, 20); hLayS->addWidget(m_soundProg); connect(m_soundUseProg, SIGNAL(stateChanged(int)), this, SLOT(changed())); @@ -876,19 +881,19 @@ ApplicationsPage::ApplicationsPage(QWidget * parent, const char * name) "

If checked, the application defined below will be used when opening that type of note.

" "

Otherwise, the application you've configured in Konqueror will be used.

"); - QWhatsThis::add(m_htmlUseProg, whatsthis); - QWhatsThis::add(m_imageUseProg, whatsthis); - QWhatsThis::add(m_animationUseProg, whatsthis); - QWhatsThis::add(m_soundUseProg, whatsthis); + Q3WhatsThis::add(m_htmlUseProg, whatsthis); + Q3WhatsThis::add(m_imageUseProg, whatsthis); + Q3WhatsThis::add(m_animationUseProg, whatsthis); + Q3WhatsThis::add(m_soundUseProg, whatsthis); whatsthis = i18n( "

Define the application to use for opening that type of note instead of the " "application configured in Konqueror.

"); - QWhatsThis::add(m_htmlProg, whatsthis); - QWhatsThis::add(m_imageProg, whatsthis); - QWhatsThis::add(m_animationProg, whatsthis); - QWhatsThis::add(m_soundProg, whatsthis); + Q3WhatsThis::add(m_htmlProg, whatsthis); + Q3WhatsThis::add(m_imageProg, whatsthis); + Q3WhatsThis::add(m_animationProg, whatsthis); + Q3WhatsThis::add(m_soundProg, whatsthis); layout->addWidget(m_htmlUseProg); layout->addItem(hLayH); @@ -901,7 +906,7 @@ ApplicationsPage::ApplicationsPage(QWidget * parent, const char * name) layout->addSpacing(KDialogBase::spacingHint()); - QHBoxLayout *hLay = new QHBoxLayout(0L, /*margin=*/0, /*spacing=*/0); + Q3HBoxLayout *hLay = new Q3HBoxLayout(0L, /*margin=*/0, /*spacing=*/0); HelpLabel *hl1 = new HelpLabel( i18n("How to change the application used to open Web links?"), i18n("

When opening Web links, they are opened in different applications, depending on the content of the link " @@ -920,7 +925,7 @@ ApplicationsPage::ApplicationsPage(QWidget * parent, const char * name) hLay->addStretch(); layout->addLayout(hLay); - hLay = new QHBoxLayout(0L, /*margin=*/0, /*spacing=*/0); + hLay = new Q3HBoxLayout(0L, /*margin=*/0, /*spacing=*/0); HelpLabel *hl2 = new HelpLabel( i18n("How to change the applications used to open files and links?"), i18n("

Here is how to set the application to be used for each type of file. " diff --git a/src/settings.h b/src/settings.h index 49ffe31..16ade48 100644 --- a/src/settings.h +++ b/src/settings.h @@ -22,6 +22,8 @@ #define SETTINGS_H #include +//Added by qt3to4: +#include #include #include #include @@ -38,8 +40,8 @@ #include "bnpview.h" #include "systemtray.h" -class QGroupBox; -class QButtonGroup; +class Q3GroupBox; +class Q3ButtonGroup; class KColorCombo; class KIntNumInput; class KGlobalAccel; diff --git a/src/softwareimporters.cpp b/src/softwareimporters.cpp index f94a613..4b437b2 100644 --- a/src/softwareimporters.cpp +++ b/src/softwareimporters.cpp @@ -20,15 +20,19 @@ #include #include +//Added by qt3to4: +#include +#include +#include #include #include #include -#include +#include #include #include #include #include -#include +#include #include "softwareimporters.h" #include "basket.h" @@ -46,9 +50,9 @@ TreeImportDialog::TreeImportDialog(QWidget *parent) KDialogBase::Ok, parent, /*name=*/"ImportHierarchy", /*modal=*/true, /*separator=*/false) { QWidget *page = new QWidget(this); - QVBoxLayout *topLayout = new QVBoxLayout(page, /*margin=*/0, spacingHint()); + Q3VBoxLayout *topLayout = new Q3VBoxLayout(page, /*margin=*/0, spacingHint()); - m_choices = new QVButtonGroup(i18n("How to Import the Notes?"), page); + m_choices = new Q3VButtonGroup(i18n("How to Import the Notes?"), page); new QRadioButton(i18n("&Keep original hierarchy (all notes in separate baskets)"), m_choices); new QRadioButton(i18n("&First level notes in separate baskets"), m_choices); new QRadioButton(i18n("&All notes in one basket"), m_choices); @@ -75,9 +79,9 @@ TextFileImportDialog::TextFileImportDialog(QWidget *parent) KDialogBase::Ok, parent, /*name=*/"ImportTextFile", /*modal=*/true, /*separator=*/false) { QWidget *page = new QWidget(this); - QVBoxLayout *topLayout = new QVBoxLayout(page, /*margin=*/0, spacingHint()); + Q3VBoxLayout *topLayout = new Q3VBoxLayout(page, /*margin=*/0, spacingHint()); - m_choices = new QVButtonGroup(i18n("Format of the Text File"), page); + m_choices = new Q3VButtonGroup(i18n("Format of the Text File"), page); new QRadioButton(i18n("Notes separated by an &empty line"), m_choices); new QRadioButton(i18n("One ¬e per line"), m_choices); new QRadioButton(i18n("Notes begin with a &dash (-)"), m_choices); @@ -85,9 +89,9 @@ TextFileImportDialog::TextFileImportDialog(QWidget *parent) m_anotherSeparator = new QRadioButton(i18n("&Use another separator:"), m_choices); QWidget *indentedTextEdit = new QWidget(m_choices); - QHBoxLayout *hLayout = new QHBoxLayout(indentedTextEdit, /*margin=*/0, spacingHint()); + Q3HBoxLayout *hLayout = new Q3HBoxLayout(indentedTextEdit, /*margin=*/0, spacingHint()); hLayout->addSpacing(20); - m_customSeparator = new QTextEdit(indentedTextEdit); + m_customSeparator = new Q3TextEdit(indentedTextEdit); m_customSeparator->setTextFormat(Qt::PlainText); hLayout->addWidget(m_customSeparator); m_choices->insertChild(indentedTextEdit); @@ -239,9 +243,9 @@ void SoftwareImporters::importKJots() for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { // For each file QFile file(dirPath + *it); - if (file.open(IO_ReadOnly)) { - QTextStream stream(&file); - stream.setEncoding(QTextStream::Locale); + if (file.open(QIODevice::ReadOnly)) { + Q3TextStream stream(&file); + stream.setEncoding(Q3TextStream::Locale); QString buf = stream.readLine(); // IT IS A NOTEBOOK FILE, AT THE VERION 0.6.x and older: @@ -317,9 +321,9 @@ void SoftwareImporters::importKNotes() if ( ! (*it).endsWith(".ics") ) // Don't process *.ics~ and otehr files continue; QFile file(dirPath + *it); - if (file.open(IO_ReadOnly)) { - QTextStream stream(&file); - stream.setEncoding(QTextStream::UnicodeUTF8); + if (file.open(QIODevice::ReadOnly)) { + Q3TextStream stream(&file); + stream.setEncoding(Q3TextStream::UnicodeUTF8); // First create a basket for it: BasketFactory::newBasket(/*icon=*/"knotes", /*name=*/i18n("From KNotes"), /*backgroundImage=*/"", /*backgroundColor=*/QColor(), /*textColor=*/QColor(), /*templateName=*/"1column", /*createIn=*/0); @@ -414,9 +418,9 @@ void SoftwareImporters::importStickyNotes() QString loadUtf8FileToString(const QString &fileName) { QFile file(fileName); - if (file.open(IO_ReadOnly)) { - QTextStream stream(&file); - stream.setEncoding(QTextStream::UnicodeUTF8); + if (file.open(QIODevice::ReadOnly)) { + Q3TextStream stream(&file); + stream.setEncoding(Q3TextStream::UnicodeUTF8); QString text; text = stream.read(); file.close(); @@ -481,9 +485,9 @@ void SoftwareImporters::importTextFile() QString separator = dialog.separator(); QFile file(fileName); - if (file.open(IO_ReadOnly)) { - QTextStream stream(&file); - stream.setEncoding(QTextStream::Locale); + if (file.open(QIODevice::ReadOnly)) { + Q3TextStream stream(&file); + stream.setEncoding(Q3TextStream::Locale); QString content = stream.read(); QStringList list = (separator.isEmpty() ? QStringList(content) @@ -518,7 +522,7 @@ void SoftwareImporters::importKnowIt() QFile file(url.path()); QFileInfo info(url.path()); Basket* basket = 0; - QPtrStack baskets; + Q3PtrStack baskets; QString text; int hierarchy = 0; @@ -539,16 +543,16 @@ void SoftwareImporters::importKnowIt() basket->load(); baskets.push(basket); - if(file.open(IO_ReadOnly)) + if(file.open(QIODevice::ReadOnly)) { - QTextStream stream(&file); + Q3TextStream stream(&file); uint level = 0; QString name; QString line; QStringList links; QStringList descriptions; - stream.setEncoding(QTextStream::UnicodeUTF8); + stream.setEncoding(Q3TextStream::UnicodeUTF8); while(1) { line = stream.readLine(); diff --git a/src/softwareimporters.h b/src/softwareimporters.h index 4004fa0..1131d65 100644 --- a/src/softwareimporters.h +++ b/src/softwareimporters.h @@ -25,7 +25,7 @@ #include class QString; -class QVButtonGroup; +class Q3VButtonGroup; class QDomElement; class KTextEdit; @@ -43,7 +43,7 @@ class TreeImportDialog : public KDialogBase ~TreeImportDialog(); int choice(); private: - QVButtonGroup *m_choices; + Q3VButtonGroup *m_choices; }; /** The dialog to ask how to import text files. @@ -59,9 +59,9 @@ class TextFileImportDialog : public KDialogBase protected slots: void customSeparatorChanged(); private: - QVButtonGroup *m_choices; + Q3VButtonGroup *m_choices; QRadioButton *m_anotherSeparator; - QTextEdit *m_customSeparator; + Q3TextEdit *m_customSeparator; }; /** Functions that import data from other softwares. diff --git a/src/systemtray.cpp b/src/systemtray.cpp index 7265dc2..48b2aa5 100644 --- a/src/systemtray.cpp +++ b/src/systemtray.cpp @@ -21,9 +21,18 @@ /** KSystemTray2 */ // To draw the systray screenshot image: -#include +#include #include #include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include +#include +#include #include "linklabel.h" #include "note.h" @@ -94,9 +103,9 @@ void KSystemTray2::displayCloseMessage(QString fileMenu) // we should not show that screenshot but only a text! // 1. Determine if the user use a system tray area or not: - QCString screenstr; + Q3CString screenstr; screenstr.setNum(qt_xscreen()); - QCString trayatom = "_NET_SYSTEM_TRAY_S" + screenstr; + Q3CString trayatom = "_NET_SYSTEM_TRAY_S" + screenstr; bool useSystray = (KSelectionWatcher(trayatom).owner() != 0L); // 2. And then if the icon is visible too (eg. this->show() has been called): @@ -180,11 +189,11 @@ void KSystemTray2::displayCloseMessage(QString fileMenu) painter.end(); // Associate source to image and show the dialog: - QMimeSourceFactory::defaultFactory()->setPixmap("systray_shot", finalShot); + Q3MimeSourceFactory::defaultFactory()->setPixmap("systray_shot", finalShot); KMessageBox::information(kapp->activeWindow(), message + "

", i18n("Docking in System Tray"), "hideOnCloseInfo"); - QMimeSourceFactory::defaultFactory()->setData("systray_shot", 0L); + Q3MimeSourceFactory::defaultFactory()->setData("systray_shot", 0L); } else { KMessageBox::information(kapp->activeWindow(), message, diff --git a/src/systemtray.h b/src/systemtray.h index 8fc61a8..163081e 100644 --- a/src/systemtray.h +++ b/src/systemtray.h @@ -22,6 +22,15 @@ #define SYSTEMTRAY_H #include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include +#include +#include class MainWindow; diff --git a/src/tag.cpp b/src/tag.cpp index 29da91d..8c90735 100644 --- a/src/tag.cpp +++ b/src/tag.cpp @@ -25,6 +25,10 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -422,7 +426,7 @@ void Tag::saveTags() saveTagsTo(all, Global::savesFolder() + "tags.xml"); } -void Tag::saveTagsTo(QValueList &list, const QString &fullPath) +void Tag::saveTagsTo(Q3ValueList &list, const QString &fullPath) { // Create Document: QDomDocument document(/*doctype=*/"basketTags"); @@ -688,9 +692,9 @@ void Tag::createDefaultTagsSet(const QString &fullPath) // Write to Disk: QFile file(fullPath); - if (file.open(IO_WriteOnly)) { - QTextStream stream(&file); - stream.setEncoding(QTextStream::UnicodeUTF8); + if (file.open(QIODevice::WriteOnly)) { + Q3TextStream stream(&file); + stream.setEncoding(Q3TextStream::UnicodeUTF8); stream << "\n"; stream << xml; file.close(); @@ -849,7 +853,7 @@ QSize StateMenuItem::sizeHint() return QSize(iconSize + iconMargin() + textSize.width(), textSize.height()); } -QIconSet StateMenuItem::checkBoxIconSet(bool checked, QColorGroup cg) +QIcon StateMenuItem::checkBoxIconSet(bool checked, QColorGroup cg) { int width = kapp->style().pixelMetric(QStyle::PM_IndicatorWidth, 0); int height = kapp->style().pixelMetric(QStyle::PM_IndicatorHeight, 0); @@ -884,13 +888,13 @@ QIconSet StateMenuItem::checkBoxIconSet(bool checked, QColorGroup cg) kapp->style().drawPrimitive(QStyle::PE_Indicator, &painter, rect, cg, style); painter.end(); - QIconSet iconSet(pixmap); - iconSet.setPixmap(pixmapHover, QIconSet::Automatic, QIconSet::Active); - iconSet.setPixmap(pixmapDisabled, QIconSet::Automatic, QIconSet::Disabled); + QIcon iconSet(pixmap); + iconSet.setPixmap(pixmapHover, QIcon::Automatic, QIcon::Active); + iconSet.setPixmap(pixmapDisabled, QIcon::Automatic, QIcon::Disabled); return iconSet; } -QIconSet StateMenuItem::radioButtonIconSet(bool checked, QColorGroup cg) +QIcon StateMenuItem::radioButtonIconSet(bool checked, QColorGroup cg) { int width = kapp->style().pixelMetric(QStyle::PM_ExclusiveIndicatorWidth, 0); int height = kapp->style().pixelMetric(QStyle::PM_ExclusiveIndicatorHeight, 0); @@ -928,7 +932,7 @@ QIconSet StateMenuItem::radioButtonIconSet(bool checked, QColorGroup cg) painter.end(); pixmapHover.setMask(pixmapHover.createHeuristicMask()); - QIconSet iconSet(pixmap); - iconSet.setPixmap(pixmapHover, QIconSet::Automatic, QIconSet::Active); + QIcon iconSet(pixmap); + iconSet.setPixmap(pixmapHover, QIcon::Automatic, QIcon::Active); return iconSet; } diff --git a/src/tag.h b/src/tag.h index c285ac8..d89a220 100644 --- a/src/tag.h +++ b/src/tag.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -40,7 +40,7 @@ class State { public: /// LIST OF STATES: - typedef QValueList List; + typedef Q3ValueList List; public: /// CONSTRUCTOR AND DESTRUCTOR: @@ -110,14 +110,14 @@ class Tag { public: /// LIST OF ALL TAGS IN THE APPLICATION: - typedef QValueList List; + typedef Q3ValueList List; static Tag::List all; static State* stateForId(const QString &id); static Tag* tagForKAction(KAction *action); static Tag* tagSimilarTo(Tag *tagToTest); static QMap loadTags(const QString &path = QString()/*, bool merge = false*/); /// << Load the tags contained in the XML file @p path or those in the application settings if @p path isEmpty(). If @p merge is true and a tag with the id of a tag that should be loaded already exist, the tag will get a new id. Otherwise, the tag will be dismissed. static void saveTags(); - static void saveTagsTo(QValueList &list, const QString &fullPath); + static void saveTagsTo(Q3ValueList &list, const QString &fullPath); static void createDefaultTagsSet(const QString &file); static long getNextStateUid(); private: @@ -148,7 +148,7 @@ class Tag State::List m_states; }; -#include +#include #include #include @@ -190,8 +190,8 @@ class StateMenuItem : public QCustomMenuItem QString m_name; QString m_shortcut; public: - static QIconSet checkBoxIconSet(bool checked, QColorGroup cg); - static QIconSet radioButtonIconSet(bool checked, QColorGroup cg); + static QIcon checkBoxIconSet(bool checked, QColorGroup cg); + static QIcon radioButtonIconSet(bool checked, QColorGroup cg); static int iconMargin() { return 5; } }; diff --git a/src/tagsedit.cpp b/src/tagsedit.cpp index 8d9ba7e..c955afb 100644 --- a/src/tagsedit.cpp +++ b/src/tagsedit.cpp @@ -21,6 +21,14 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -29,9 +37,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -100,52 +108,52 @@ bool TagCopy::isMultiState() /** class TagListViewItem: */ -TagListViewItem::TagListViewItem(QListView *parent, TagCopy *tagCopy) - : QListViewItem(parent), m_tagCopy(tagCopy), m_stateCopy(0) +TagListViewItem::TagListViewItem(Q3ListView *parent, TagCopy *tagCopy) + : Q3ListViewItem(parent), m_tagCopy(tagCopy), m_stateCopy(0) { setText(0, tagCopy->newTag->name()); } -TagListViewItem::TagListViewItem(QListViewItem *parent, TagCopy *tagCopy) - : QListViewItem(parent), m_tagCopy(tagCopy), m_stateCopy(0) +TagListViewItem::TagListViewItem(Q3ListViewItem *parent, TagCopy *tagCopy) + : Q3ListViewItem(parent), m_tagCopy(tagCopy), m_stateCopy(0) { setText(0, tagCopy->newTag->name()); } -TagListViewItem::TagListViewItem(QListView *parent, QListViewItem *after, TagCopy *tagCopy) - : QListViewItem(parent, after), m_tagCopy(tagCopy), m_stateCopy(0) +TagListViewItem::TagListViewItem(Q3ListView *parent, Q3ListViewItem *after, TagCopy *tagCopy) + : Q3ListViewItem(parent, after), m_tagCopy(tagCopy), m_stateCopy(0) { setText(0, tagCopy->newTag->name()); } -TagListViewItem::TagListViewItem(QListViewItem *parent, QListViewItem *after, TagCopy *tagCopy) - : QListViewItem(parent, after), m_tagCopy(tagCopy), m_stateCopy(0) +TagListViewItem::TagListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after, TagCopy *tagCopy) + : Q3ListViewItem(parent, after), m_tagCopy(tagCopy), m_stateCopy(0) { setText(0, tagCopy->newTag->name()); } /* */ -TagListViewItem::TagListViewItem(QListView *parent, StateCopy *stateCopy) - : QListViewItem(parent), m_tagCopy(0), m_stateCopy(stateCopy) +TagListViewItem::TagListViewItem(Q3ListView *parent, StateCopy *stateCopy) + : Q3ListViewItem(parent), m_tagCopy(0), m_stateCopy(stateCopy) { setText(0, stateCopy->newState->name()); } -TagListViewItem::TagListViewItem(QListViewItem *parent, StateCopy *stateCopy) - : QListViewItem(parent), m_tagCopy(0), m_stateCopy(stateCopy) +TagListViewItem::TagListViewItem(Q3ListViewItem *parent, StateCopy *stateCopy) + : Q3ListViewItem(parent), m_tagCopy(0), m_stateCopy(stateCopy) { setText(0, stateCopy->newState->name()); } -TagListViewItem::TagListViewItem(QListView *parent, QListViewItem *after, StateCopy *stateCopy) - : QListViewItem(parent, after), m_tagCopy(0), m_stateCopy(stateCopy) +TagListViewItem::TagListViewItem(Q3ListView *parent, Q3ListViewItem *after, StateCopy *stateCopy) + : Q3ListViewItem(parent, after), m_tagCopy(0), m_stateCopy(stateCopy) { setText(0, stateCopy->newState->name()); } -TagListViewItem::TagListViewItem(QListViewItem *parent, QListViewItem *after, StateCopy *stateCopy) - : QListViewItem(parent, after), m_tagCopy(0), m_stateCopy(stateCopy) +TagListViewItem::TagListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after, StateCopy *stateCopy) + : Q3ListViewItem(parent, after), m_tagCopy(0), m_stateCopy(stateCopy) { setText(0, stateCopy->newState->name()); } @@ -186,14 +194,14 @@ TagListViewItem* TagListViewItem::prevSibling() TagListViewItem* TagListViewItem::parent() const { - return (TagListViewItem*) QListViewItem::parent(); + return (TagListViewItem*) Q3ListViewItem::parent(); } // TODO: TagListViewItem:: int TAG_ICON_SIZE = 16; int TAG_MARGIN = 1; -int TagListViewItem::width(const QFontMetrics &/* fontMetrics */, const QListView */*listView*/, int /* column */) const +int TagListViewItem::width(const QFontMetrics &/* fontMetrics */, const Q3ListView */*listView*/, int /* column */) const { return listView()->visibleWidth(); } @@ -264,7 +272,7 @@ void TagListViewItem::paintCell(QPainter *painter, const QColorGroup &/*colorGro /** class TagListView: */ TagListView::TagListView(QWidget *parent, const char *name, WFlags flags) - : QListView(parent, name, flags) + : Q3ListView(parent, name, flags) { } @@ -278,7 +286,7 @@ void TagListView::keyPressEvent(QKeyEvent *event) emit deletePressed(); else if (event->key() != Qt::Key_Left || (selectedItem() && selectedItem()->parent())) // Do not allow to open/close first-level items - QListView::keyPressEvent(event); + Q3ListView::keyPressEvent(event); } void TagListView::contentsMouseDoubleClickEvent(QMouseEvent *event) @@ -294,29 +302,29 @@ void TagListView::contentsMousePressEvent(QMouseEvent *event) { // When clicking on an empty space, QListView would unselect the current item! We forbid that! if (itemAt(contentsToViewport(event->pos())) != 0) - QListView::contentsMousePressEvent(event); + Q3ListView::contentsMousePressEvent(event); } void TagListView::contentsMouseReleaseEvent(QMouseEvent *event) { // When clicking on an empty space, QListView would unselect the current item! We forbid that! if (itemAt(contentsToViewport(event->pos())) != 0) - QListView::contentsMouseReleaseEvent(event); + Q3ListView::contentsMouseReleaseEvent(event); } TagListViewItem* TagListView::currentItem() const { - return (TagListViewItem*) QListView::currentItem(); + return (TagListViewItem*) Q3ListView::currentItem(); } TagListViewItem* TagListView::firstChild() const { - return (TagListViewItem*) QListView::firstChild(); + return (TagListViewItem*) Q3ListView::firstChild(); } TagListViewItem* TagListView::lastItem() const { - return (TagListViewItem*) QListView::lastItem(); + return (TagListViewItem*) Q3ListView::lastItem(); } /** class TagsEditDialog: */ @@ -326,7 +334,7 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT KDialogBase::Ok, parent, /*name=*/"CustomizeTags", /*modal=*/true, /*separator=*/true), m_loading(false) { - QHBoxLayout *layout = new QHBoxLayout(plainPage(), /*margin=*/0, spacingHint()); + Q3HBoxLayout *layout = new Q3HBoxLayout(plainPage(), /*margin=*/0, spacingHint()); /* Left part: */ @@ -341,7 +349,7 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT m_tags->setRootIsDecorated(false); m_tags->addColumn(""); m_tags->setSorting(-1); // Sort column -1, so disabled sorting - m_tags->setResizeMode(QListView::LastColumn); + m_tags->setResizeMode(Q3ListView::LastColumn); m_moveUp = new KPushButton( KGuiItem("", "1uparrow"), plainPage() ); m_moveDown = new KPushButton( KGuiItem("", "1downarrow"), plainPage() ); @@ -355,12 +363,12 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT connect( m_moveDown, SIGNAL(clicked()), this, SLOT(moveDown()) ); connect( m_deleteTag, SIGNAL(clicked()), this, SLOT(deleteTag()) ); - QHBoxLayout *topLeftLayout = new QHBoxLayout(0, /*margin=*/0, spacingHint()); + Q3HBoxLayout *topLeftLayout = new Q3HBoxLayout(0, /*margin=*/0, spacingHint()); topLeftLayout->addWidget(m_moveUp); topLeftLayout->addWidget(m_moveDown); topLeftLayout->addWidget(m_deleteTag); - QVBoxLayout *leftLayout = new QVBoxLayout(0, /*margin=*/0, spacingHint()); + Q3VBoxLayout *leftLayout = new Q3VBoxLayout(0, /*margin=*/0, spacingHint()); leftLayout->addWidget(newTag); leftLayout->addWidget(newState); leftLayout->addWidget(m_tags); @@ -372,7 +380,7 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT QWidget *rightWidget = new QWidget(plainPage()); - m_tagBox = new QGroupBox(1, Qt::Horizontal, i18n("Tag"), rightWidget); + m_tagBox = new Q3GroupBox(1, Qt::Horizontal, i18n("Tag"), rightWidget); QWidget *tagWidget = new QWidget(m_tagBox); m_tagName = new QLineEdit(tagWidget); @@ -386,7 +394,7 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT m_inherit = new QCheckBox(i18n("&Inherited by new sibling notes"), tagWidget); - QGridLayout *tagGrid = new QGridLayout(tagWidget, /*rows=*/3, /*cols=*/4, /*border=*/0, /*spacing=*/spacingHint()); + Q3GridLayout *tagGrid = new Q3GridLayout(tagWidget, /*rows=*/3, /*cols=*/4, /*border=*/0, /*spacing=*/spacingHint()); tagGrid->addWidget(tagNameLabel, 0, 0); tagGrid->addMultiCellWidget(m_tagName, /*fromRow=*/0, /*toRow=*/0, /*fromCol=*/1, /*toCol=*/3); tagGrid->addWidget(shortcutLabel, 1, 0); @@ -395,7 +403,7 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT tagGrid->addMultiCellWidget(m_inherit, /*fromRow=*/2, /*toRow=*/2, /*fromCol=*/0, /*toCol=*/3); tagGrid->setColStretch(/*col=*/3, /*stretch=*/255); - m_stateBox = new QGroupBox(1, Qt::Horizontal, i18n("State"), rightWidget); + m_stateBox = new Q3GroupBox(1, Qt::Horizontal, i18n("State"), rightWidget); QWidget *stateWidget = new QWidget(m_stateBox); m_stateName = new QLineEdit(stateWidget); @@ -417,7 +425,7 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT m_removeEmblem->setFixedHeight(height); m_emblem->resetIcon(); - QHBoxLayout *emblemLayout = new QHBoxLayout(emblemWidget, /*margin=*/0, spacingHint()); + Q3HBoxLayout *emblemLayout = new Q3HBoxLayout(emblemWidget, /*margin=*/0, spacingHint()); emblemLayout->addWidget(m_emblem); emblemLayout->addWidget(m_removeEmblem); emblemLayout->addStretch(); @@ -425,30 +433,30 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT m_backgroundColor = new KColorCombo2(QColor(), KGlobalSettings::baseColor(), stateWidget); QLabel *backgroundColorLabel = new QLabel(m_backgroundColor, i18n("&Background:"), stateWidget); - QHBoxLayout *backgroundColorLayout = new QHBoxLayout(0, /*margin=*/0, spacingHint()); + Q3HBoxLayout *backgroundColorLayout = new Q3HBoxLayout(0, /*margin=*/0, spacingHint()); backgroundColorLayout->addWidget(m_backgroundColor); backgroundColorLayout->addStretch(); - QIconSet boldIconSet = kapp->iconLoader()->loadIconSet("text_bold", KIcon::Small); + QIcon boldIconSet = kapp->iconLoader()->loadIconSet("text_bold", KIcon::Small); m_bold = new QPushButton(boldIconSet, "", stateWidget); m_bold->setToggleButton(true); int size = QMAX(m_bold->sizeHint().width(), m_bold->sizeHint().height()); m_bold->setFixedSize(size, size); // Make it square! QToolTip::add(m_bold, i18n("Bold")); - QIconSet underlineIconSet = kapp->iconLoader()->loadIconSet("text_under", KIcon::Small); + QIcon underlineIconSet = kapp->iconLoader()->loadIconSet("text_under", KIcon::Small); m_underline = new QPushButton(underlineIconSet, "", stateWidget); m_underline->setToggleButton(true); m_underline->setFixedSize(size, size); // Make it square! QToolTip::add(m_underline, i18n("Underline")); - QIconSet italicIconSet = kapp->iconLoader()->loadIconSet("text_italic", KIcon::Small); + QIcon italicIconSet = kapp->iconLoader()->loadIconSet("text_italic", KIcon::Small); m_italic = new QPushButton(italicIconSet, "", stateWidget); m_italic->setToggleButton(true); m_italic->setFixedSize(size, size); // Make it square! QToolTip::add(m_italic, i18n("Italic")); - QIconSet strikeIconSet = kapp->iconLoader()->loadIconSet("text_strike", KIcon::Small); + QIcon strikeIconSet = kapp->iconLoader()->loadIconSet("text_strike", KIcon::Small); m_strike = new QPushButton(strikeIconSet, "", stateWidget); m_strike->setToggleButton(true); m_strike->setFixedSize(size, size); // Make it square! @@ -456,7 +464,7 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT QLabel *textLabel = new QLabel(m_bold, i18n("&Text:"), stateWidget); - QHBoxLayout *textLayout = new QHBoxLayout(0, /*margin=*/0, spacingHint()); + Q3HBoxLayout *textLayout = new Q3HBoxLayout(0, /*margin=*/0, spacingHint()); textLayout->addWidget(m_bold); textLayout->addWidget(m_underline); textLayout->addWidget(m_italic); @@ -480,7 +488,7 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT m_textEquivalent->setFont(font); QPixmap textEquivalentPixmap(KGlobal::dirs()->findResource("data", "basket/images/tag_export_help.png")); - QMimeSourceFactory::defaultFactory()->setPixmap("__resource_help_tag_export.png", textEquivalentPixmap); + Q3MimeSourceFactory::defaultFactory()->setPixmap("__resource_help_tag_export.png", textEquivalentPixmap); HelpLabel *textEquivalentHelp = new HelpLabel( i18n("When does this apply?"), "

" + i18n("It does apply when you copy and paste, or drag and drop notes to a text editor.") + "

" + @@ -489,25 +497,25 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT "representing an empty checkbox and a checked box.") + "

" + "

", stateWidget); - QHBoxLayout *textEquivalentHelpLayout = new QHBoxLayout((QWidget*)0, /*border=*/0, spacingHint()); + Q3HBoxLayout *textEquivalentHelpLayout = new Q3HBoxLayout((QWidget*)0, /*border=*/0, spacingHint()); textEquivalentHelpLayout->addWidget(textEquivalentHelp); textEquivalentHelpLayout->addStretch(255); m_onEveryLines = new QCheckBox(i18n("On ever&y line"), stateWidget); QPixmap onEveryLinesPixmap(KGlobal::dirs()->findResource("data", "basket/images/tag_export_on_every_lines_help.png")); - QMimeSourceFactory::defaultFactory()->setPixmap("__resource_help_tag_export_on_every_lines.png", onEveryLinesPixmap); + Q3MimeSourceFactory::defaultFactory()->setPixmap("__resource_help_tag_export_on_every_lines.png", onEveryLinesPixmap); HelpLabel *onEveryLinesHelp = new HelpLabel( i18n("What does it mean?"), "

" + i18n("When a note has several lines, you can choose to export the tag or the state on the first line or on every line of the note.") + "

" + "

" + "

" + i18n("In the example above, the tag of the top note is only exported on the first line, while the tag of the bottom note is exported on every line of the note."), stateWidget); - QHBoxLayout *onEveryLinesHelpLayout = new QHBoxLayout((QWidget*)0, /*border=*/0, spacingHint()); + Q3HBoxLayout *onEveryLinesHelpLayout = new Q3HBoxLayout((QWidget*)0, /*border=*/0, spacingHint()); onEveryLinesHelpLayout->addWidget(onEveryLinesHelp); onEveryLinesHelpLayout->addStretch(255); - QGridLayout *textEquivalentGrid = new QGridLayout(0, /*rows=*/2, /*cols=*/4, /*border=*/0, /*spacing=*/spacingHint()); + Q3GridLayout *textEquivalentGrid = new Q3GridLayout(0, /*rows=*/2, /*cols=*/4, /*border=*/0, /*spacing=*/spacingHint()); textEquivalentGrid->addWidget(textEquivalentLabel, 0, 0); textEquivalentGrid->addWidget(m_textEquivalent, 0, 1); textEquivalentGrid->addLayout(textEquivalentHelpLayout, 0, 2); @@ -517,7 +525,7 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT KSeparator *separator = new KSeparator(Qt::Horizontal, stateWidget); - QGridLayout *stateGrid = new QGridLayout(stateWidget, /*rows=*/6, /*cols=*/7, /*border=*/0, /*spacing=*/spacingHint()); + Q3GridLayout *stateGrid = new Q3GridLayout(stateWidget, /*rows=*/6, /*cols=*/7, /*border=*/0, /*spacing=*/spacingHint()); stateGrid->addWidget(m_stateNameLabel, 0, 0); stateGrid->addMultiCellWidget(m_stateName, /*fromRow=*/0, /*toRow=*/0, /*fromCol=*/1, /*toCol=*/6); stateGrid->addWidget(emblemLabel, 1, 0); @@ -535,7 +543,7 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT stateGrid->addMultiCellWidget(separator, /*fromRow=*/4, /*toRow=*/4, /*fromCol=*/0, /*toCol=*/6); stateGrid->addMultiCellLayout(textEquivalentGrid, /*fromRow=*/5, /*toRow=*/5, /*fromCol=*/0, /*toCol=*/6); - QVBoxLayout *rightLayout = new QVBoxLayout(rightWidget, /*margin=*/0, spacingHint()); + Q3VBoxLayout *rightLayout = new Q3VBoxLayout(rightWidget, /*margin=*/0, spacingHint()); rightLayout->addWidget(m_tagBox); rightLayout->addWidget(m_stateBox); rightLayout->addStretch(); @@ -604,11 +612,11 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT connect( m_textEquivalent, SIGNAL(textChanged(const QString&)), this, SLOT(modified()) ); connect( m_onEveryLines, SIGNAL(stateChanged(int)), this, SLOT(modified()) ); - connect( m_tags, SIGNAL(currentChanged(QListViewItem*)), this, SLOT(currentItemChanged(QListViewItem*)) ); + connect( m_tags, SIGNAL(currentChanged(Q3ListViewItem*)), this, SLOT(currentItemChanged(Q3ListViewItem*)) ); connect( m_tags, SIGNAL(deletePressed()), this, SLOT(deleteTag()) ); connect( m_tags, SIGNAL(doubleClickedItem()), this, SLOT(renameIt()) ); - QListViewItem *firstItem = m_tags->firstChild(); + Q3ListViewItem *firstItem = m_tags->firstChild(); if (stateToEdit != 0) { TagListViewItem *item = itemForState(stateToEdit); if (item) @@ -687,9 +695,9 @@ void TagsEditDialog::resetTreeSizeHint() TagListViewItem* TagsEditDialog::itemForState(State *state) { // Browse all tags: - QListViewItemIterator it(m_tags); + Q3ListViewItemIterator it(m_tags); while (it.current()) { - QListViewItem *item = it.current(); + Q3ListViewItem *item = it.current(); // Return if we found the tag item: TagListViewItem *tagItem = (TagListViewItem*)item; @@ -697,9 +705,9 @@ TagListViewItem* TagsEditDialog::itemForState(State *state) return tagItem; // Browser all sub-states: - QListViewItemIterator it2(item); + Q3ListViewItemIterator it2(item); while (it2.current()) { - QListViewItem *subItem = it2.current(); + Q3ListViewItem *subItem = it2.current(); // Return if we found the state item: TagListViewItem *stateItem = (TagListViewItem*)subItem; @@ -1010,7 +1018,7 @@ void TagsEditDialog::modified() m_onEveryLines->setEnabled(!m_textEquivalent->text().isEmpty()); } -void TagsEditDialog::currentItemChanged(QListViewItem *item) +void TagsEditDialog::currentItemChanged(Q3ListViewItem *item) { if (item == 0) return; diff --git a/src/tagsedit.h b/src/tagsedit.h index 1ee9665..a8e384e 100644 --- a/src/tagsedit.h +++ b/src/tagsedit.h @@ -23,10 +23,14 @@ #include #include -#include -#include +#include +#include +//Added by qt3to4: +#include +#include +#include -class QGroupBox; +class Q3GroupBox; class QLineEdit; class QCheckBox; class KPushButton; @@ -46,7 +50,7 @@ class State; class StateCopy { public: - typedef QValueList List; + typedef Q3ValueList List; StateCopy(State *old = 0); ~StateCopy(); State *oldState; @@ -57,7 +61,7 @@ class StateCopy class TagCopy { public: - typedef QValueList List; + typedef Q3ValueList List; TagCopy(Tag *old = 0); ~TagCopy(); Tag *oldTag; @@ -67,17 +71,17 @@ class TagCopy bool isMultiState(); }; -class TagListViewItem : public QListViewItem +class TagListViewItem : public Q3ListViewItem { public: - TagListViewItem(QListView *parent, TagCopy *tagCopy); - TagListViewItem(QListViewItem *parent, TagCopy *tagCopy); - TagListViewItem(QListView *parent, QListViewItem *after, TagCopy *tagCopy); - TagListViewItem(QListViewItem *parent, QListViewItem *after, TagCopy *tagCopy); - TagListViewItem(QListView *parent, StateCopy *stateCopy); - TagListViewItem(QListViewItem *parent, StateCopy *stateCopy); - TagListViewItem(QListView *parent, QListViewItem *after, StateCopy *stateCopy); - TagListViewItem(QListViewItem *parent, QListViewItem *after, StateCopy *stateCopy); + TagListViewItem(Q3ListView *parent, TagCopy *tagCopy); + TagListViewItem(Q3ListViewItem *parent, TagCopy *tagCopy); + TagListViewItem(Q3ListView *parent, Q3ListViewItem *after, TagCopy *tagCopy); + TagListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after, TagCopy *tagCopy); + TagListViewItem(Q3ListView *parent, StateCopy *stateCopy); + TagListViewItem(Q3ListViewItem *parent, StateCopy *stateCopy); + TagListViewItem(Q3ListView *parent, Q3ListViewItem *after, StateCopy *stateCopy); + TagListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after, StateCopy *stateCopy); ~TagListViewItem(); TagCopy* tagCopy() { return m_tagCopy; } StateCopy* stateCopy() { return m_stateCopy; } @@ -85,7 +89,7 @@ class TagListViewItem : public QListViewItem TagListViewItem* lastChild(); TagListViewItem* prevSibling(); TagListViewItem* parent() const; // Reimplemented to cast the return value - int width(const QFontMetrics &fontMetrics, const QListView *listView, int column) const; + int width(const QFontMetrics &fontMetrics, const Q3ListView *listView, int column) const; void setup(); void paintCell(QPainter *painter, const QColorGroup &colorGroup, int column, int width, int align); @@ -94,7 +98,7 @@ class TagListViewItem : public QListViewItem StateCopy *m_stateCopy; }; -class TagListView : public QListView +class TagListView : public Q3ListView { Q_OBJECT public: @@ -135,7 +139,7 @@ class TagsEditDialog : public KDialogBase void removeShortcut(); void removeEmblem(); void modified(); - void currentItemChanged(QListViewItem *item); + void currentItemChanged(Q3ListViewItem *item); void slotCancel(); void slotOk(); void selectUp(); @@ -158,8 +162,8 @@ class TagsEditDialog : public KDialogBase KKeyButton *m_shortcut; QPushButton *m_removeShortcut; QCheckBox *m_inherit; - QGroupBox *m_tagBox; - QGroupBox *m_stateBox; + Q3GroupBox *m_tagBox; + Q3GroupBox *m_stateBox; QLabel *m_stateNameLabel; QLineEdit *m_stateName; KIconButton *m_emblem; diff --git a/src/tools.cpp b/src/tools.cpp index a4435fd..0eed15d 100644 --- a/src/tools.cpp +++ b/src/tools.cpp @@ -22,21 +22,24 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include #include #include -#include +#include +//Added by qt3to4: +#include +#include #include "tools.h" -QMemArray StopWatch::starts; -QMemArray StopWatch::totals; -QMemArray StopWatch::counts; +Q3MemArray StopWatch::starts; +Q3MemArray StopWatch::totals; +Q3MemArray StopWatch::counts; void StopWatch::start(uint id) { @@ -70,7 +73,7 @@ QString Tools::textToHTML(const QString &text) return "

 

"; // convertFromPlainText() replace "\n\n" by "

\n

": we don't want that - QString htmlString = QStyleSheet::convertFromPlainText(text, QStyleSheetItem::WhiteSpaceNormal); + QString htmlString = Q3StyleSheet::convertFromPlainText(text, Q3StyleSheetItem::WhiteSpaceNormal); return htmlString.replace("

\n", "
\n
\n").replace("\n

", "\n"); // Don't replace first and last tags } @@ -162,8 +165,8 @@ QString Tools::htmlToText(const QString &html) QString tag, tag3; // To manage lists: int deep = 0; // The deep of the current line in imbriqued lists - QValueStack ul; // true if current list is a

    one, false if it's an
      one - QValueStack lines; // The line number if it is an
        list + Q3ValueStack ul; // true if current list is a
          one, false if it's an
            one + Q3ValueStack lines; // The line number if it is an
              list // We're removing every other tags, or replace them in the case of li: while ( (pos = text.find("<"), pos) != -1 ) { // What is the current tag? @@ -428,7 +431,7 @@ bool Tools::isAFileCut(QMimeSource *source) { if (source->provides("application/x-kde-cutselection")) { QByteArray array = source->encodedData("application/x-kde-cutselection"); - return !array.isEmpty() && QCString(array.data(), array.size() + 1).at(0) == '1'; + return !array.isEmpty() && Q3CString(array.data(), array.size() + 1).at(0) == '1'; } else return false; } diff --git a/src/tools.h b/src/tools.h index d37577f..d6ee415 100644 --- a/src/tools.h +++ b/src/tools.h @@ -1,3 +1,6 @@ +//Added by qt3to4: +#include +#include /*************************************************************************** * Copyright (C) 2003 by Sébastien Laoût * * slaout@linux62.org * @@ -31,9 +34,9 @@ class StopWatch static void start(uint id); static void check(uint id); private: - static QMemArray starts; - static QMemArray totals; - static QMemArray counts; + static Q3MemArray starts; + static Q3MemArray totals; + static Q3MemArray counts; }; /** Some useful functions for that application. diff --git a/src/variouswidgets.cpp b/src/variouswidgets.cpp index 941efb3..1a8dd81 100644 --- a/src/variouswidgets.cpp +++ b/src/variouswidgets.cpp @@ -25,12 +25,18 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include +#include +#include #include #include -#include +#include #include #include -#include +#include #include #include "variouswidgets.h" @@ -42,7 +48,7 @@ RunCommandRequester::RunCommandRequester(const QString &runCommand, const QStrin { m_message = message; - QHBoxLayout *layout = new QHBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint()); + Q3HBoxLayout *layout = new Q3HBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint()); m_runCommand = new QLineEdit(runCommand, this); QPushButton *pb = new QPushButton(/*"C&hoose..."*/i18n("..."), this); @@ -163,7 +169,7 @@ HelpLabel::~HelpLabel() void HelpLabel::showMessage() { - QWhatsThis::display(m_message, mapToGlobal( QPoint(width() / 2, height()) )); + Q3WhatsThis::display(m_message, mapToGlobal( QPoint(width() / 2, height()) )); } void HelpLabel::keyPressEvent(QKeyEvent *event) @@ -180,7 +186,7 @@ class UndraggableKIconView : public KIconView { public: UndraggableKIconView(QWidget * parent = 0, const char * name = 0, WFlags f = 0) : KIconView(parent, name, f) {} - QDragObject* dragObject() { return 0; } + Q3DragObject* dragObject() { return 0; } }; IconSizeDialog::IconSizeDialog(const QString &caption, const QString &message, const QString &icon, int iconSize, QWidget *parent) @@ -188,7 +194,7 @@ IconSizeDialog::IconSizeDialog(const QString &caption, const QString &message, c KDialogBase::Ok, parent, /*name=*/0, /*modal=*/true, /*separator=*/false) { QWidget *page = new QWidget(this); - QVBoxLayout *topLayout = new QVBoxLayout(page, /*margin=*/0, spacingHint()); + Q3VBoxLayout *topLayout = new Q3VBoxLayout(page, /*margin=*/0, spacingHint()); QLabel *label = new QLabel(message, page); topLayout->addWidget(label); @@ -216,8 +222,8 @@ IconSizeDialog::IconSizeDialog(const QString &caption, const QString &message, c case 128: iconView->setSelected(m_size128, true); m_iconSize = 128; break; } - connect( iconView, SIGNAL(executed(QIconViewItem*)), this, SLOT(choose(QIconViewItem*)) ); - connect( iconView, SIGNAL(returnPressed(QIconViewItem*)), this, SLOT(choose(QIconViewItem*)) ); + connect( iconView, SIGNAL(executed(Q3IconViewItem*)), this, SLOT(choose(Q3IconViewItem*)) ); + connect( iconView, SIGNAL(returnPressed(Q3IconViewItem*)), this, SLOT(choose(Q3IconViewItem*)) ); connect( iconView, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged()) ); setMainWidget(page); @@ -249,7 +255,7 @@ void IconSizeDialog::slotSelectionChanged() } } -void IconSizeDialog::choose(QIconViewItem*) +void IconSizeDialog::choose(Q3IconViewItem*) { actionButton(KDialogBase::Ok)->animateClick(); } @@ -269,8 +275,8 @@ FontSizeCombo::FontSizeCombo(bool rw, bool withDefault, QWidget *parent, const c insertItem(i18n("(Default)")); QFontDatabase fontDB; - QValueList sizes = fontDB.standardSizes(); - for (QValueList::Iterator it = sizes.begin(); it != sizes.end(); ++it) + Q3ValueList sizes = fontDB.standardSizes(); + for (Q3ValueList::Iterator it = sizes.begin(); it != sizes.end(); ++it) insertItem(QString::number(*it)); // connect( this, SIGNAL(acivated(const QString&)), this, SLOT(textChangedInCombo(const QString&)) ); diff --git a/src/variouswidgets.h b/src/variouswidgets.h index 3899cf4..8592ff4 100644 --- a/src/variouswidgets.h +++ b/src/variouswidgets.h @@ -22,6 +22,9 @@ #define VARIOUSWIDGETS_H #include +//Added by qt3to4: +#include +#include #include #include #include @@ -30,7 +33,7 @@ class QLineEdit; class KIconViewItem; -class QIconViewItem; +class Q3IconViewItem; class Basket; @@ -114,7 +117,7 @@ class IconSizeDialog : public KDialogBase protected slots: void slotCancel(); void slotSelectionChanged(); - void choose(QIconViewItem*); + void choose(Q3IconViewItem*); private: KIconViewItem *m_size16; KIconViewItem *m_size22; diff --git a/src/xmlwork.cpp b/src/xmlwork.cpp index 3037ced..1ca57b2 100644 --- a/src/xmlwork.cpp +++ b/src/xmlwork.cpp @@ -29,7 +29,7 @@ QDomDocument* XMLWork::openFile(const QString &name, const QString &filePath) { QDomDocument *doc = new QDomDocument(name); QFile file(filePath); - if ( ! file.open(IO_ReadOnly) ) { + if ( ! file.open(QIODevice::ReadOnly) ) { // QMessageBox::information(this, "Load an XML file", "Error : un-openable file"); delete doc; return 0; -- 2.11.4.GIT