summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/accel.cxx7
-rw-r--r--vcl/source/window/accmgr.cxx15
-rw-r--r--vcl/source/window/debugevent.cxx6
-rw-r--r--vcl/source/window/layout.cxx4
-rw-r--r--vcl/source/window/menuitemlist.cxx4
-rw-r--r--vcl/source/window/status.cxx19
-rw-r--r--vcl/source/window/toolbox.cxx17
7 files changed, 34 insertions, 38 deletions
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index d06e6a28ebd8..9e6250323c8a 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -162,9 +162,9 @@ ImplAccelEntry* Accelerator::ImplGetAccelData( const vcl::KeyCode& rKeyCode ) co
void Accelerator::ImplCopyData( ImplAccelData& rAccelData )
{
// copy table
- for ( size_t i = 0, n = rAccelData.maIdList.size(); i < n; ++i )
+ for (ImplAccelEntry* i : rAccelData.maIdList)
{
- ImplAccelEntry* pEntry = new ImplAccelEntry( *rAccelData.maIdList[ i ] );
+ ImplAccelEntry* pEntry = new ImplAccelEntry( *i );
// sequence accelerator, then copy also
if ( pEntry->mpAccel )
@@ -183,8 +183,7 @@ void Accelerator::ImplCopyData( ImplAccelData& rAccelData )
void Accelerator::ImplDeleteData()
{
// delete accelerator-entries using the id-table
- for ( size_t i = 0, n = mpData->maIdList.size(); i < n; ++i ) {
- ImplAccelEntry* pEntry = mpData->maIdList[ i ];
+ for (ImplAccelEntry* pEntry : mpData->maIdList) {
if ( pEntry->mpAutoAccel ) {
delete pEntry->mpAutoAccel;
}
diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx
index 295a1681d40a..3b45dc742571 100644
--- a/vcl/source/window/accmgr.cxx
+++ b/vcl/source/window/accmgr.cxx
@@ -34,8 +34,8 @@ bool ImplAccelManager::InsertAccel( Accelerator* pAccel )
if ( !mpAccelList ) {
mpAccelList = new ImplAccelList;
} else {
- for ( size_t i = 0, n = mpAccelList->size(); i < n; ++i ) {
- if ( (*mpAccelList)[ i ] == pAccel ) {
+ for (Accelerator* i : *mpAccelList) {
+ if ( i == pAccel ) {
return false;
}
}
@@ -58,8 +58,8 @@ void ImplAccelManager::RemoveAccel( Accelerator* pAccel )
if ( mpSequenceList ) {
for (sal_uInt16 i = 0; i < pAccel->GetItemCount(); ++i) {
Accelerator* pSubAccel = pAccel->GetAccel( pAccel->GetItemId(i) );
- for ( size_t j = 0, n = mpSequenceList->size(); j < n; ++j ) {
- if ( (*mpSequenceList)[ j ] == pSubAccel ) {
+ for (Accelerator* j : *mpSequenceList) {
+ if ( j == pSubAccel ) {
EndSequence();
i = pAccel->GetItemCount();
break;
@@ -86,9 +86,8 @@ void ImplAccelManager::EndSequence()
if ( !mpSequenceList )
return;
- for ( size_t i = 0, n = mpSequenceList->size(); i < n; ++i )
+ for (Accelerator* pTempAccel : *mpSequenceList)
{
- Accelerator* pTempAccel = (*mpSequenceList)[ i ];
pTempAccel->mbIsCancel = false;
pTempAccel->mpDel = nullptr;
}
@@ -183,9 +182,9 @@ bool ImplAccelManager::IsAccelKey( const vcl::KeyCode& rKeyCode, sal_uInt16 nRep
}
// step through the list of accelerators
- for ( size_t i = 0, n = mpAccelList->size(); i < n; ++i )
+ for (Accelerator* i : *mpAccelList)
{
- pAccel = (*mpAccelList)[ i ];
+ pAccel = i;
// is the entry contained ?
ImplAccelEntry* pEntry = pAccel->ImplGetAccelData( rKeyCode );
diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx
index 3acf9d6e7daf..cff4d023dfdd 100644
--- a/vcl/source/window/debugevent.cxx
+++ b/vcl/source/window/debugevent.cxx
@@ -222,13 +222,13 @@ void DebugEventInjector::InjectKeyNavEdit()
double d = 0.0, nRand = getRandom();
sal_uInt16 nKey = KEY_SPACE;
- for ( size_t i = 0; i < SAL_N_ELEMENTS( nWeights ); ++i )
+ for (auto & rWeight : nWeights)
{
- d += nWeights[i].mnProb;
+ d += rWeight.mnProb;
assert (d < 1.01);
if ( nRand < d )
{
- nKey = nWeights[i].mnKey;
+ nKey = rWeight.mnKey;
break;
}
}
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 2c6cabff51e7..a3761389b208 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2043,8 +2043,8 @@ MessageDialog::MessageDialog(vcl::Window* pParent, const OString& rID, const OUS
void MessageDialog::dispose()
{
- for (size_t i = 0; i < m_aOwnedButtons.size(); ++i)
- m_aOwnedButtons[i].disposeAndClear();
+ for (VclPtr<PushButton> & pOwnedButton : m_aOwnedButtons)
+ pOwnedButton.disposeAndClear();
m_aOwnedButtons.clear();
m_pPrimaryMessage.disposeAndClear();
diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx
index 5f73bc5b9615..07a264502ccd 100644
--- a/vcl/source/window/menuitemlist.cxx
+++ b/vcl/source/window/menuitemlist.cxx
@@ -46,8 +46,8 @@ MenuItemData::~MenuItemData()
MenuItemList::~MenuItemList()
{
- for( size_t i = 0, n = maItemList.size(); i < n; ++i )
- delete maItemList[ i ];
+ for(MenuItemData* i : maItemList)
+ delete i;
}
MenuItemData* MenuItemList::Insert(
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 273e2cc6017f..86441cdca764 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -159,8 +159,8 @@ StatusBar::~StatusBar()
void StatusBar::dispose()
{
// delete all items
- for ( size_t i = 0, n = mpItemList->size(); i < n; ++i ) {
- delete (*mpItemList)[ i ];
+ for (ImplStatusItem* i : *mpItemList) {
+ delete i;
}
delete mpItemList;
@@ -235,8 +235,8 @@ void StatusBar::ImplFormat()
// sum up widths
mnItemsWidth = STATUSBAR_OFFSET_X;
long nOffset = 0;
- for ( size_t i = 0, n = mpItemList->size(); i < n; ++i ) {
- pItem = (*mpItemList)[ i ];
+ for (ImplStatusItem* i : *mpItemList) {
+ pItem = i;
if ( pItem->mbVisible )
{
if ( pItem->mnBits & StatusBarItemBits::AutoSize ) {
@@ -277,8 +277,8 @@ void StatusBar::ImplFormat()
nX += ImplGetSVData()->maNWFData.mnStatusBarLowerRightOffset;
}
- for ( size_t i = 0, n = mpItemList->size(); i < n; ++i ) {
- pItem = (*mpItemList)[ i ];
+ for (ImplStatusItem* i : *mpItemList) {
+ pItem = i;
if ( pItem->mbVisible ) {
if ( pItem->mnBits & StatusBarItemBits::AutoSize ) {
pItem->mnExtraWidth = nExtraWidth;
@@ -865,9 +865,8 @@ void StatusBar::DataChanged( const DataChangedEvent& rDCEvt )
mbFormat = true;
ImplInitSettings();
long nFudge = GetTextHeight() / 4;
- for ( size_t i = 0, n = mpItemList->size(); i < n; ++i )
+ for (ImplStatusItem* pItem : *mpItemList)
{
- ImplStatusItem* pItem = (*mpItemList)[ i ];
long nWidth = GetTextWidth( pItem->maText ) + nFudge;
if( nWidth > pItem->mnWidth + STATUSBAR_OFFSET )
pItem->mnWidth = nWidth + STATUSBAR_OFFSET;
@@ -1008,8 +1007,8 @@ bool StatusBar::IsItemVisible( sal_uInt16 nItemId ) const
void StatusBar::Clear()
{
// delete all items
- for ( size_t i = 0, n = mpItemList->size(); i < n; ++i ) {
- delete (*mpItemList)[ i ];
+ for (ImplStatusItem* i : *mpItemList) {
+ delete i;
}
mpItemList->clear();
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 4fa7ecaefff0..8cb37f236f34 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1132,9 +1132,9 @@ ImplTBDragMgr::~ImplTBDragMgr()
ToolBox* ImplTBDragMgr::FindToolBox( const Rectangle& rRect )
{
- for ( size_t i = 0, n = mpBoxList->size(); i < n; ++i )
+ for (VclPtr<ToolBox> & i : *mpBoxList)
{
- ToolBox* pBox = (*mpBoxList)[ i ];
+ ToolBox* pBox = i;
/*
* FIXME: since we can have multiple frames now we cannot
* find the drag target by its position alone.
@@ -4190,9 +4190,9 @@ void ToolBox::Resize()
{
//Get how big the optimal size is
Rectangle aBounds;
- for (size_t i = 0; i < mpData->m_aItems.size(); ++i)
+ for (const ImplToolItem & rItem : mpData->m_aItems)
{
- aBounds.Union( mpData->m_aItems[i].maRect );
+ aBounds.Union( rItem.maRect );
}
long nOptimalWidth = aBounds.GetWidth();
@@ -4201,9 +4201,8 @@ void ToolBox::Resize()
//share out the diff from optimal to real across
//expandable entries
- for (size_t i = 0; i < aExpandables.size(); ++i)
+ for (size_t nIndex : aExpandables)
{
- size_t nIndex = aExpandables[i];
vcl::Window *pWindow = mpData->m_aItems[nIndex].mpWindow;
Size aWinSize(pWindow->GetSizePixel());
Size aPrefSize(pWindow->get_preferred_size());
@@ -4809,11 +4808,11 @@ Size ToolBox::GetOptimalSize() const
// If we have any expandable entries, then force them to their
// optimal sizes, then reset them afterwards
std::map<vcl::Window*, Size> aExpandables;
- for (size_t i = 0; i < mpData->m_aItems.size(); ++i)
+ for (ImplToolItem & rItem : mpData->m_aItems)
{
- if (mpData->m_aItems[i].mbExpand)
+ if (rItem.mbExpand)
{
- vcl::Window *pWindow = mpData->m_aItems[i].mpWindow;
+ vcl::Window *pWindow = rItem.mpWindow;
SAL_INFO_IF(!pWindow, "vcl.layout", "only tabitems with window supported at the moment");
if (!pWindow)
continue;
generated by cgit (git 2.34.1) at 2024-07-30 05:14:23 +0000