Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
System
KSystemLog
Commits
bdd70a69
Commit
bdd70a69
authored
Mar 26, 2021
by
Laurent Montel
😁
Browse files
Port foreach/forever
parent
ef5e1f65
Changes
10
Hide whitespace changes
Inline
Side-by-side
src/lib/fileAnalyzer.cpp
View file @
bdd70a69
...
...
@@ -63,11 +63,7 @@ void FileAnalyzer::deleteLogFiles()
watchLogFiles
(
false
);
// Remove the watching on the monitored files
foreach
(
LogFileReader
*
logFileReader
,
mLogFileReaders
)
{
logDebug
()
<<
"Remove file : "
<<
logFileReader
->
logFile
().
url
().
toLocalFile
();
delete
logFileReader
;
}
qDeleteAll
(
mLogFileReaders
);
mLogFileReaders
.
clear
();
}
...
...
src/lib/globals.cpp
View file @
bdd70a69
...
...
@@ -84,24 +84,16 @@ Globals::Globals()
Globals
::~
Globals
()
{
foreach
(
LogModeAction
*
logModeAction
,
d
->
mLogModeActions
)
{
delete
logModeAction
;
}
qDeleteAll
(
d
->
mLogModeActions
);
d
->
mLogModeActions
.
clear
();
foreach
(
LogMode
*
logMode
,
d
->
mLogModes
)
{
delete
logMode
;
}
qDeleteAll
(
d
->
mLogModes
);
d
->
mLogModes
.
clear
();
foreach
(
LogLevel
*
logLevel
,
d
->
mLogLevels
)
{
delete
logLevel
;
}
qDeleteAll
(
d
->
mLogLevels
);
d
->
mLogLevels
.
clear
();
foreach
(
LogModeFactory
*
factory
,
d
->
mFactories
)
{
delete
factory
;
}
qDeleteAll
(
d
->
mFactories
);
d
->
mFactories
.
clear
();
delete
d
;
...
...
@@ -262,13 +254,11 @@ LogMode *Globals::findLogMode(const QString &logModeName)
void
Globals
::
recreateLogModeActions
()
{
// Delete existing log mode actions.
foreach
(
LogModeAction
*
logModeAction
,
d
->
mLogModeActions
)
{
delete
logModeAction
;
}
qDeleteAll
(
d
->
mLogModeActions
);
d
->
mLogModeActions
.
clear
();
// Create new log mode action for each log mode.
for
each
(
LogModeFactory
*
factory
,
d
->
mFactories
)
{
for
(
LogModeFactory
*
factory
:
qAsConst
(
d
->
mFactories
)
)
{
LogModeAction
*
logModeAction
=
factory
->
createLogModeAction
();
if
(
logModeAction
)
{
d
->
mLogModeActions
.
append
(
logModeAction
);
...
...
src/lib/kioLogFileReader.cpp
View file @
bdd70a69
...
...
@@ -118,7 +118,7 @@ void KioLogFileReader::dataReceived(KIO::Job *job, const QByteArray &data)
void
KioLogFileReader
::
emitCompleteLines
()
{
int
endLinePos
=
mBuffer
.
indexOf
(
QLatin1String
(
"
\n
"
));
forever
{
while
(
1
)
{
if
(
endLinePos
==
-
1
)
{
break
;
}
...
...
src/lib/logViewModel.cpp
View file @
bdd70a69
...
...
@@ -74,7 +74,8 @@ bool LogViewModel::isEmpty() const
void
LogViewModel
::
removeRecentStatusOfLogLines
()
{
// The older lines are no longer recent
foreach
(
LogViewWidgetItem
*
item
,
mLogViewWidget
->
items
())
{
const
auto
items
=
mLogViewWidget
->
items
();
for
(
LogViewWidgetItem
*
item
:
items
)
{
item
->
logLine
()
->
setRecent
(
false
);
}
}
...
...
@@ -194,7 +195,8 @@ void LogViewModel::removeOldestLogLine()
mOldestItem
=
nullptr
;
// Find the next oldest item
foreach
(
LogViewWidgetItem
*
item
,
mLogViewWidget
->
items
())
{
const
auto
items
{
mLogViewWidget
->
items
()};
for
(
LogViewWidgetItem
*
item
:
items
)
{
if
(
!
mOldestItem
)
{
mOldestItem
=
item
;
continue
;
...
...
src/lib/processOutputLogFileReader.cpp
View file @
bdd70a69
...
...
@@ -203,7 +203,7 @@ void ProcessOutputLogFileReader::logFileModified()
// Parse buffer
int
endLinePos
=
d
->
mBuffer
.
indexOf
(
QLatin1String
(
"
\n
"
));
forever
{
while
(
1
)
{
if
(
endLinePos
==
-
1
)
{
break
;
}
...
...
src/mainWindow.cpp
View file @
bdd70a69
...
...
@@ -260,7 +260,8 @@ void MainWindow::updateReloading()
mTabs
->
changeReloadingTab
(
currentView
,
!
enabled
);
// Enables/Disables all Log Mode menus (useful for multiple actions menus)
foreach
(
LogModeAction
*
logModeAction
,
Globals
::
instance
().
logModeActions
())
{
const
auto
logModeActions
{
Globals
::
instance
().
logModeActions
()};
for
(
LogModeAction
*
logModeAction
:
logModeActions
)
{
logModeAction
->
actionMenu
()
->
setEnabled
(
enabled
);
}
}
...
...
@@ -300,7 +301,8 @@ void MainWindow::toggleItemTooltip(bool enabled)
{
KSystemLogConfig
::
setTooltipEnabled
(
enabled
);
foreach
(
LogManager
*
manager
,
mTabs
->
logManagers
())
{
const
auto
logManagers
{
mTabs
->
logManagers
()};
for
(
LogManager
*
manager
:
logManagers
)
{
manager
->
usedView
()
->
logViewWidget
()
->
toggleToolTip
(
enabled
);
}
}
...
...
@@ -364,7 +366,8 @@ void MainWindow::changeResumePauseAction(bool paused)
}
// Be sure that the button will always have a good size
foreach
(
QWidget
*
widget
,
mResumePauseAction
->
associatedWidgets
())
{
const
auto
associatedWidgets
{
mResumePauseAction
->
associatedWidgets
()};
for
(
QWidget
*
widget
:
associatedWidgets
)
{
if
(
widget
->
sizeHint
().
width
()
>
widget
->
size
().
width
())
{
widget
->
setMinimumSize
(
widget
->
sizeHint
());
}
...
...
@@ -487,7 +490,8 @@ void MainWindow::toggleFilterBar()
{
logDebug
()
<<
"Toggling filter bar..."
<<
mFilterBarAction
->
isChecked
();
foreach
(
LogManager
*
manager
,
mTabs
->
logManagers
())
{
const
auto
logManagers
{
mTabs
->
logManagers
()};
for
(
LogManager
*
manager
:
logManagers
)
{
manager
->
usedView
()
->
toggleLogViewFilter
(
mFilterBarAction
->
isChecked
());
}
...
...
@@ -727,7 +731,8 @@ void MainWindow::selectLogModeAction(bool)
logDebug
()
<<
"Selected action"
<<
selectedModeId
;
LogMode
*
currentMode
=
nullptr
;
foreach
(
LogMode
*
logMode
,
Globals
::
instance
().
logModes
())
{
const
auto
logModes
{
Globals
::
instance
().
logModes
()};
for
(
LogMode
*
logMode
:
logModes
)
{
if
(
logMode
->
id
()
==
selectedModeId
)
{
currentMode
=
logMode
;
break
;
...
...
@@ -763,7 +768,8 @@ void MainWindow::setupLogModeMenu()
auto
servicesAction
=
new
KActionMenu
(
QIcon
::
fromTheme
(
QStringLiteral
(
"preferences-system-session-services"
)),
i18n
(
"Services"
),
this
);
auto
othersAction
=
new
KActionMenu
(
QIcon
::
fromTheme
(
QStringLiteral
(
"preferences-other"
)),
i18n
(
"Others"
),
this
);
foreach
(
LogModeAction
*
logModeAction
,
Globals
::
instance
().
logModeActions
())
{
const
auto
logModeActions
{
Globals
::
instance
().
logModeActions
()};
for
(
LogModeAction
*
logModeAction
:
logModeActions
)
{
if
(
logModeAction
->
category
()
==
LogModeAction
::
RootCategory
)
{
menuLogModeActions
.
append
(
logModeAction
->
actionMenu
());
}
else
if
(
logModeAction
->
category
()
==
LogModeAction
::
ServicesCategory
)
{
...
...
@@ -791,8 +797,10 @@ void MainWindow::setupLogModeMenu()
void
MainWindow
::
setupLogActions
()
{
// Sets up log mode actions.
foreach
(
LogModeAction
*
logModeAction
,
Globals
::
instance
().
logModeActions
())
{
foreach
(
QAction
*
action
,
logModeAction
->
innerActions
())
{
const
auto
logModeActions
{
Globals
::
instance
().
logModeActions
()};
for
(
LogModeAction
*
logModeAction
:
logModeActions
)
{
const
auto
innerActions
{
logModeAction
->
innerActions
()};
for
(
QAction
*
action
:
innerActions
)
{
ActionData
actionData
=
action
->
data
().
value
<
ActionData
>
();
if
(
actionData
.
addToActionCollection
)
{
logDebug
()
<<
"Adding action"
<<
actionData
.
id
;
...
...
src/modes/audit/auditAnalyzer.cpp
View file @
bdd70a69
...
...
@@ -85,11 +85,7 @@ void AuditAnalyzer::deleteLogFiles()
watchLogFiles
(
false
);
// Remove the watching on the monitored files
foreach
(
LogFileReader
*
logFileReader
,
mLogFileReaders
)
{
logDebug
()
<<
"Remove file : "
<<
logFileReader
->
logFile
().
url
().
path
();
delete
logFileReader
;
}
qDeleteAll
(
mLogFileReaders
);
mLogFileReaders
.
clear
();
}
...
...
src/modes/base/logLevelFileList.cpp
View file @
bdd70a69
...
...
@@ -117,7 +117,8 @@ void LogLevelFileList::changeItemType()
LogLevelSelectionDialog
logLevelSelectionDialog
(
this
);
QListWidget
*
logLevels
=
logLevelSelectionDialog
.
logLevels
();
foreach
(
LogLevel
*
level
,
Globals
::
instance
().
logLevels
())
{
const
auto
logLevelsItems
{
Globals
::
instance
().
logLevels
()};
for
(
LogLevel
*
level
:
logLevelsItems
)
{
logLevels
->
addItem
(
new
QListWidgetItem
(
level
->
icon
(),
level
->
name
()));
}
...
...
src/modes/base/multipleFileList.cpp
View file @
bdd70a69
...
...
@@ -344,8 +344,8 @@ void MultipleFileList::removeAllItems()
while
(
*
it
)
{
QTreeWidgetItem
*
item
=
*
it
;
QList
<
QTreeWidgetItem
*>
children
=
item
->
takeChildren
();
for
each
(
QTreeWidgetItem
*
childItem
,
children
)
{
const
QList
<
QTreeWidgetItem
*>
children
=
item
->
takeChildren
();
for
(
QTreeWidgetItem
*
childItem
:
children
)
{
delete
childItem
;
}
...
...
src/modes/journald/journaldLocalAnalyzer.cpp
View file @
bdd70a69
...
...
@@ -232,7 +232,7 @@ QList<JournaldLocalAnalyzer::JournalEntry> JournaldLocalAnalyzer::readJournal(co
if
(
prepareJournalReading
(
journal
,
filters
))
{
// Iterate over filtered entries.
forever
{
while
(
1
)
{
JournalEntry
entry
;
res
=
sd_journal_next
(
journal
);
if
(
res
<
0
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment