| author | drw <drw> | 2004-02-23 18:12:57 (UTC) |
|---|---|---|
| committer | drw <drw> | 2004-02-23 18:12:57 (UTC) |
| commit | 398c7d54acfc203ec90644d6c63e5b200391e906 (patch) (side-by-side diff) | |
| tree | 84a1f495a5a2450f7eb2f401037b6fd81162d72b /noncore/apps/tinykate/libkate | |
| parent | f5762a3bee0ca4a176048f6552acaea2af827914 (diff) | |
| download | opie-398c7d54acfc203ec90644d6c63e5b200391e906.zip opie-398c7d54acfc203ec90644d6c63e5b200391e906.tar.gz opie-398c7d54acfc203ec90644d6c63e5b200391e906.tar.bz2 | |
TinyKate: libopie->libopie2
5 files changed, 6 insertions, 7 deletions
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 @@ -18,7 +18,7 @@ #ifndef SYNTAXDOCUMENT_H #define SYNTAXDOCUMENT_H -#include <opie/xmltree.h> +#include <opie2/xmltree.h> #include <qlist.h> #include <qstringlist.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 @@ -81,7 +81,7 @@ INCLUDEPATH += $(OPIEDIR)/include \ $(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 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 @@ -23,10 +23,9 @@ #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) @@ -75,7 +74,7 @@ void KColorButton::drawButtonLabel( QPainter *painter ) void KColorButton::chooseColor() { - QColor newCol=OColorDialog::getColor( col); + QColor newCol=QColorDialog::getColor( col); if( newCol != QDialog::Rejected ) { col=newCol; 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 @@ -46,7 +46,7 @@ #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 ) |