From 9e2b40a56c9bbd04a37393773210bc05bd5332f5 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Mon, 3 Oct 2005 10:52:28 +0000 Subject: [PATCH] Make it compile. Falling back on the kde3support for extdate (because of kpopupmenu) ;( svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=466737 --- extdate/Makefile.am | 2 +- extdate/extdatetbl.cpp | 4 ++-- extdate/extdatetbl.h | 4 ++-- kdeeduui/kdeeduglossary.cpp | 6 ++++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/extdate/Makefile.am b/extdate/Makefile.am index e2234d1..a529657 100644 --- 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 23f880d..7d3699e 100644 --- a/extdate/extdatetbl.cpp +++ b/extdate/extdatetbl.cpp @@ -46,7 +46,7 @@ #include #include #include -#include "kpopupmenu.h" +#include "k3popupmenu.h" #include #include //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 2ddd0c0..8cc86c5 100644 --- a/extdate/extdatetbl.h +++ b/extdate/extdatetbl.h @@ -38,7 +38,7 @@ #include #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 31489e3..223ecc0 100644 --- 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 ); -- 2.47.3