[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/khexedit2/src
From:       Friedrich W. H. Kossebau
Date:       2003-10-01 20:33:02
[Download RAW message or body]

CVS commit by kossebau: 

making what has been left from the move work again


  M +5 -4      Makefile.am   1.7
  M +3 -3      kpart/Makefile.am   1.3
  M +4 -6      test/beinterface/main.cpp   1.5
  M +2 -1      test/byteseditapp/Makefile.am   1.6
  M +6 -6      test/byteseditapp/byteseditapp.cpp   1.7


--- kdenonbeta/khexedit2/src/Makefile.am  #1.6:1.7
@@ -1,5 +1,6 @@
-#SUBDIRS = lib interface dplugin kpart app test
-SUBDIRS = lib interface test
+#SUBDIRS = dplugin kpart app test
+#SUBDIRS = kpart app test
+#SUBDIRS = lib interface test
 #SUBDIRS = lib dplugin
-#SUBDIRS = lib kpart
-#SUBDIRS = lib test
+SUBDIRS = kpart test
+#SUBDIRS = test

--- kdenonbeta/khexedit2/src/kpart/Makefile.am  #1.2:1.3
@@ -1,3 +1,3 @@
-INCLUDES = -I$(srcdir)/../lib $(all_includes)
+INCLUDES = -I$(top_srcdir)/../kdeutils/khexedit/lib $(all_includes)
 
 noinst_HEADERS = khepart.h khepartfactory.h
@@ -9,6 +9,6 @@
 # the Part's source, library search path, and link libraries
 libkhexedit2part_la_SOURCES = khepart.cpp khepartfactory.cpp
-libkhexedit2part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libkhexedit2part_la_LIBADD = ../lib/libkhexedit.la $(LIB_KPARTS) $(LIB_KFILE)
+libkhexedit2part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH)
+libkhexedit2part_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) -lkhexedit
 
 partdesktopdir   = $(kde_servicesdir)

--- kdenonbeta/khexedit2/src/test/beinterface/main.cpp  #1.4:1.5
@@ -6,8 +6,7 @@
 #include <kparts/componentfactory.h>
 // app
-#include "byteseditinterface.h"
-//#include "interface.h"
-#include "hexcolumninterface.h"
-#include "textcolumninterface.h"
+#include <khexedit/byteseditinterface.h>
+#include <khexedit/hexcolumninterface.h>
+#include <khexedit/textcolumninterface.h>
 
 using namespace KHE;
@@ -25,6 +24,5 @@ int main( int argc, char* argv[] )
   KApplication app( argc, argv );
 
-  QWidget *BytesEditWidget =
-    KParts::ComponentFactory::createInstanceFromQuery<QWidget>("KHexEdit/KBytesEdit", \
QString::null, 0 ); +  QWidget *BytesEditWidget = createBytesEditWidget();
   // was kdeutils installed, so the widget could be found?
   if( BytesEditWidget )

--- kdenonbeta/khexedit2/src/test/byteseditapp/Makefile.am  #1.5:1.6
@@ -4,5 +4,6 @@
 
 # set the include path for X, qt and KDE
-INCLUDES = $(all_includes) -I$(srcdir)/../../interface
+INCLUDES = $(all_includes) 
+#-I$(srcdir)/../../interface
 
 byteseditapp_LDFLAGS = $(KDE_RPATH) $(all_libraries)

--- kdenonbeta/khexedit2/src/test/byteseditapp/byteseditapp.cpp  #1.6:1.7
@@ -45,10 +45,10 @@
 #include <kaction.h>
 #include <kstdaction.h>
-// new kde specific // TODO: add khexeditor/
-#include <byteseditinterface.h>
-#include <hexcolumninterface.h>
-#include <textcolumninterface.h>
-#include <clipboardinterface.h>
-#include <zoominterface.h>
+// new kde specific
+#include <khexedit/byteseditinterface.h>
+#include <khexedit/hexcolumninterface.h>
+#include <khexedit/textcolumninterface.h>
+#include <khexedit/clipboardinterface.h>
+#include <khexedit/zoominterface.h>
 // app specific
 #include "byteseditapp.h"


[prev in list] [next in list] [prev in thread] [next in thread]