TinyKate: libopie->libopie2

5 files changed, 61 insertions, 62 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>
 
@@ -43,7 +43,7 @@ class syntaxContextData
 
 typedef QList<syntaxModeListItem> 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 <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)
@@ -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 <qobjectlist.h>
 #include <qradiobutton.h>
 #include <qwhatsthis.h>
-#include <qstringlist.h> 
+#include <qstringlist.h>
 #include <klocale.h>
 #include <kcolorbtn.h>
 #include <qcombobox.h>
@@ -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 )
@@ -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);