summaryrefslogtreecommitdiff
path: root/packages/portabase/portabase-1.9
diff options
context:
space:
mode:
Diffstat (limited to 'packages/portabase/portabase-1.9')
-rw-r--r--packages/portabase/portabase-1.9/fileselector.patch128
-rw-r--r--packages/portabase/portabase-1.9/qt2310-fontbug.patch11
-rw-r--r--packages/portabase/portabase-1.9/qtopia.patch70
-rw-r--r--packages/portabase/portabase-1.9/qtversion.patch101
4 files changed, 0 insertions, 310 deletions
diff --git a/packages/portabase/portabase-1.9/fileselector.patch b/packages/portabase/portabase-1.9/fileselector.patch
deleted file mode 100644
index 7f70c347e5..0000000000
--- a/packages/portabase/portabase-1.9/fileselector.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -urN portabase.orig/fileselector.cpp portabase/fileselector.cpp
---- portabase.orig/fileselector.cpp 2004-09-02 20:06:38.000000000 +0200
-+++ portabase/fileselector.cpp 2004-09-02 20:59:22.000000000 +0200
-@@ -43,8 +43,8 @@
-
- bool PBFileSelector::duplicate()
- {
-- const DocLnk *selection = selected();
-- if (selection == 0) {
-+ DocLnk selection(selectedDocument());
-+ if (!selection.isValid()) {
- return FALSE;
- }
- bool ok;
-@@ -56,7 +56,7 @@
- DocLnk copy;
- configureDocLnk(copy, name);
- FileManager fm;
-- ok = fm.copyFile(*selection, copy);
-+ ok = fm.copyFile(selection, copy);
- }
- if (ok) {
- reread();
-@@ -65,14 +65,13 @@
- QMessageBox::warning(this, QQDialog::tr("PortaBase"),
- tr("Unable to create new file"));
- }
-- delete selection;
- return ok;
- }
-
- bool PBFileSelector::rename()
- {
-- const DocLnk *selection = selected();
-- if (selection == 0) {
-+ DocLnk selection(selectedDocument());
-+ if (!selection.isValid()) {
- return FALSE;
- }
- bool ok;
-@@ -88,9 +87,9 @@
- configureDocLnk(copy, name);
- // actual moving would be more efficient, but harder to implement...
- FileManager fm;
-- if (fm.copyFile(*selection, copy)) {
-- QFile::remove(selection->file());
-- QFile::remove(selection->linkFile());
-+ if (fm.copyFile(selection, copy)) {
-+ QFile::remove(selection.file());
-+ QFile::remove(selection.linkFile());
- ok = TRUE;
- }
- else {
-@@ -104,7 +103,6 @@
- QMessageBox::warning(this, QQDialog::tr("PortaBase"),
- tr("Unable to rename the file"));
- }
-- delete selection;
- return ok;
- }
-
-diff -urN portabase.orig/importdialog.cpp portabase/importdialog.cpp
---- portabase.orig/importdialog.cpp 2004-09-02 20:06:38.000000000 +0200
-+++ portabase/importdialog.cpp 2004-09-02 20:54:47.000000000 +0200
-@@ -130,14 +130,13 @@
- int result = QDialog::exec();
- if (result && !importDone) {
- // "OK" was clicked...see if there is a selected file
-- const DocLnk *f = selector->selected();
-- if (!f) {
-+ DocLnk f(selector->selectedDocument());
-+ if (!f.isValid()) {
- return QDialog::Rejected;
- }
-- if (!import(f->file())) {
-+ if (!import(f.file())) {
- result = QDialog::Rejected;
- }
-- delete f;
- }
- return result;
- }
-diff -urN portabase.orig/portabase.cpp portabase/portabase.cpp
---- portabase.orig/portabase.cpp 2004-09-02 20:06:38.000000000 +0200
-+++ portabase/portabase.cpp 2004-09-02 20:56:58.000000000 +0200
-@@ -527,12 +527,11 @@
-
- void PortaBase::openFile()
- {
-- const DocLnk *selection = fileSelector->selected();
-- if (selection == 0) {
-+ DocLnk selection (fileSelector->selectedDocument());
-+ if (!selection.isValid()) {
- return;
- }
-- openFile(*selection);
-- delete selection;
-+ openFile(selection);
- }
-
- void PortaBase::openFile(const QString &f)
-@@ -591,21 +590,19 @@
-
- void PortaBase::deleteFile()
- {
-- const DocLnk *selection = fileSelector->selected();
-- if (selection == 0) {
-+ DocLnk selection(fileSelector->selectedDocument());
-+ if (!selection.isValid()) {
- return;
- }
- if (QMessageBox::warning(this, QQDialog::tr("PortaBase"), tr("Delete")
-- + " \"" + selection->name() + "\"\n"
-+ + " \"" + selection.name() + "\"\n"
- + tr("Are you sure?"),
- QObject::tr("Yes"), QObject::tr("No"),
- QString::null, 1) > 0) {
-- delete selection;
- return;
- }
-- QFile::remove(selection->file());
-- QFile::remove(selection->linkFile());
-- delete selection;
-+ QFile::remove(selection.file());
-+ QFile::remove(selection.linkFile());
- fileSelector->reread();
- }
-
diff --git a/packages/portabase/portabase-1.9/qt2310-fontbug.patch b/packages/portabase/portabase-1.9/qt2310-fontbug.patch
deleted file mode 100644
index 3999ca35dc..0000000000
--- a/packages/portabase/portabase-1.9/qt2310-fontbug.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- portabase/preferences.cpp.orig 2005-02-13 22:48:10 +0100
-+++ portabase/preferences.cpp 2005-02-13 22:48:06 +0100
-@@ -154,7 +154,7 @@
- {
- QWidget *appearanceTab = new QWidget(tabs);
- QVBoxLayout *layout = new QVBoxLayout(appearanceTab);
--#if defined(Q_WS_QWS)
-+#if defined(Q_WS_QWS) && QT_VERSION <= 239
- sizeFactor = 10;
- #else
- sizeFactor = 1;
diff --git a/packages/portabase/portabase-1.9/qtopia.patch b/packages/portabase/portabase-1.9/qtopia.patch
deleted file mode 100644
index a3a80776db..0000000000
--- a/packages/portabase/portabase-1.9/qtopia.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- portabase/portabase.pro~qtopia
-+++ portabase/portabase.pro
-@@ -7,7 +7,7 @@
- portabase_zh_TW.ts
- # determine which version to compile for
- # options are desktop, qtopia, or sharp (add "test" for the test environment)
--CONFIG += desktop
-+CONFIG += qtopia
-
- # Files common between all versions
- HEADERS = portabase.h \
-@@ -120,7 +120,7 @@
- metakitfuncs.cpp
-
- # Stuff for all Linux/UNIX versions
--unix:LIBS += -lm -lmk4 -lbeecrypt -ljpeg
-+unix:LIBS += -lm -lmk4 -lbeecrypt -ljpeg -lstdc++
-
- # Stuff for older Zaurus ROMs
- qtopia:CONFIG += zaurus
-@@ -155,44 +155,3 @@
- dynamicedit.cpp \
- inputdialog.cpp
-
--# Stuff for the Qtopia test environment
--test:TMAKE_CC = gcc-2.95
--test:TMAKE_CXX = g++-2.95
--
--# Stuff for all desktop versions
--desktop:CONFIG += thread
--desktop:HEADERS += desktop/QtaDatePicker.h \
-- desktop/applnk.h \
-- desktop/config.h \
-- desktop/dynamicedit.h \
-- desktop/filemanager.h \
-- desktop/fileselector.h \
-- desktop/helpbrowser.h \
-- desktop/importdialog.h \
-- desktop/newfiledialog.h \
-- desktop/oldconfig.h \
-- desktop/qpeapplication.h \
-- desktop/resource.h \
-- desktop/timestring.h
--desktop:SOURCES += desktop/QtaDatePicker.cpp \
-- desktop/applnk.cpp \
-- desktop/config.cpp \
-- desktop/dynamicedit.cpp \
-- desktop/filemanager.cpp \
-- desktop/fileselector.cpp \
-- desktop/helpbrowser.cpp \
-- desktop/importdialog.cpp \
-- desktop/newfiledialog.cpp \
-- desktop/oldconfig.cpp \
-- desktop/qpeapplication.cpp \
-- desktop/resource.cpp \
-- desktop/timestring.cpp
--
--# Stuff for Windows
--win32:LIBS += mk4vc60s.lib beecrypt.lib libjpeg.lib
--win32:DEFINES += QT_DLL
--win32:RC_FILE = portabase.rc
--win32:QMAKE_CXXFLAGS_RELEASE += /MD
--win32:INCLUDEPATH += D:\Devel\metakit-2.4.9.3\include \
-- D:\Devel\jpeg-6b \
-- D:\Devel
diff --git a/packages/portabase/portabase-1.9/qtversion.patch b/packages/portabase/portabase-1.9/qtversion.patch
deleted file mode 100644
index e7e93d0544..0000000000
--- a/packages/portabase/portabase-1.9/qtversion.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- /dev/null
-+++ portabase/packages/portabase/portabase-1.9/qtversion.patch
-@@ -0,0 +1,49 @@
-+
-+#
-+# Patch managed by http://www.holgerschurig.de/patcher.html
-+#
-+
-+--- portabase/datewidget.cpp~qtversion.patch
-++++ portabase/datewidget.cpp
-+@@ -21,7 +21,7 @@
-+ #include "desktop/resource.h"
-+ #endif
-+
-+-#if QT_VERSION >= 300
-++#if QT_VERSION >= 0x030000
-+ #include "desktop/QtaDatePicker.h"
-+ #else
-+ #include "QtaDatePicker.h"
-+--- portabase/metakitfuncs.cpp~qtversion.patch
-++++ portabase/metakitfuncs.cpp
-+@@ -19,7 +19,7 @@
-+
-+ int compareStrings(const QString &s1, const QString &s2)
-+ {
-+-#if QT_VERSION >= 300
-++#if QT_VERSION >= 0x030000
-+ return s1.localeAwareCompare(s2);
-+ #else
-+ // do the right thing for null and empty
-+--- portabase/roweditor.cpp~qtversion.patch
-++++ portabase/roweditor.cpp
-+@@ -26,7 +26,7 @@
-+ #include "roweditor.h"
-+ #include "timewidget.h"
-+
-+-#if QT_VERSION >= 300
-++#if QT_VERSION >= 0x030000
-+ #include "desktop/dynamicedit.h"
-+ #else
-+ #include "dynamicedit.h"
-+--- portabase/shadedlistitem.cpp~qtversion.patch
-++++ portabase/shadedlistitem.cpp
-+@@ -45,7 +45,7 @@
-+ void ShadedListItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment)
-+ {
-+ QColorGroup colors(cg);
-+-#if QT_VERSION >=300
-++#if QT_VERSION >= 0x030000
-+ const QWidget::BackgroundMode bgmode = lv->viewport()->backgroundMode();
-+ const QColorGroup::ColorRole crole = QPalette::backgroundRoleFromMode(bgmode);
-+ #else
---- portabase/datewidget.cpp~qtversion
-+++ portabase/datewidget.cpp
-@@ -21,7 +21,7 @@
- #include "desktop/resource.h"
- #endif
-
--#if QT_VERSION >= 300
-+#if QT_VERSION >= 0x030000
- #include "desktop/QtaDatePicker.h"
- #else
- #include "QtaDatePicker.h"
---- portabase/roweditor.cpp~qtversion
-+++ portabase/roweditor.cpp
-@@ -26,7 +26,7 @@
- #include "roweditor.h"
- #include "timewidget.h"
-
--#if QT_VERSION >= 300
-+#if QT_VERSION >= 0x030000
- #include "desktop/dynamicedit.h"
- #else
- #include "dynamicedit.h"
---- portabase/shadedlistitem.cpp~qtversion
-+++ portabase/shadedlistitem.cpp
-@@ -45,7 +45,7 @@
- void ShadedListItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment)
- {
- QColorGroup colors(cg);
--#if QT_VERSION >=300
-+#if QT_VERSION >= 0x030000
- const QWidget::BackgroundMode bgmode = lv->viewport()->backgroundMode();
- const QColorGroup::ColorRole crole = QPalette::backgroundRoleFromMode(bgmode);
- #else
---- portabase/metakitfuncs.cpp~qtversion
-+++ portabase/metakitfuncs.cpp
-@@ -19,7 +19,7 @@
-
- int compareStrings(const QString &s1, const QString &s2)
- {
--#if QT_VERSION >= 300
-+#if QT_VERSION >= 0x030000
- return s1.localeAwareCompare(s2);
- #else
- // do the right thing for null and empty