summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show 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.h2
-rw-r--r--noncore/apps/tinykate/libkate/libkate.pro2
-rw-r--r--noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp5
-rw-r--r--noncore/apps/tinykate/libkate/view/kateviewdialog.cpp2
-rw-r--r--noncore/apps/tinykate/main.cpp6
-rw-r--r--noncore/apps/tinykate/opie-tinykate.control2
-rw-r--r--noncore/apps/tinykate/tinykate.cpp6
-rw-r--r--noncore/apps/tinykate/tinykate.h2
-rw-r--r--noncore/apps/tinykate/tinykate.pro2
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 @@
config TINYKATE
boolean "opie-tinykate (programmers editor Kate from KDE)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBKATE
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBKATE
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 @@
config LIBKATE
boolean "libkate"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ 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
@@ -15,13 +15,13 @@
* *
***************************************************************************/
#ifndef SYNTAXDOCUMENT_H
#define SYNTAXDOCUMENT_H
-#include <opie/xmltree.h>
+#include <opie2/xmltree.h>
#include <qlist.h>
#include <qstringlist.h>
class syntaxModeListItem
{
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
@@ -78,13 +78,13 @@ INCLUDEPATH += $(OPIEDIR)/include \
$(OPIEDIR)/noncore/apps/tinykate/libkate/document \
$(OPIEDIR)/noncore/apps/tinykate/libkate/view \
$(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
$(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
$(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lqtaux2 -lopiecore2 -lopieui2
TARGET = tinykate
INCLUDEPATH += $(OPIEDIR)/include
DESTDIR = $(OPIEDIR)/lib$(PROJMAK)
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
@@ -20,16 +20,15 @@
#include <qdialog.h>
#include <qpainter.h>
#include <qdrawutil.h>
#include <qapplication.h>
#include <kglobalsettings.h>
-//#include "kcolordialog.h"
#include "kcolorbtn.h"
-#include <opie/colordialog.h>
+#include <opie2/qcolordialog.h>
KColorButton::KColorButton( QWidget *parent, const char *name )
: QPushButton( parent, name ), dragFlag(false)
{
// 2000-10-15 (putzer): fixes broken keyboard usage
connect (this, SIGNAL(clicked()), this, SLOT(chooseColor()));
@@ -72,13 +71,13 @@ void KColorButton::drawButtonLabel( QPainter *painter )
painter->fillRect( l+b, t+b, w-b*2, h-b*2, fillCol );
}
}
void KColorButton::chooseColor()
{
- QColor newCol=OColorDialog::getColor( col);
+ QColor newCol=QColorDialog::getColor( col);
if( newCol != QDialog::Rejected )
{
col=newCol;
repaint( false );
emit changed( col );
}
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
@@ -43,13 +43,13 @@
#include <qvbox.h>
#include <qspinbox.h>
#include <kfontdialog.h>
#include "../document/katedocument.h"
#include "kateviewdialog.h"
-#include <opie/ofontselector.h>
+#include <opie2/ofontselector.h>
SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags )
: KDialogBase( parent, 0L, true, i18n( "Find Text" ), Ok | Cancel, Ok )
, m_replace( 0L )
{
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
@@ -10,13 +10,13 @@
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation. *
* ONLY VERSION 2 OF THE LICENSE IS APPLICABLE *
* *
***************************************************************************/
-#include <qmainwindow.h>
-#include "tinykate.h"
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
+
+#include "tinykate.h"
OPIE_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
@@ -1,9 +1,9 @@
Package: opie-tinykate
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
Priority: optional
Section: opie/applications
Maintainer: Opie Team <opie@handhelds.org>
Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2, libopieui2
Description: Kate for Opie
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
@@ -20,13 +20,13 @@
#include <qtoolbutton.h>
#include <qmenubar.h>
#include <qpe/resource.h>
#include <qpe/global.h>
#include <qpe/qpeapplication.h>
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
#include "tinykate.h"
#include <katedocument.h>
#include <katehighlight.h>
#include <kateview.h>
@@ -168,13 +168,13 @@ TinyKate::~TinyKate( )
delete KGlobal::config();
}
}
void TinyKate::slotOpen( )
{
- QString filename = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL,
+ QString filename = Opie::OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL,
QString::null);
if (!filename.isEmpty()) {
open(filename);
}
}
@@ -263,13 +263,13 @@ void TinyKate::slotSave() {
}
void TinyKate::slotSaveAs() {
if (currentView==0) return;
KateDocument *kd = (KateDocument*) currentView->document();
- QString filename=OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL,
+ QString filename= Opie::OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL,
QString::null);
if (!filename.isEmpty()) {
qDebug("saving file "+filename);
QFileInfo fi(filename);
QString filenamed = fi.fileName();
kd->setDocFile( filename);
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
@@ -17,13 +17,13 @@
#ifndef __TINYKATE_H__
#define __TINYKATE_H__
#include <qmainwindow.h>
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
#include <ktexteditor.h>
class QToolButton;
class QAction;
class QPopupMenu;
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
@@ -11,12 +11,12 @@ INCLUDEPATH += $(OPIEDIR)/include \
$(OPIEDIR)/noncore/apps/tinykate/libkate/view \
$(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
$(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
$(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -ltinykate -lopie
+LIBS += -lqpe -ltinykate -lopiecore2 -lopieui2
TARGET = kate
include ( $(OPIEDIR)/include.pro )