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

List:       kde-commits
Subject:    KDE/kdenetwork/kppp
From:       Laurent Montel <montel () kde ! org>
Date:       2005-12-13 9:09:41
Message-ID: 1134464981.504117.12904.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 488109 by mlaurent:

Port to QMenu


 M  +4 -4      miniterm.cpp  
 M  +4 -4      miniterm.h  


--- trunk/KDE/kdenetwork/kppp/miniterm.cpp #488108:488109
@@ -59,10 +59,10 @@
   setCaption(i18n("Kppp Mini-Terminal"));
   KWin::setIcons(winId(), \
qApp->windowIcon().pixmap(IconSize(KIcon::Desktop),IconSize(KIcon::Desktop)), \
qApp->windowIcon().pixmap(IconSize(KIcon::Small),IconSize(KIcon::Small)));  
-  m_file = new Q3PopupMenu(this);
-  m_file->insertItem( SmallIcon("fileclose"), i18n("&Close"), this, \
                SLOT(cancelbutton()) );
-  m_options = new Q3PopupMenu(this);
-  m_options->insertItem(i18n("&Reset Modem"),this,SLOT(resetModem()));
+  m_file = new QMenu(this);
+  m_file->addAction( SmallIcon("fileclose"), i18n("&Close"), this, \
SLOT(cancelbutton()) ); +  m_options = new QMenu(this);
+  m_options->addAction(i18n("&Reset Modem"),this,SLOT(resetModem()));
   m_help =
     new KHelpMenu(this,
 		      i18n("MiniTerm - A terminal emulation for KPPP\n\n"
--- trunk/KDE/kdenetwork/kppp/miniterm.h #488108:488109
@@ -35,7 +35,7 @@
 //Added by qt3to4:
 #include <QLabel>
 #include <QKeyEvent>
-#include <Q3PopupMenu>
+#include <QMenu>
 #include <QCloseEvent>
 #include <ktoolbar.h>
 
@@ -88,9 +88,9 @@
 
   QMenuBar    * menubar;
   KToolBar     * toolbar;
-  Q3PopupMenu  * m_file;
-  Q3PopupMenu  * m_edit;
-  Q3PopupMenu  * m_options;
+  QMenu  * m_file;
+  QMenu  * m_edit;
+  QMenu  * m_options;
   KHelpMenu  * m_help;
   QLabel      * statusbar;
   QPushButton *pb1;


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