Rename a number of classes to enhance compatibility with KDE4

5 files changed, 19 insertions, 19 deletions

diff --git a/libtdeedu/extdate/extdatepicker.cpp b/libtdeedu/extdate/extdatepicker.cpp
index e9f2f4fe..e0953ef3 100644
--- a/libtdeedu/extdate/extdatepicker.cpp
+++ b/libtdeedu/extdate/extdatepicker.cpp
@@ -383,7 +383,7 @@ ExtDatePicker::selectYearClicked()
   }
 
   int year;
-  KPopupFrame* popup = new KPopupFrame(this);
+  TDEPopupFrame* popup = new TDEPopupFrame(this);
   ExtDateInternalYearSelector* picker = new ExtDateInternalYearSelector(popup);
   // -----
   picker->resize(picker->sizeHint());
diff --git a/libtdeedu/extdate/extdatetbl.cpp b/libtdeedu/extdate/extdatetbl.cpp
index 295f1442..eb9f9a51 100644
--- a/libtdeedu/extdate/extdatetbl.cpp
+++ b/libtdeedu/extdate/extdatetbl.cpp
@@ -450,7 +450,7 @@ ExtDateTable::contentsMousePressEvent(TQMouseEvent *e)
 
   if (  e->button() == Qt::RightButton && d->popupMenuEnabled )
   {
-        KPopupMenu *menu = new KPopupMenu();
+        TDEPopupMenu *menu = new TDEPopupMenu();
 
 //FIXME: Uncomment the following line (and remove the one after it)
 //       if ExtDate is added to tdelibs
@@ -873,7 +873,7 @@ ExtDateInternalYearSelector::setYear(int year)
   setText(temp);
 }
 
-KPopupFrame::KPopupFrame(TQWidget* parent, const char*  name)
+TDEPopupFrame::TDEPopupFrame(TQWidget* parent, const char*  name)
   : TQFrame(parent, name, WType_Popup),
     result(0), // rejected
     main(0)
@@ -883,7 +883,7 @@ KPopupFrame::KPopupFrame(TQWidget* parent, const char*  name)
 }
 
 void
-KPopupFrame::keyPressEvent(TQKeyEvent* e)
+TDEPopupFrame::keyPressEvent(TQKeyEvent* e)
 {
   if(e->key()==Key_Escape)
     {
@@ -893,14 +893,14 @@ KPopupFrame::keyPressEvent(TQKeyEvent* e)
 }
 
 void
-KPopupFrame::close(int r)
+TDEPopupFrame::close(int r)
 {
   result=r;
   tqApp->exit_loop();
 }
 
 void
-KPopupFrame::setMainWidget(TQWidget* m)
+TDEPopupFrame::setMainWidget(TQWidget* m)
 {
   main=m;
   if(main!=0)
@@ -910,7 +910,7 @@ KPopupFrame::setMainWidget(TQWidget* m)
 }
 
 void
-KPopupFrame::resizeEvent(TQResizeEvent*)
+TDEPopupFrame::resizeEvent(TQResizeEvent*)
 {
   if(main!=0)
     {
@@ -920,7 +920,7 @@ KPopupFrame::resizeEvent(TQResizeEvent*)
 }
 
 void
-KPopupFrame::popup(const TQPoint &pos)
+TDEPopupFrame::popup(const TQPoint &pos)
 {
   // Make sure the whole popup is visible.
   TQRect d = TDEGlobalSettings::desktopGeometry(pos);
@@ -944,7 +944,7 @@ KPopupFrame::popup(const TQPoint &pos)
 }
 
 int
-KPopupFrame::exec(TQPoint pos)
+TDEPopupFrame::exec(TQPoint pos)
 {
   popup(pos);
   repaint();
@@ -954,12 +954,12 @@ KPopupFrame::exec(TQPoint pos)
 }
 
 int
-KPopupFrame::exec(int x, int y)
+TDEPopupFrame::exec(int x, int y)
 {
   return exec(TQPoint(x, y));
 }
 
-void KPopupFrame::virtual_hook( int, void* )
+void TDEPopupFrame::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 void ExtDateTable::virtual_hook( int, void* )
diff --git a/libtdeedu/extdate/extdatetbl.h b/libtdeedu/extdate/extdatetbl.h
index 06aa0122..99ce6a69 100644
--- a/libtdeedu/extdate/extdatetbl.h
+++ b/libtdeedu/extdate/extdatetbl.h
@@ -31,7 +31,7 @@
 #include <klineedit.h>
 #include "extcalendarsystemgregorian.h"
 
-class KPopupMenu;
+class TDEPopupMenu;
 
 /** Week selection widget.
 * @internal
@@ -177,7 +177,7 @@ private:
  * @author Tim Gilman, Mirko Boehm
  * @version $Id$
  */
-class KPopupFrame : public TQFrame
+class TDEPopupFrame : public TQFrame
 {
   Q_OBJECT
   
@@ -204,7 +204,7 @@ public:
   /**
    * The contructor. Creates a dialog without buttons.
    */
-  KPopupFrame(TQWidget* parent=0, const char*  name=0);
+  TDEPopupFrame(TQWidget* parent=0, const char*  name=0);
   /**
    * Set the main widget. You cannot set the main widget from the constructor,
    * since it must be a child of the frame itselfes.
@@ -237,8 +237,8 @@ private:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  class KPopupFramePrivate;
-  KPopupFramePrivate *d;
+  class TDEPopupFramePrivate;
+  TDEPopupFramePrivate *d;
 };
 
 /**
@@ -420,7 +420,7 @@ signals:
      *
      * @since 3.2
      */
-    void aboutToShowContextMenu( KPopupMenu * menu, const ExtDate &date);
+    void aboutToShowContextMenu( TDEPopupMenu * menu, const ExtDate &date);
 
 protected:
   virtual void virtual_hook( int id, void* data );
diff --git a/libtdeedu/extdate/testwidget.cpp b/libtdeedu/extdate/testwidget.cpp
index 0267ddeb..8a517c4a 100644
--- a/libtdeedu/extdate/testwidget.cpp
+++ b/libtdeedu/extdate/testwidget.cpp
@@ -25,7 +25,7 @@
 #include "extdatewidget.h"
 #include "testwidget.h"
 
-TestWidget::TestWidget( TQWidget *p=0, const char *name=0 ) : KMainWindow( p, name ) {
+TestWidget::TestWidget( TQWidget *p=0, const char *name=0 ) : TDEMainWindow( p, name ) {
 	TQWidget *w = new TQWidget(this);
 
 	glay = new TQGridLayout(w, 3, 2);
diff --git a/libtdeedu/extdate/testwidget.h b/libtdeedu/extdate/testwidget.h
index c05e74ea..82118881 100644
--- a/libtdeedu/extdate/testwidget.h
+++ b/libtdeedu/extdate/testwidget.h
@@ -29,7 +29,7 @@ class TQGridLayout;
 class TQDate;
 class ExtDate;
 
-class TestWidget : public KMainWindow {
+class TestWidget : public TDEMainWindow {
 	Q_OBJECT
   
 	public: