-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 | 6 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/libkate.pro | 98 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp | 9 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/view/kateviewdialog.cpp | 8 | ||||
-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 | 8 | ||||
-rw-r--r-- | noncore/apps/tinykate/tinykate.h | 2 | ||||
-rw-r--r-- | noncore/apps/tinykate/tinykate.pro | 24 |
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 @@ -3,3 +3,3 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBKATE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBKATE 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 @@ -3,2 +3,2 @@ 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 @@ -20,3 +20,3 @@ -#include <opie/xmltree.h> +#include <opie2/xmltree.h> #include <qlist.h> @@ -45,3 +45,3 @@ typedef QList<syntaxModeListItem> SyntaxModeList; -class SyntaxDocument +class SyntaxDocument { @@ -56,3 +56,3 @@ class SyntaxDocument void freeGroupInfo(syntaxContextData* data); - syntaxContextData* getConfig(const QString& mainGroupName, const QString &Config); + syntaxContextData* getConfig(const QString& mainGroupName, const QString &Config); bool nextItem(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,5 +1,5 @@ -TEMPLATE = lib -CONFIG = qt warn_on release -HEADERS = microkde/kapplication.h \ - kateconfig.h \ +TEMPLATE = lib +CONFIG = qt warn_on release +HEADERS = microkde/kapplication.h \ + kateconfig.h \ microkde/kdebug.h \ @@ -26,23 +26,23 @@ HEADERS = microkde/kapplication.h \ microkde/kglobalsettings.h \ - microkde/kcolorbtn.h \ - \ - \ - qt3back/qregexp3.h \ - microkde/ksharedptr.h \ - document/katebuffer.h document/katedialogs.h \ - document/katetextline.h \ - document/katecmd.h \ - document/katehighlight.h \ - document/katecmds.h document/katedocument.h \ - document/katesyntaxdocument.h \ - view/kateundohistory.h \ - view/kateview.h \ - view/kateviewdialog.h \ - interfaces/view.h \ - interfaces/document.h \ - ktexteditor/ktexteditor.h + microkde/kcolorbtn.h \ + \ + \ + qt3back/qregexp3.h \ + microkde/ksharedptr.h \ + document/katebuffer.h document/katedialogs.h \ + document/katetextline.h \ + document/katecmd.h \ + document/katehighlight.h \ + document/katecmds.h document/katedocument.h \ + document/katesyntaxdocument.h \ + view/kateundohistory.h \ + view/kateview.h \ + view/kateviewdialog.h \ + interfaces/view.h \ + interfaces/document.h \ + ktexteditor/ktexteditor.h -SOURCES = microkde/kapplication.cpp \ +SOURCES = microkde/kapplication.cpp \ microkde/kdialogbase.cpp \ - kateconfig.cpp \ + kateconfig.cpp \ microkde/klocale.cpp \ @@ -58,29 +58,29 @@ SOURCES = microkde/kapplication.cpp \ microkde/kglobalsettings.cpp \ - microkde/kcolorbtn.cpp \ - \ - \ - qt3back/qregexp3.cpp \ - ktexteditor/ktexteditor.cpp \ - document/katebuffer.cpp document/katedialogs.cpp \ - document/katehighlight.cpp \ - document/katecmd.cpp \ - document/katesyntaxdocument.cpp document/katecmds.cpp \ - document/katedocument.cpp document/katetextline.cpp \ - view/kateundohistory.cpp \ - view/kateview.cpp \ - view/kateviewdialog.cpp \ - interfaces/interfaces.cpp + microkde/kcolorbtn.cpp \ + \ + \ + qt3back/qregexp3.cpp \ + ktexteditor/ktexteditor.cpp \ + document/katebuffer.cpp document/katedialogs.cpp \ + document/katehighlight.cpp \ + document/katecmd.cpp \ + document/katesyntaxdocument.cpp document/katecmds.cpp \ + document/katedocument.cpp document/katetextline.cpp \ + view/kateundohistory.cpp \ + view/kateview.cpp \ + view/kateviewdialog.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 -TARGET = tinykate +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 -lqtaux2 -lopiecore2 -lopieui2 +TARGET = tinykate 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 @@ -25,6 +25,5 @@ #include <kglobalsettings.h> -//#include "kcolordialog.h" #include "kcolorbtn.h" -#include <opie/colordialog.h> +#include <opie2/qcolordialog.h> @@ -60,6 +59,6 @@ void KColorButton::drawButtonLabel( QPainter *painter ) int b = 5; - + QColor lnCol = colorGroup().text(); QColor fillCol = isEnabled() ? col : backgroundColor(); - + if ( isDown() ) { @@ -77,3 +76,3 @@ void KColorButton::chooseColor() { - QColor newCol=OColorDialog::getColor( col); + QColor newCol=QColorDialog::getColor( col); if( newCol != QDialog::Rejected ) 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,3 +37,3 @@ #include <qwhatsthis.h> -#include <qstringlist.h> +#include <qstringlist.h> #include <klocale.h> @@ -48,3 +48,3 @@ #include "kateviewdialog.h" -#include <opie/ofontselector.h> +#include <opie2/ofontselector.h> @@ -427,3 +427,3 @@ EditConfigTab::EditConfigTab(QWidget *parent, KateView *view) e3->setMaxValue( 30000); -#warning fixme e3->setLabel(i18n("Undo steps:")); +#warning fixme e3->setLabel(i18n("Undo steps:")); e3->setValue((int)view->undoSteps()); @@ -543,3 +543,3 @@ FontConfig::FontConfig( QWidget *parent, char *name ) - + // #if 0 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 @@ -15,6 +15,6 @@ ***************************************************************************/ -#include <qmainwindow.h> -#include "tinykate.h" -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> + +#include "tinykate.h" 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 @@ -6,3 +6,3 @@ Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2, libopieui2 Description: Kate for Opie 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 @@ -25,3 +25,3 @@ -#include <opie/ofiledialog.h> +#include <opie2/ofiledialog.h> @@ -162,3 +162,3 @@ TinyKate::~TinyKate( ) while (currentView!=0) { - slotClose(); + slotClose(); } @@ -173,3 +173,3 @@ void TinyKate::slotOpen( ) { - QString filename = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL, + QString filename = Opie::OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL, QString::null); @@ -268,3 +268,3 @@ void TinyKate::slotSaveAs() { - QString filename=OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL, + QString filename= Opie::OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL, QString::null); 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 @@ -22,3 +22,3 @@ #include <qmainwindow.h> -#include <opie/otabwidget.h> +#include <opie2/otabwidget.h> #include <ktexteditor.h> 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,10 +1,10 @@ -TEMPLATE = app -CONFIG = qt warn_on release quick-app -DESTDIR = $(OPIEDIR)/bin -HEADERS = tinykate.h -SOURCES = tinykate.cpp main.cpp -INTERFACES = -INCLUDEPATH += $(OPIEDIR)/include \ - $(OPIEDIR)/noncore/apps/tinykate/libkate \ - $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \ +TEMPLATE = app +CONFIG = qt warn_on release quick-app +DESTDIR = $(OPIEDIR)/bin +HEADERS = tinykate.h +SOURCES = tinykate.cpp main.cpp +INTERFACES = +INCLUDEPATH += $(OPIEDIR)/include \ + $(OPIEDIR)/noncore/apps/tinykate/libkate \ + $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \ $(OPIEDIR)/noncore/apps/tinykate/libkate/document \ @@ -15,5 +15,5 @@ INCLUDEPATH += $(OPIEDIR)/include \ -DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -ltinykate -lopie -TARGET = kate +DEPENDPATH += $(OPIEDIR)/include +LIBS += -lqpe -ltinykate -lopiecore2 -lopieui2 +TARGET = kate |