Make it compile.

Falling back on the kde3support for extdate (because of kpopupmenu) ;(

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=466737

diff --git a/extdate/Makefile.am b/extdate/Makefile.am
index e2234d10682ab993a74a961185670b572b6351dd..a529657113e99c94b2ffa13d19ec8e72d900f64e 100644 (file)
--- a/extdate/Makefile.am
+++ b/extdate/Makefile.am
@@ -7,6 +7,6 @@ lib_LTLIBRARIES = libextdate.la
 libextdate_la_SOURCES = extdatetime.cpp extcalendarsystem.cpp extcalendarsystemgregorian.cpp extdatetbl.cpp extdatepicker.cpp extdatetimeedit.cpp extdatewidget.cpp
 
 libextdate_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-libextdate_la_LIBADD = $(LIB_KDEUI)
+libextdate_la_LIBADD = $(LIB_KDEUI) -lkde3support
 
 METASOURCES = AUTO

diff --git a/extdate/extdatetbl.cpp b/extdate/extdatetbl.cpp
index 23f880d5494e5c0adf21d131189e26043d96a2d7..7d3699e5e02a24f7d9a752ceda70dc5c216e0cce 100644 (file)
--- a/extdate/extdatetbl.cpp
+++ b/extdate/extdatetbl.cpp
@@ -46,7 +46,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
-#include "kpopupmenu.h"
+#include "k3popupmenu.h"
 #include <QPainter>
 #include <Q3Dict>
 //Added by qt3to4:
@@ -459,7 +459,7 @@ ExtDateTable::contentsMousePressEvent(QMouseEvent *e)
 
   if (  e->button() == Qt::RightButton && d->popupMenuEnabled )
   {
-        KPopupMenu *menu = new KPopupMenu();
+        K3PopupMenu *menu = new K3PopupMenu();
 
 //FIXME: Uncomment the following line (and remove the one after it)
 //       if ExtDate is added to kdelibs

diff --git a/extdate/extdatetbl.h b/extdate/extdatetbl.h
index 2ddd0c01b4d4ccc3d6b553dcbf32f7efc90e67a9..8cc86c56004466f662055a214a3e8b7259e24494 100644 (file)
--- a/extdate/extdatetbl.h
+++ b/extdate/extdatetbl.h
@@ -38,7 +38,7 @@
 #include <klineedit.h>
 #include "extcalendarsystemgregorian.h"
 
-class KPopupMenu;
+class K3PopupMenu;
 class QPainter;
 
 /** Week selection widget.
@@ -423,7 +423,7 @@ signals:
      *
      * @since 3.2
      */
-    void aboutToShowContextMenu( KPopupMenu * menu, const ExtDate &date);
+    void aboutToShowContextMenu( K3PopupMenu * menu, const ExtDate &date);
 
 protected:
   virtual void virtual_hook( int id, void* data );

diff --git a/kdeeduui/kdeeduglossary.cpp b/kdeeduui/kdeeduglossary.cpp
index 31489e3b29c273cb73d7a3912f9b671f87c11fa4..223ecc08fcf68c5d671ed176c840e304f01abcdc 100644 (file)
--- a/kdeeduui/kdeeduglossary.cpp
+++ b/kdeeduui/kdeeduglossary.cpp
@@ -217,7 +217,8 @@ GlossaryDialog::GlossaryDialog( bool folded, QWidget *parent )
        lbl->setText( i18n( "Search:" ) );
        hbox->addWidget( lbl );
 
-       m_search = new KListViewSearchLine( plainPage(), 0, "search-line" );
+       m_search = new KListViewSearchLine( plainPage(), 0L );
+       m_search->setObjectName( "search-line" );
        hbox->addWidget( m_search );
        vbox->addLayout( hbox );
        setFocusProxy(m_search);
@@ -225,7 +226,8 @@ GlossaryDialog::GlossaryDialog( bool folded, QWidget *parent )
        QSplitter *vs = new QSplitter( plainPage() );
        vbox->addWidget( vs );
 
-       m_glosstree = new KListView( vs, "treeview" );
+       m_glosstree = new KListView( vs );
+       m_glosstree->setObjectName( "treeview" );
        m_glosstree->addColumn( "entries" );
        m_glosstree->header()->hide();
        m_glosstree->setFullWidth( true );