summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/tinykate/config.in2
-rw-r--r--noncore/apps/tinykate/libkate/config.in2
-rw-r--r--noncore/apps/tinykate/libkate/document/katesyntaxdocument.h6
-rw-r--r--noncore/apps/tinykate/libkate/libkate.pro98
-rw-r--r--noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp9
-rw-r--r--noncore/apps/tinykate/libkate/view/kateviewdialog.cpp8
-rw-r--r--noncore/apps/tinykate/main.cpp6
-rw-r--r--noncore/apps/tinykate/opie-tinykate.control2
-rw-r--r--noncore/apps/tinykate/tinykate.cpp8
-rw-r--r--noncore/apps/tinykate/tinykate.h2
-rw-r--r--noncore/apps/tinykate/tinykate.pro24
11 files changed, 83 insertions, 84 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
@@ -2,5 +2,5 @@
2 boolean "opie-tinykate (programmers editor Kate from KDE)" 2 boolean "opie-tinykate (programmers editor Kate from KDE)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBKATE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBKATE
5 5
6source "noncore/apps/tinykate/libkate/config.in" 6source "noncore/apps/tinykate/libkate/config.in"
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
@@ -2,3 +2,3 @@
2 boolean "libkate" 2 boolean "libkate"
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
@@ -19,5 +19,5 @@
19#define SYNTAXDOCUMENT_H 19#define SYNTAXDOCUMENT_H
20 20
21#include <opie/xmltree.h> 21#include <opie2/xmltree.h>
22#include <qlist.h> 22#include <qlist.h>
23#include <qstringlist.h> 23#include <qstringlist.h>
@@ -44,5 +44,5 @@ class syntaxContextData
44typedef QList<syntaxModeListItem> SyntaxModeList; 44typedef QList<syntaxModeListItem> SyntaxModeList;
45 45
46class SyntaxDocument 46class SyntaxDocument
47{ 47{
48 public: 48 public:
@@ -55,5 +55,5 @@ class SyntaxDocument
55 syntaxContextData* getGroupInfo(const QString& langName, const QString &group); 55 syntaxContextData* getGroupInfo(const QString& langName, const QString &group);
56 void freeGroupInfo(syntaxContextData* data); 56 void freeGroupInfo(syntaxContextData* data);
57 syntaxContextData* getConfig(const QString& mainGroupName, const QString &Config); 57 syntaxContextData* getConfig(const QString& mainGroupName, const QString &Config);
58 bool nextItem(syntaxContextData* data); 58 bool nextItem(syntaxContextData* data);
59 bool nextGroup(syntaxContextData* data); 59 bool nextGroup(syntaxContextData* data);
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
@@ -1,6 +1,6 @@
1 TEMPLATE= lib 1TEMPLATE = lib
2 CONFIG = qt warn_on release 2CONFIG = qt warn_on release
3 HEADERS = microkde/kapplication.h \ 3HEADERS = microkde/kapplication.h \
4 kateconfig.h \ 4 kateconfig.h \
5 microkde/kdebug.h \ 5 microkde/kdebug.h \
6 microkde/kdialog.h \ 6 microkde/kdialog.h \
@@ -25,25 +25,25 @@ HEADERS = microkde/kapplication.h \
25 microkde/klistview.h \ 25 microkde/klistview.h \
26 microkde/kglobalsettings.h \ 26 microkde/kglobalsettings.h \
27 microkde/kcolorbtn.h \ 27 microkde/kcolorbtn.h \
28 \ 28 \
29 \ 29 \
30 qt3back/qregexp3.h \ 30 qt3back/qregexp3.h \
31 microkde/ksharedptr.h \ 31 microkde/ksharedptr.h \
32 document/katebuffer.h document/katedialogs.h \ 32 document/katebuffer.h document/katedialogs.h \
33 document/katetextline.h \ 33 document/katetextline.h \
34 document/katecmd.h \ 34 document/katecmd.h \
35 document/katehighlight.h \ 35 document/katehighlight.h \
36 document/katecmds.h document/katedocument.h \ 36 document/katecmds.h document/katedocument.h \
37 document/katesyntaxdocument.h \ 37 document/katesyntaxdocument.h \
38 view/kateundohistory.h \ 38 view/kateundohistory.h \
39 view/kateview.h \ 39 view/kateview.h \
40 view/kateviewdialog.h \ 40 view/kateviewdialog.h \
41 interfaces/view.h \ 41 interfaces/view.h \
42 interfaces/document.h \ 42 interfaces/document.h \
43 ktexteditor/ktexteditor.h 43 ktexteditor/ktexteditor.h
44 44
45 SOURCES = microkde/kapplication.cpp \ 45SOURCES = microkde/kapplication.cpp \
46 microkde/kdialogbase.cpp \ 46 microkde/kdialogbase.cpp \
47 kateconfig.cpp \ 47 kateconfig.cpp \
48 microkde/klocale.cpp \ 48 microkde/klocale.cpp \
49 microkde/kmessagebox.cpp \ 49 microkde/kmessagebox.cpp \
@@ -57,31 +57,31 @@ SOURCES = microkde/kapplication.cpp \
57 microkde/kglobal.cpp \ 57 microkde/kglobal.cpp \
58 microkde/kglobalsettings.cpp \ 58 microkde/kglobalsettings.cpp \
59 microkde/kcolorbtn.cpp \ 59 microkde/kcolorbtn.cpp \
60 \ 60 \
61 \ 61 \
62 qt3back/qregexp3.cpp \ 62 qt3back/qregexp3.cpp \
63 ktexteditor/ktexteditor.cpp \ 63 ktexteditor/ktexteditor.cpp \
64 document/katebuffer.cpp document/katedialogs.cpp \ 64 document/katebuffer.cpp document/katedialogs.cpp \
65 document/katehighlight.cpp \ 65 document/katehighlight.cpp \
66 document/katecmd.cpp \ 66 document/katecmd.cpp \
67 document/katesyntaxdocument.cpp document/katecmds.cpp \ 67 document/katesyntaxdocument.cpp document/katecmds.cpp \
68 document/katedocument.cpp document/katetextline.cpp \ 68 document/katedocument.cpp document/katetextline.cpp \
69 view/kateundohistory.cpp \ 69 view/kateundohistory.cpp \
70 view/kateview.cpp \ 70 view/kateview.cpp \
71 view/kateviewdialog.cpp \ 71 view/kateviewdialog.cpp \
72 interfaces/interfaces.cpp 72 interfaces/interfaces.cpp
73 73
74 INTERFACES= 74INTERFACES =
75 INCLUDEPATH+= $(OPIEDIR)/include \ 75INCLUDEPATH += $(OPIEDIR)/include \
76 $(OPIEDIR)/noncore/apps/tinykate/libkate \ 76 $(OPIEDIR)/noncore/apps/tinykate/libkate \
77 $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \ 77 $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
78 $(OPIEDIR)/noncore/apps/tinykate/libkate/document \ 78 $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
79 $(OPIEDIR)/noncore/apps/tinykate/libkate/view \ 79 $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
80 $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \ 80 $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
81 $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \ 81 $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
82 $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back 82 $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
83 DEPENDPATH+= $(OPIEDIR)/include 83DEPENDPATH += $(OPIEDIR)/include
84LIBS += -lqpe -lopie 84LIBS += -lqpe -lqtaux2 -lopiecore2 -lopieui2
85 TARGET = tinykate 85TARGET = tinykate
86 86
87INCLUDEPATH += $(OPIEDIR)/include 87INCLUDEPATH += $(OPIEDIR)/include
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
@@ -24,8 +24,7 @@
24#include <qapplication.h> 24#include <qapplication.h>
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
31KColorButton::KColorButton( QWidget *parent, const char *name ) 30KColorButton::KColorButton( QWidget *parent, const char *name )
@@ -59,8 +58,8 @@ void KColorButton::drawButtonLabel( QPainter *painter )
59 int h = r.height(); 58 int h = r.height();
60 int b = 5; 59 int b = 5;
61 60
62 QColor lnCol = colorGroup().text(); 61 QColor lnCol = colorGroup().text();
63 QColor fillCol = isEnabled() ? col : backgroundColor(); 62 QColor fillCol = isEnabled() ? col : backgroundColor();
64 63
65 if ( isDown() ) { 64 if ( isDown() ) {
66 qDrawPlainRect( painter, l+b+1, t+b+1, w-b*2, h-b*2, lnCol, 1, 0 ); 65 qDrawPlainRect( painter, l+b+1, t+b+1, w-b*2, h-b*2, lnCol, 1, 0 );
@@ -76,5 +75,5 @@ void KColorButton::drawButtonLabel( QPainter *painter )
76void KColorButton::chooseColor() 75void 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 )
80 { 79 {
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
@@ -36,5 +36,5 @@
36#include <qradiobutton.h> 36#include <qradiobutton.h>
37#include <qwhatsthis.h> 37#include <qwhatsthis.h>
38#include <qstringlist.h> 38#include <qstringlist.h>
39#include <klocale.h> 39#include <klocale.h>
40#include <kcolorbtn.h> 40#include <kcolorbtn.h>
@@ -47,5 +47,5 @@
47#include "../document/katedocument.h" 47#include "../document/katedocument.h"
48#include "kateviewdialog.h" 48#include "kateviewdialog.h"
49#include <opie/ofontselector.h> 49#include <opie2/ofontselector.h>
50 50
51 51
@@ -426,5 +426,5 @@ EditConfigTab::EditConfigTab(QWidget *parent, KateView *view)
426 e3->setMinValue(5); 426 e3->setMinValue(5);
427 e3->setMaxValue( 30000); 427 e3->setMaxValue( 30000);
428#warning fixme e3->setLabel(i18n("Undo steps:")); 428#warning fixme e3->setLabel(i18n("Undo steps:"));
429 e3->setValue((int)view->undoSteps()); 429 e3->setValue((int)view->undoSteps());
430 430
@@ -542,5 +542,5 @@ FontConfig::FontConfig( QWidget *parent, char *name )
542 grid->addWidget( m_fontselect, 0, 0); 542 grid->addWidget( m_fontselect, 0, 0);
543 543
544 544
545// #if 0 545// #if 0
546// m_fontchooser = new KFontChooser ( this ); 546// m_fontchooser = new KFontChooser ( this );
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
@@ -14,8 +14,8 @@
14 * * 14 * *
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
21OPIE_EXPORT_APP( OApplicationFactory<TinyKate> ) 21OPIE_EXPORT_APP( OApplicationFactory<TinyKate> )
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
@@ -5,5 +5,5 @@ Section: opie/applications
5Maintainer: Opie Team <opie@handhelds.org> 5Maintainer: Opie Team <opie@handhelds.org>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal, libopiecore2, libopieui2
8Description: Kate for Opie 8Description: Kate for Opie
9Version: $QPE_VERSION$EXTRAVERSION 9Version: $QPE_VERSION$EXTRAVERSION
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
@@ -24,5 +24,5 @@
24#include <qpe/qpeapplication.h> 24#include <qpe/qpeapplication.h>
25 25
26#include <opie/ofiledialog.h> 26#include <opie2/ofiledialog.h>
27 27
28#include "tinykate.h" 28#include "tinykate.h"
@@ -161,5 +161,5 @@ TinyKate::~TinyKate( )
161 shutDown=true; 161 shutDown=true;
162 while (currentView!=0) { 162 while (currentView!=0) {
163 slotClose(); 163 slotClose();
164 } 164 }
165 165
@@ -172,5 +172,5 @@ TinyKate::~TinyKate( )
172void TinyKate::slotOpen( ) 172void 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);
176 if (!filename.isEmpty()) { 176 if (!filename.isEmpty()) {
@@ -267,5 +267,5 @@ void TinyKate::slotSaveAs() {
267 KateDocument *kd = (KateDocument*) currentView->document(); 267 KateDocument *kd = (KateDocument*) currentView->document();
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);
271 if (!filename.isEmpty()) { 271 if (!filename.isEmpty()) {
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
@@ -21,5 +21,5 @@
21 21
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>
25 25
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
@@ -1,11 +1,11 @@
1 TEMPLATE= app 1TEMPLATE = app
2 CONFIG = qt warn_on release quick-app 2CONFIG = qt warn_on release quick-app
3 DESTDIR = $(OPIEDIR)/bin 3DESTDIR = $(OPIEDIR)/bin
4 HEADERS = tinykate.h 4HEADERS = tinykate.h
5 SOURCES = tinykate.cpp main.cpp 5SOURCES = tinykate.cpp main.cpp
6 INTERFACES= 6INTERFACES =
7 INCLUDEPATH+= $(OPIEDIR)/include \ 7INCLUDEPATH += $(OPIEDIR)/include \
8 $(OPIEDIR)/noncore/apps/tinykate/libkate \ 8 $(OPIEDIR)/noncore/apps/tinykate/libkate \
9 $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \ 9 $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
10 $(OPIEDIR)/noncore/apps/tinykate/libkate/document \ 10 $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
11 $(OPIEDIR)/noncore/apps/tinykate/libkate/view \ 11 $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
@@ -14,7 +14,7 @@ INCLUDEPATH += $(OPIEDIR)/include \
14 $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back 14 $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
15 15
16 DEPENDPATH+= $(OPIEDIR)/include 16DEPENDPATH += $(OPIEDIR)/include
17LIBS += -lqpe -ltinykate -lopie 17LIBS += -lqpe -ltinykate -lopiecore2 -lopieui2
18 TARGET = kate 18TARGET = kate
19 19
20 20