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

QList -> QPtrList

Browse source 
QArray -> QMemArray

svn path=/trunk/kdebase/kwin/; revision=113976
This commit is contained in:
Laurent Montel 2001-09-11 06:53:46 +00:00
parent 354bd37bdb
commit 4ef029256c
7 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clients/riscos/Manager.cpp
View file

@ -582,7 +582,7 @@ Manager::createTitle()
buttons = "XSH|IA";
QList<Button> *buttonList = &leftButtonList_;
QPtrList<Button> *buttonList = &leftButtonList_;
for (unsigned int i = 0; i < buttons.length(); ++i)
{
@ -619,7 +619,7 @@ Manager::createTitle()
buttonList->append(tb);
}
for (QListIterator<Button> it(leftButtonList_); it.current(); ++it)
for (QPtrListIterator<Button> it(leftButtonList_); it.current(); ++it)
{
it.current()->setAlignment(Button::Left);
titleLayout_->addWidget(it.current());
@ -636,7 +636,7 @@ Manager::createTitle()
titleLayout_->addItem(titleSpacer_);
for (QListIterator<Button> it(rightButtonList_); it.current(); ++it)
for (QPtrListIterator<Button> it(rightButtonList_); it.current(); ++it)
{
it.current()->setAlignment(Button::Right);
titleLayout_->addWidget(it.current());

4
clients/riscos/Manager.h
View file

@ -105,8 +105,8 @@ class Manager : public KWinInternal::Client
QSpacerItem * titleSpacer_;
QPixmap titleBuf_;
QList<Button> leftButtonList_;
QList<Button> rightButtonList_;
QPtrList<Button> leftButtonList_;
QPtrList<Button> rightButtonList_;
};
class ToolManager : public Manager

4
clients/riscos/Palette.h
View file

@ -23,7 +23,7 @@
#ifndef RISC_OS_PALETTE_H
#define RISC_OS_PALETTE_H
#include <qarray.h>
#include <qmemarray.h>
#include <qglobal.h>
namespace RiscOS
@ -59,7 +59,7 @@ class Palette
private:
QArray<QRgb> data_;
QMemArray<QRgb> data_;
};
} // End namespace

10
clients/riscos/Static.cpp
View file

@ -1,6 +1,6 @@
/*
RISC OS KWin client
Copyright 2000
Rik Hemsley <rik@kde.org>
@ -22,13 +22,13 @@
// for enable-final
#ifdef Bool
#undef Bool
#undef Bool
#endif
#include <qimage.h>
#include <qpixmap.h>
#include <qpainter.h>
#include <qlist.h>
#include <qptrlist.h>
#include <ksimpleconfig.h>
@ -86,7 +86,7 @@ Static::_drawBorder(QPixmap & pix, int w, int h)
painter_.setPen(c0);
painter_.drawPoint(0, 0);
painter_.setPen(c1);
painter_.drawPoint(1, 1);
painter_.drawLine(1, 0, w - 1, 0);
@ -118,7 +118,7 @@ Static::_drawBorder(QPixmap & pix, int w, int h)
painter_.setPen(c7);
painter_.drawPoint(w - 1, h - 1);
painter_.drawPoint(w, h);
painter_.end();
painter_.resetXForm();

10
clients/web/Web.cpp
View file

@ -174,7 +174,7 @@ Web::doShape()
{
if (!shape_)
return;
QRegion mask(0, 0, width(), height());
int r(width());
@ -379,7 +379,7 @@ Web::_createButtons()
rightButtonList_ .clear();
QString buttons = options->titleButtonsLeft() + "|" + options->titleButtonsRight();
QList<WebButton> *buttonList = &leftButtonList_;
QPtrList<WebButton> *buttonList = &leftButtonList_;
for (unsigned int i = 0; i < buttons.length(); ++i)
{
WebButton * tb = 0;
@ -470,7 +470,7 @@ Web::_resetLayout()
// Add left-side buttons.
for (QListIterator<WebButton> it(leftButtonList_); it.current(); ++it)
for (QPtrListIterator<WebButton> it(leftButtonList_); it.current(); ++it)
{
topLayout->addWidget(it.current(), Qt::AlignVCenter);
topLayout->setStretchFactor(it.current(), 0);
@ -481,7 +481,7 @@ Web::_resetLayout()
// Add right-side buttons.
for (QListIterator<WebButton> it(rightButtonList_); it.current(); ++it)
for (QPtrListIterator<WebButton> it(rightButtonList_); it.current(); ++it)
{
topLayout->addWidget(it.current(), Qt::AlignVCenter);
it.current()->setFixedSize(titleHeight, titleHeight);
@ -490,7 +490,7 @@ Web::_resetLayout()
// -------------------------------------------------------------------
QHBoxLayout * midLayout = new QHBoxLayout(mainLayout_, 0, 0);
midLayout->addSpacing(sideMargin);
midLayout->addWidget(windowWrapper());
midLayout->addSpacing(sideMargin);

6
clients/web/Web.h
View file

@ -22,7 +22,7 @@
#ifndef KWIN_WEB_H
#define KWIN_WEB_H
#include <qlist.h>
#include <qptrlist.h>
#include <kwin/client.h>
@ -103,8 +103,8 @@ namespace KWinInternal
QBoxLayout * mainLayout_;
QSpacerItem * titleSpacer_;
QList<WebButton> leftButtonList_;
QList<WebButton> rightButtonList_;
QPtrList<WebButton> leftButtonList_;
QPtrList<WebButton> rightButtonList_;
};
}

8
workspace.h
View file

@ -11,7 +11,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
#include <qpopupmenu.h>
#include <qguardedptr.h>
#include <qvaluelist.h>
#include <qlist.h>
#include <qptrlist.h>
#include <qtimer.h>
#include <config.h>
#include "options.h"
@ -376,7 +376,7 @@ private:
int current_desktop;
int number_of_desktops;
QArray<int> desktop_focus_chain;
QMemArray<int> desktop_focus_chain;
QGuardedPtr<Client> popup_client;
@ -384,8 +384,8 @@ private:
QWidget* desktop_widget;
QList<SessionInfo> session;
QList<SessionInfo> fakeSession;
QPtrList<SessionInfo> session;
QPtrList<SessionInfo> fakeSession;
void loadFakeSessionInfo();
void storeFakeSessionInfo( Client* c );
void writeFakeSessionInfo();