-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 | |||
@@ -1,6 +1,6 @@ | |||
1 | config TINYKATE | 1 | config TINYKATE |
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 | ||
6 | source "noncore/apps/tinykate/libkate/config.in" | 6 | source "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 | |||
@@ -1,4 +1,4 @@ | |||
1 | config LIBKATE | 1 | config LIBKATE |
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 | |||
@@ -9,25 +9,25 @@ | |||
9 | /*************************************************************************** | 9 | /*************************************************************************** |
10 | * * | 10 | * * |
11 | * This program is free software; you can redistribute it and/or modify * | 11 | * This program is free software; you can redistribute it and/or modify * |
12 | * it under the terms of the GNU General Public License as published by * | 12 | * it under the terms of the GNU General Public License as published by * |
13 | * the Free Software Foundation; either version 2 of the License, or * | 13 | * the Free Software Foundation; either version 2 of the License, or * |
14 | * (at your option) any later version. * | 14 | * (at your option) any later version. * |
15 | * * | 15 | * * |
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | 17 | ||
18 | #ifndef SYNTAXDOCUMENT_H | 18 | #ifndef SYNTAXDOCUMENT_H |
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> |
24 | 24 | ||
25 | 25 | ||
26 | class syntaxModeListItem | 26 | class syntaxModeListItem |
27 | { | 27 | { |
28 | public: | 28 | public: |
29 | QString name; | 29 | QString name; |
30 | QString section; | 30 | QString section; |
31 | QString mimetype; | 31 | QString mimetype; |
32 | QString extension; | 32 | QString extension; |
33 | QString identifier; | 33 | QString identifier; |
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 | |||
@@ -72,19 +72,19 @@ SOURCES = microkde/kapplication.cpp \ | |||
72 | interfaces/interfaces.cpp | 72 | interfaces/interfaces.cpp |
73 | 73 | ||
74 | INTERFACES= | 74 | INTERFACES= |
75 | INCLUDEPATH+= $(OPIEDIR)/include \ | 75 | INCLUDEPATH+= $(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 | 83 | DEPENDPATH+= $(OPIEDIR)/include |
84 | LIBS += -lqpe -lopie | 84 | LIBS += -lqpe -lqtaux2 -lopiecore2 -lopieui2 |
85 | TARGET = tinykate | 85 | TARGET = tinykate |
86 | 86 | ||
87 | INCLUDEPATH += $(OPIEDIR)/include | 87 | INCLUDEPATH += $(OPIEDIR)/include |
88 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) | 88 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) |
89 | 89 | ||
90 | include ( $(OPIEDIR)/include.pro ) | 90 | include ( $(OPIEDIR)/include.pro ) |
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 | |||
@@ -14,28 +14,27 @@ | |||
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <qdialog.h> | 21 | #include <qdialog.h> |
22 | #include <qpainter.h> | 22 | #include <qpainter.h> |
23 | #include <qdrawutil.h> | 23 | #include <qdrawutil.h> |
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 | ||
31 | KColorButton::KColorButton( QWidget *parent, const char *name ) | 30 | KColorButton::KColorButton( QWidget *parent, const char *name ) |
32 | : QPushButton( parent, name ), dragFlag(false) | 31 | : QPushButton( parent, name ), dragFlag(false) |
33 | { | 32 | { |
34 | // 2000-10-15 (putzer): fixes broken keyboard usage | 33 | // 2000-10-15 (putzer): fixes broken keyboard usage |
35 | connect (this, SIGNAL(clicked()), this, SLOT(chooseColor())); | 34 | connect (this, SIGNAL(clicked()), this, SLOT(chooseColor())); |
36 | } | 35 | } |
37 | 36 | ||
38 | KColorButton::KColorButton( const QColor &c, QWidget *parent, | 37 | KColorButton::KColorButton( const QColor &c, QWidget *parent, |
39 | const char *name ) | 38 | const char *name ) |
40 | : QPushButton( parent, name ), col(c), dragFlag(false) | 39 | : QPushButton( parent, name ), col(c), dragFlag(false) |
41 | { | 40 | { |
@@ -66,20 +65,20 @@ void KColorButton::drawButtonLabel( QPainter *painter ) | |||
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 ); |
67 | b++; | 66 | b++; |
68 | painter->fillRect( l+b+1, t+b+1, w-b*2, h-b*2, fillCol ); | 67 | painter->fillRect( l+b+1, t+b+1, w-b*2, h-b*2, fillCol ); |
69 | } else { | 68 | } else { |
70 | qDrawPlainRect( painter, l+b, t+b, w-b*2, h-b*2, lnCol, 1, 0 ); | 69 | qDrawPlainRect( painter, l+b, t+b, w-b*2, h-b*2, lnCol, 1, 0 ); |
71 | b++; | 70 | b++; |
72 | painter->fillRect( l+b, t+b, w-b*2, h-b*2, fillCol ); | 71 | painter->fillRect( l+b, t+b, w-b*2, h-b*2, fillCol ); |
73 | } | 72 | } |
74 | } | 73 | } |
75 | 74 | ||
76 | void KColorButton::chooseColor() | 75 | 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 ) |
80 | { | 79 | { |
81 | col=newCol; | 80 | col=newCol; |
82 | repaint( false ); | 81 | repaint( false ); |
83 | emit changed( col ); | 82 | emit changed( col ); |
84 | } | 83 | } |
85 | } | 84 | } |
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 | |||
@@ -37,25 +37,25 @@ | |||
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> |
41 | #include <qcombobox.h> | 41 | #include <qcombobox.h> |
42 | #include <kglobal.h> | 42 | #include <kglobal.h> |
43 | #include <qvbox.h> | 43 | #include <qvbox.h> |
44 | #include <qspinbox.h> | 44 | #include <qspinbox.h> |
45 | #include <kfontdialog.h> | 45 | #include <kfontdialog.h> |
46 | 46 | ||
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 | ||
52 | SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags ) | 52 | SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags ) |
53 | : KDialogBase( parent, 0L, true, i18n( "Find Text" ), Ok | Cancel, Ok ) | 53 | : KDialogBase( parent, 0L, true, i18n( "Find Text" ), Ok | Cancel, Ok ) |
54 | , m_replace( 0L ) | 54 | , m_replace( 0L ) |
55 | { | 55 | { |
56 | QWidget *page = new QWidget( this ); | 56 | QWidget *page = new QWidget( this ); |
57 | setMainWidget( page ); | 57 | setMainWidget( page ); |
58 | 58 | ||
59 | QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); | 59 | QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); |
60 | 60 | ||
61 | m_search = new QComboBox( true, page ); | 61 | m_search = new QComboBox( true, page ); |
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 | |||
@@ -4,19 +4,19 @@ | |||
4 | begin : November 2002 | 4 | begin : November 2002 |
5 | copyright : (C) 2002 by Joseph Wenninger <jowenn@kde.org> | 5 | copyright : (C) 2002 by Joseph Wenninger <jowenn@kde.org> |
6 | ***************************************************************************/ | 6 | ***************************************************************************/ |
7 | 7 | ||
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation. * | 12 | * the Free Software Foundation. * |
13 | * ONLY VERSION 2 OF THE LICENSE IS APPLICABLE * | 13 | * ONLY VERSION 2 OF THE LICENSE IS APPLICABLE * |
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 | ||
21 | OPIE_EXPORT_APP( OApplicationFactory<TinyKate> ) | 21 | OPIE_EXPORT_APP( OApplicationFactory<TinyKate> ) |
22 | 22 | ||
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 | |||
@@ -1,9 +1,9 @@ | |||
1 | Package: opie-tinykate | 1 | Package: opie-tinykate |
2 | Files: plugins/application/libkate.so* bin/kate apps/Applications/tinykate.desktop pics/tinykate lib/libtinykate.so.1.0.0 lib/libtinykate.so.1.0 lib/libtinykate.so.1 | 2 | Files: plugins/application/libkate.so* bin/kate apps/Applications/tinykate.desktop pics/tinykate lib/libtinykate.so.1.0.0 lib/libtinykate.so.1.0 lib/libtinykate.so.1 |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | 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 |
9 | Version: $QPE_VERSION$EXTRAVERSION | 9 | Version: $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 | |||
@@ -14,25 +14,25 @@ | |||
14 | * ONLY VERSION 2 OF THE LICENSE IS APPLICABLE * | 14 | * ONLY VERSION 2 OF THE LICENSE IS APPLICABLE * |
15 | * * | 15 | * * |
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | #include <qwidget.h> | 17 | #include <qwidget.h> |
18 | #include <qaction.h> | 18 | #include <qaction.h> |
19 | #include <qlayout.h> | 19 | #include <qlayout.h> |
20 | #include <qtoolbutton.h> | 20 | #include <qtoolbutton.h> |
21 | #include <qmenubar.h> | 21 | #include <qmenubar.h> |
22 | #include <qpe/resource.h> | 22 | #include <qpe/resource.h> |
23 | #include <qpe/global.h> | 23 | #include <qpe/global.h> |
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" |
29 | 29 | ||
30 | #include <katedocument.h> | 30 | #include <katedocument.h> |
31 | #include <katehighlight.h> | 31 | #include <katehighlight.h> |
32 | #include <kateview.h> | 32 | #include <kateview.h> |
33 | #include <kglobal.h> | 33 | #include <kglobal.h> |
34 | 34 | ||
35 | TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : | 35 | TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : |
36 | QMainWindow( parent, name, f ) | 36 | QMainWindow( parent, name, f ) |
37 | { | 37 | { |
38 | shutDown=false; | 38 | shutDown=false; |
@@ -162,25 +162,25 @@ TinyKate::~TinyKate( ) | |||
162 | while (currentView!=0) { | 162 | while (currentView!=0) { |
163 | slotClose(); | 163 | slotClose(); |
164 | } | 164 | } |
165 | 165 | ||
166 | if( KGlobal::config() != 0 ) { | 166 | if( KGlobal::config() != 0 ) { |
167 | qWarning("deleting KateConfig object..\n"); | 167 | qWarning("deleting KateConfig object..\n"); |
168 | delete KGlobal::config(); | 168 | delete KGlobal::config(); |
169 | } | 169 | } |
170 | } | 170 | } |
171 | 171 | ||
172 | void TinyKate::slotOpen( ) | 172 | 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); |
176 | if (!filename.isEmpty()) { | 176 | if (!filename.isEmpty()) { |
177 | open(filename); | 177 | open(filename); |
178 | } | 178 | } |
179 | } | 179 | } |
180 | 180 | ||
181 | void TinyKate::open(const QString & filename) | 181 | void TinyKate::open(const QString & filename) |
182 | { | 182 | { |
183 | KateDocument *kd= new KateDocument(false, false, this,0,this); | 183 | KateDocument *kd= new KateDocument(false, false, this,0,this); |
184 | KTextEditor::View *kv; | 184 | KTextEditor::View *kv; |
185 | QFileInfo fi(filename); | 185 | QFileInfo fi(filename); |
186 | QString filenamed = fi.fileName(); | 186 | QString filenamed = fi.fileName(); |
@@ -257,25 +257,25 @@ void TinyKate::slotSave() { | |||
257 | if( kd->docName().isEmpty()) | 257 | if( kd->docName().isEmpty()) |
258 | slotSaveAs(); | 258 | slotSaveAs(); |
259 | else | 259 | else |
260 | kd->saveFile(); | 260 | kd->saveFile(); |
261 | // kv->save(); | 261 | // kv->save(); |
262 | // kd->saveFile(); | 262 | // kd->saveFile(); |
263 | } | 263 | } |
264 | 264 | ||
265 | void TinyKate::slotSaveAs() { | 265 | void TinyKate::slotSaveAs() { |
266 | if (currentView==0) return; | 266 | if (currentView==0) return; |
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()) { |
272 | qDebug("saving file "+filename); | 272 | qDebug("saving file "+filename); |
273 | QFileInfo fi(filename); | 273 | QFileInfo fi(filename); |
274 | QString filenamed = fi.fileName(); | 274 | QString filenamed = fi.fileName(); |
275 | kd->setDocFile( filename); | 275 | kd->setDocFile( filename); |
276 | kd->setDocName( filenamed); | 276 | kd->setDocName( filenamed); |
277 | kd->saveFile(); | 277 | kd->saveFile(); |
278 | // KTextEditor::View *dv = currentView; | 278 | // KTextEditor::View *dv = currentView; |
279 | // tabwidget->changeTab( dv, filenamed); | 279 | // tabwidget->changeTab( dv, filenamed); |
280 | // need to change tab label here | 280 | // need to change tab label here |
281 | } | 281 | } |
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 | |||
@@ -11,25 +11,25 @@ | |||
11 | * This program is free software; you can redistribute it and/or modify * | 11 | * This program is free software; you can redistribute it and/or modify * |
12 | * it under the terms of the GNU General Public License as published by * | 12 | * it under the terms of the GNU General Public License as published by * |
13 | * the Free Software Foundation. * | 13 | * the Free Software Foundation. * |
14 | * ONLY VERSION 2 OF THE LICENSE IS APPLICABLE * | 14 | * ONLY VERSION 2 OF THE LICENSE IS APPLICABLE * |
15 | * * | 15 | * * |
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | 17 | ||
18 | #ifndef __TINYKATE_H__ | 18 | #ifndef __TINYKATE_H__ |
19 | #define __TINYKATE_H__ | 19 | #define __TINYKATE_H__ |
20 | 20 | ||
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 | ||
26 | class QToolButton; | 26 | class QToolButton; |
27 | class QAction; | 27 | class QAction; |
28 | class QPopupMenu; | 28 | class QPopupMenu; |
29 | 29 | ||
30 | class TinyKate : public QMainWindow | 30 | class TinyKate : public QMainWindow |
31 | { | 31 | { |
32 | Q_OBJECT | 32 | Q_OBJECT |
33 | public: | 33 | public: |
34 | TinyKate( QWidget *parent=0, const char *name=0, WFlags f = 0); | 34 | TinyKate( QWidget *parent=0, const char *name=0, WFlags f = 0); |
35 | ~TinyKate( ); | 35 | ~TinyKate( ); |
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 | |||
@@ -5,18 +5,18 @@ HEADERS = tinykate.h | |||
5 | SOURCES = tinykate.cpp main.cpp | 5 | SOURCES = tinykate.cpp main.cpp |
6 | INTERFACES= | 6 | INTERFACES= |
7 | INCLUDEPATH+= $(OPIEDIR)/include \ | 7 | INCLUDEPATH+= $(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 \ |
12 | $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \ | 12 | $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \ |
13 | $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \ | 13 | $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \ |
14 | $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back | 14 | $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back |
15 | 15 | ||
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 |
19 | 19 | ||
20 | 20 | ||
21 | 21 | ||
22 | include ( $(OPIEDIR)/include.pro ) | 22 | include ( $(OPIEDIR)/include.pro ) |