yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

less Q3:

Browse source 
* remove unused Q3 includes
* port some Q3VBox, Q3HBox, Q3Frame, Q3PopupMenu

svn path=/trunk/KDE/kdebase/workspace/; revision=484457
This commit is contained in:
Urs Wolfer 2005-11-30 21:17:50 +00:00
parent eeea184331
commit 1cf79a8556
5 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kcmkwin/kwindecoration/buttons.cpp
View file

@ -38,7 +38,7 @@
#include <QDragLeaveEvent>
#include <QDragMoveEvent>
#include <QDropEvent>
#include <Q3Frame>
#include <QFrame>
#include <QResizeEvent>
#include <QVBoxLayout>
#include <QDragEnterEvent>
@ -274,9 +274,10 @@ void ButtonDropSiteItem::draw(QPainter *p, const QColorGroup& cg, QRect r)
ButtonDropSite::ButtonDropSite( QWidget* parent, const char* name )
: Q3Frame( parent, name ),
: QFrame( parent ),
m_selected(0)
{
setObjectName( name );
setAcceptDrops( TRUE );
setFrameShape( WinPanel );
setFrameShadow( Raised );

4
kcmkwin/kwindecoration/buttons.h
View file

@ -38,7 +38,7 @@
//Added by qt3to4:
#include <QDragLeaveEvent>
#include <QDragMoveEvent>
#include <Q3Frame>
#include <QFrame>
#include <QDropEvent>
#include <QList>
#include <QResizeEvent>
@ -145,7 +145,7 @@ typedef QList<ButtonDropSiteItem*> ButtonList;
/**
* This class renders and handles the demo titlebar dropsite
*/
class ButtonDropSite: public Q3Frame
class ButtonDropSite: public QFrame
{
Q_OBJECT

14
useractions.cpp
View file

@ -31,7 +31,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <kglobalaccel.h>
#include <kapplication.h>
#include <qregexp.h>
#include <Q3PopupMenu>
#include <QMenu>
#include <QVBoxLayout>
#include <kauthorized.h>
@ -45,17 +45,17 @@ namespace KWinInternal
// Workspace
//****************************************
Q3PopupMenu* Workspace::clientPopup()
QMenu* Workspace::clientPopup()
{
if ( !popup )
{
popup = new Q3PopupMenu;
popup = new QMenu;
popup->setCheckable( TRUE );
popup->setFont(KGlobalSettings::menuFont());
connect( popup, SIGNAL( aboutToShow() ), this, SLOT( clientPopupAboutToShow() ) );
connect( popup, SIGNAL( activated(int) ), this, SLOT( clientPopupActivated(int) ) );
advanced_popup = new Q3PopupMenu( popup );
advanced_popup = new QMenu( popup );
advanced_popup->setCheckable( TRUE );
advanced_popup->setFont(KGlobalSettings::menuFont());
connect( advanced_popup, SIGNAL( activated(int) ), this, SLOT( clientPopupActivated(int) ) );
@ -75,7 +75,7 @@ Q3PopupMenu* Workspace::clientPopup()
desk_popup_index = popup->count();
if (options->useTranslucency){
Q3PopupMenu *trans_popup = new Q3PopupMenu( popup );
QMenu *trans_popup = new QMenu( popup );
QVBoxLayout *transLayout = new QVBoxLayout(trans_popup);
trans_popup->setLayout( transLayout );
transButton = new QPushButton(trans_popup, "transButton");
@ -188,7 +188,7 @@ void Workspace::initDesktopPopup()
if (desk_popup)
return;
desk_popup = new Q3PopupMenu( popup );
desk_popup = new QMenu( popup );
desk_popup->setCheckable( TRUE );
desk_popup->setFont(KGlobalSettings::menuFont());
connect( desk_popup, SIGNAL( activated(int) ),
@ -987,7 +987,7 @@ void Workspace::showWindowMenu( const QRect &pos, Client* cl )
return;
active_popup_client = cl;
Q3PopupMenu* p = clientPopup();
QMenu* p = clientPopup();
active_popup = p;
int x = pos.left();
int y = pos.bottom();

1
workspace.cpp
View file

@ -18,7 +18,6 @@ License. See the file "COPYING" for the exact licensing terms.
#include <fixx11h.h>
#include <kconfig.h>
#include <kglobal.h>
#include <Q3PopupMenu>
#include <klocale.h>
#include <qregexp.h>
#include <qpainter.h>

10
workspace.h
View file

@ -25,7 +25,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <X11/Xlib.h>
class Q3PopupMenu;
class QMenu;
class KConfig;
class KGlobalAccel;
class KShortcutDialog;
@ -464,7 +464,7 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
void calcDesktopLayout(int &x, int &y) const;
Q3PopupMenu* clientPopup();
QMenu* clientPopup();
void closeActivePopup();
void updateClientArea( bool force );
@ -538,9 +538,9 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
TabBox* tab_box;
PopupInfo* popupinfo;
Q3PopupMenu *popup;
Q3PopupMenu *advanced_popup;
Q3PopupMenu *desk_popup;
QMenu *popup;
QMenu *advanced_popup;
QMenu *desk_popup;
int desk_popup_index;
KGlobalAccel *keys;