From 398c7d54acfc203ec90644d6c63e5b200391e906 Mon Sep 17 00:00:00 2001 From: drw Date: Mon, 23 Feb 2004 18:12:57 +0000 Subject: TinyKate: libopie->libopie2 --- (limited to 'noncore/apps/tinykate') 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 @@ -18,7 +18,7 @@ #ifndef SYNTAXDOCUMENT_H #define SYNTAXDOCUMENT_H -#include +#include #include #include @@ -43,7 +43,7 @@ class syntaxContextData typedef QList SyntaxModeList; -class SyntaxDocument +class SyntaxDocument { public: SyntaxDocument(); @@ -54,7 +54,7 @@ class SyntaxDocument syntaxContextData* getGroupInfo(const QString& langName, const QString &group); void freeGroupInfo(syntaxContextData* data); - syntaxContextData* getConfig(const QString& mainGroupName, const QString &Config); + syntaxContextData* getConfig(const QString& mainGroupName, const QString &Config); bool nextItem(syntaxContextData* data); bool nextGroup(syntaxContextData* data); syntaxContextData* getSubItems(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,7 +1,7 @@ -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 \ microkde/kdialog.h \ microkde/kdialogbase.h \ @@ -24,27 +24,27 @@ HEADERS = microkde/kapplication.h \ microkde/kstaticdeleter.h \ microkde/klistview.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 \ microkde/kmessagebox.cpp \ microkde/kprocess.cpp \ @@ -56,33 +56,33 @@ SOURCES = microkde/kapplication.cpp \ microkde/knumvalidator.cpp \ microkde/kglobal.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 INCLUDEPATH += $(OPIEDIR)/include DESTDIR = $(OPIEDIR)/lib$(PROJMAK) 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 #include #include -//#include "kcolordialog.h" #include "kcolorbtn.h" -#include +#include KColorButton::KColorButton( QWidget *parent, const char *name ) : QPushButton( parent, name ), dragFlag(false) @@ -58,10 +57,10 @@ void KColorButton::drawButtonLabel( QPainter *painter ) int w = r.width(); int h = r.height(); int b = 5; - + QColor lnCol = colorGroup().text(); QColor fillCol = isEnabled() ? col : backgroundColor(); - + if ( isDown() ) { qDrawPlainRect( painter, l+b+1, t+b+1, w-b*2, h-b*2, lnCol, 1, 0 ); b++; @@ -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 @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -46,7 +46,7 @@ #include "../document/katedocument.h" #include "kateviewdialog.h" -#include +#include SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags ) @@ -425,7 +425,7 @@ EditConfigTab::EditConfigTab(QWidget *parent, KateView *view) e3 = new QSpinBox(this); e3->setMinValue(5); e3->setMaxValue( 30000); -#warning fixme e3->setLabel(i18n("Undo steps:")); +#warning fixme e3->setLabel(i18n("Undo steps:")); e3->setValue((int)view->undoSteps()); leLayout->addWidget(e1, 0, AlignLeft); @@ -541,7 +541,7 @@ FontConfig::FontConfig( QWidget *parent, char *name ) this, SLOT( slotFontSelected( const QFont & ))); grid->addWidget( m_fontselect, 0, 0); - + // #if 0 // m_fontchooser = new KFontChooser ( this ); // m_fontchooser->enableColumn(KFontChooser::StyleList, false); 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 @@ -13,10 +13,10 @@ * ONLY VERSION 2 OF THE LICENSE IS APPLICABLE * * * ***************************************************************************/ -#include -#include "tinykate.h" -#include +#include + +#include "tinykate.h" OPIE_EXPORT_APP( OApplicationFactory ) 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 @@ -4,6 +4,6 @@ Priority: optional Section: opie/applications Maintainer: Opie Team 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 @@ -23,7 +23,7 @@ #include #include -#include +#include #include "tinykate.h" @@ -160,7 +160,7 @@ TinyKate::~TinyKate( ) shutDown=true; while (currentView!=0) { - slotClose(); + slotClose(); } if( KGlobal::config() != 0 ) { @@ -171,7 +171,7 @@ TinyKate::~TinyKate( ) 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); @@ -266,7 +266,7 @@ 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); 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 @@ -20,7 +20,7 @@ #include -#include +#include #include class QToolButton; 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,21 +1,21 @@ -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 \ $(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 -TARGET = kate +DEPENDPATH += $(OPIEDIR)/include +LIBS += -lqpe -ltinykate -lopiecore2 -lopieui2 +TARGET = kate -- cgit v0.9.0.2