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

List:       kde-commits
Subject:    kdenetwork/knewsticker/common
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2003-01-05 14:30:12
[Download RAW message or body]

CVS commit by mutz: 

KNewsTicker doesn't depend on libkdenetwork anymore, make that explicit by not \
linking to it anymore (approved by David Faure)


  M +2 -2      Makefile.am   1.8
  M +2 -7      configaccess.cpp   1.68


--- kdenetwork/knewsticker/common/Makefile.am  #1.7:1.8
@@ -1,3 +1,3 @@
-INCLUDES = -I$(top_srcdir)/libkdenetwork $(all_includes)
+INCLUDES = $(all_includes)
 
 noinst_LTLIBRARIES = libknewstickercommon.la
@@ -10,4 +10,4 @@
 libknewstickercommon_la_SOURCES = newsiconmgr.cpp xmlnewsaccess.cpp \
   configaccess.cpp newsiconmgr.skel newsengine.cpp
-libknewstickercommon_la_LIBADD = $(top_builddir)/libkdenetwork/libkdenetwork.la \
$(LIB_KIO) $(LIB_KDECORE) +libknewstickercommon_la_LIBADD = $(LIB_KIO) $(LIB_KDECORE)
 libknewstickercommon_la_LDFLAGS = $(all_libraries) -no-undefined

--- kdenetwork/knewsticker/common/configaccess.cpp  #1.67:1.68
@@ -12,10 +12,5 @@
 #include "newsengine.h"
 
-#if QT_VERSION < 300
-#  include <qregexp3.h>
-#else
-#  include <qregexp.h>
-#  define QRegExp3 QRegExp
-#endif
+#include <qregexp.h>
 
 #include <kdebug.h>
@@ -335,5 +330,5 @@ bool ArticleFilter::matches(Article::Ptr
                 matches = (a->headline() != expression());
         else { // condition() == i18n("match")
-                QRegExp3 regexp = QRegExp3(expression());
+                QRegExp regexp = QRegExp(expression());
                 matches = regexp.exactMatch(a->headline());
         }


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