-rw-r--r-- | noncore/apps/tinykate/config.in | 2 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/config.in | 2 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/document/katesyntaxdocument.h | 2 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/libkate.pro | 2 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp | 5 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/view/kateviewdialog.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/tinykate/main.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/tinykate/opie-tinykate.control | 2 | ||||
-rw-r--r-- | noncore/apps/tinykate/tinykate.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/tinykate/tinykate.h | 2 | ||||
-rw-r--r-- | noncore/apps/tinykate/tinykate.pro | 2 |
11 files changed, 16 insertions, 17 deletions
diff --git a/noncore/apps/tinykate/config.in b/noncore/apps/tinykate/config.in index 39aedcf..2efc13e 100644 --- a/noncore/apps/tinykate/config.in +++ b/noncore/apps/tinykate/config.in | |||
@@ -3,3 +3,3 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBKATE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBKATE |
5 | 5 | ||
diff --git a/noncore/apps/tinykate/libkate/config.in b/noncore/apps/tinykate/libkate/config.in index 47d7ef5..2e7e62c 100644 --- a/noncore/apps/tinykate/libkate/config.in +++ b/noncore/apps/tinykate/libkate/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBQTAUX && LIBOPIE2CORE && LIBOPIE2UI |
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.h b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.h index 5c5c5a4..5eefc77 100644 --- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.h +++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.h | |||
@@ -20,3 +20,3 @@ | |||
20 | 20 | ||
21 | #include <opie/xmltree.h> | 21 | #include <opie2/xmltree.h> |
22 | #include <qlist.h> | 22 | #include <qlist.h> |
diff --git a/noncore/apps/tinykate/libkate/libkate.pro b/noncore/apps/tinykate/libkate/libkate.pro index 7266b18..f1b8063 100644 --- a/noncore/apps/tinykate/libkate/libkate.pro +++ b/noncore/apps/tinykate/libkate/libkate.pro | |||
@@ -83,3 +83,3 @@ INCLUDEPATH += $(OPIEDIR)/include \ | |||
83 | DEPENDPATH+= $(OPIEDIR)/include | 83 | DEPENDPATH+= $(OPIEDIR)/include |
84 | LIBS += -lqpe -lopie | 84 | LIBS += -lqpe -lqtaux2 -lopiecore2 -lopieui2 |
85 | TARGET = tinykate | 85 | TARGET = tinykate |
diff --git a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp index 7be5af5..1320cbc 100644 --- a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp +++ b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp | |||
@@ -25,6 +25,5 @@ | |||
25 | #include <kglobalsettings.h> | 25 | #include <kglobalsettings.h> |
26 | //#include "kcolordialog.h" | ||
27 | #include "kcolorbtn.h" | 26 | #include "kcolorbtn.h" |
28 | 27 | ||
29 | #include <opie/colordialog.h> | 28 | #include <opie2/qcolordialog.h> |
30 | 29 | ||
@@ -77,3 +76,3 @@ void KColorButton::chooseColor() | |||
77 | { | 76 | { |
78 | QColor newCol=OColorDialog::getColor( col); | 77 | QColor newCol=QColorDialog::getColor( col); |
79 | if( newCol != QDialog::Rejected ) | 78 | if( newCol != QDialog::Rejected ) |
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp index 6a19e01..4cb13e8 100644 --- a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp +++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp | |||
@@ -48,3 +48,3 @@ | |||
48 | #include "kateviewdialog.h" | 48 | #include "kateviewdialog.h" |
49 | #include <opie/ofontselector.h> | 49 | #include <opie2/ofontselector.h> |
50 | 50 | ||
diff --git a/noncore/apps/tinykate/main.cpp b/noncore/apps/tinykate/main.cpp index e21c040..e62930c 100644 --- a/noncore/apps/tinykate/main.cpp +++ b/noncore/apps/tinykate/main.cpp | |||
@@ -15,6 +15,6 @@ | |||
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | #include <qmainwindow.h> | ||
17 | #include "tinykate.h" | ||
18 | 16 | ||
19 | #include <opie/oapplicationfactory.h> | 17 | #include <opie2/oapplicationfactory.h> |
18 | |||
19 | #include "tinykate.h" | ||
20 | 20 | ||
diff --git a/noncore/apps/tinykate/opie-tinykate.control b/noncore/apps/tinykate/opie-tinykate.control index 66e17ad..fd806cc 100644 --- a/noncore/apps/tinykate/opie-tinykate.control +++ b/noncore/apps/tinykate/opie-tinykate.control | |||
@@ -6,3 +6,3 @@ Maintainer: Opie Team <opie@handhelds.org> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2, libopieui2 |
8 | Description: Kate for Opie | 8 | Description: Kate for Opie |
diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp index f470645..bbf80ce 100644 --- a/noncore/apps/tinykate/tinykate.cpp +++ b/noncore/apps/tinykate/tinykate.cpp | |||
@@ -25,3 +25,3 @@ | |||
25 | 25 | ||
26 | #include <opie/ofiledialog.h> | 26 | #include <opie2/ofiledialog.h> |
27 | 27 | ||
@@ -173,3 +173,3 @@ void TinyKate::slotOpen( ) | |||
173 | { | 173 | { |
174 | QString filename = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL, | 174 | QString filename = Opie::OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL, |
175 | QString::null); | 175 | QString::null); |
@@ -268,3 +268,3 @@ void TinyKate::slotSaveAs() { | |||
268 | 268 | ||
269 | QString filename=OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL, | 269 | QString filename= Opie::OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL, |
270 | QString::null); | 270 | QString::null); |
diff --git a/noncore/apps/tinykate/tinykate.h b/noncore/apps/tinykate/tinykate.h index a5ee9b9..f844c55 100644 --- a/noncore/apps/tinykate/tinykate.h +++ b/noncore/apps/tinykate/tinykate.h | |||
@@ -22,3 +22,3 @@ | |||
22 | #include <qmainwindow.h> | 22 | #include <qmainwindow.h> |
23 | #include <opie/otabwidget.h> | 23 | #include <opie2/otabwidget.h> |
24 | #include <ktexteditor.h> | 24 | #include <ktexteditor.h> |
diff --git a/noncore/apps/tinykate/tinykate.pro b/noncore/apps/tinykate/tinykate.pro index 91d4230..ce22f8e 100644 --- a/noncore/apps/tinykate/tinykate.pro +++ b/noncore/apps/tinykate/tinykate.pro | |||
@@ -16,3 +16,3 @@ INCLUDEPATH += $(OPIEDIR)/include \ | |||
16 | DEPENDPATH+= $(OPIEDIR)/include | 16 | DEPENDPATH+= $(OPIEDIR)/include |
17 | LIBS += -lqpe -ltinykate -lopie | 17 | LIBS += -lqpe -ltinykate -lopiecore2 -lopieui2 |
18 | TARGET = kate | 18 | TARGET = kate |