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 @@ -9,25 +9,25 @@ /*************************************************************************** * * * 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; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #ifndef SYNTAXDOCUMENT_H #define SYNTAXDOCUMENT_H -#include <opie/xmltree.h> +#include <opie2/xmltree.h> #include <qlist.h> #include <qstringlist.h> class syntaxModeListItem { public: QString name; QString section; QString mimetype; QString extension; 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 \ interfaces/interfaces.cpp INTERFACES = INCLUDEPATH += $(OPIEDIR)/include \ $(OPIEDIR)/noncore/apps/tinykate/libkate \ $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \ $(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 @@ -14,28 +14,27 @@ You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #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())); } KColorButton::KColorButton( const QColor &c, QWidget *parent, const char *name ) : QPushButton( parent, name ), col(c), dragFlag(false) { @@ -66,20 +65,20 @@ void KColorButton::drawButtonLabel( QPainter *painter ) qDrawPlainRect( painter, l+b+1, t+b+1, w-b*2, h-b*2, lnCol, 1, 0 ); b++; painter->fillRect( l+b+1, t+b+1, w-b*2, h-b*2, fillCol ); } else { qDrawPlainRect( painter, l+b, t+b, w-b*2, h-b*2, lnCol, 1, 0 ); b++; 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 @@ -37,25 +37,25 @@ #include <qwhatsthis.h> #include <qstringlist.h> #include <klocale.h> #include <kcolorbtn.h> #include <qcombobox.h> #include <kglobal.h> #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 ) { QWidget *page = new QWidget( this ); setMainWidget( page ); QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); m_search = new QComboBox( true, page ); |