Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Konsole
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
24
Merge Requests
24
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Utilities
Konsole
Commits
d1bdcc92
Commit
d1bdcc92
authored
Mar 27, 2017
by
Kurt Hindenburg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
simplify if()s for readability
parent
068b2af4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
9 deletions
+3
-9
src/Session.cpp
src/Session.cpp
+2
-5
src/ViewContainerTabBar.cpp
src/ViewContainerTabBar.cpp
+1
-4
No files found.
src/Session.cpp
View file @
d1bdcc92
...
...
@@ -684,7 +684,7 @@ void Session::updateTerminalSize()
//select largest number of lines and columns that will fit in all visible views
foreach
(
TerminalDisplay
*
view
,
_views
)
{
if
(
view
->
isHidden
()
==
false
&&
if
(
!
view
->
isHidden
()
&&
view
->
lines
()
>=
VIEW_LINES_THRESHOLD
&&
view
->
columns
()
>=
VIEW_COLUMNS_THRESHOLD
)
{
minLines
=
(
minLines
==
-
1
)
?
view
->
lines
()
:
qMin
(
minLines
,
view
->
lines
());
...
...
@@ -756,10 +756,7 @@ bool Session::kill(int signal)
int
result
=
::
kill
(
_shellProcess
->
pid
(),
signal
);
if
(
result
==
0
)
{
if
(
_shellProcess
->
waitForFinished
(
1000
))
return
true
;
else
return
false
;
return
_shellProcess
->
waitForFinished
(
1000
);
}
else
{
return
false
;
}
...
...
src/ViewContainerTabBar.cpp
View file @
d1bdcc92
...
...
@@ -235,10 +235,7 @@ bool ViewContainerTabBar::proposedDropIsSameTab(const QDropEvent* event) const
emit
querySourceIndex
(
event
,
sourceIndex
);
const
bool
sourceAndDropAreLast
=
sourceIndex
==
count
()
-
1
&&
index
==
-
1
;
if
(
sourceIndex
==
index
||
sourceIndex
==
index
-
1
||
sourceAndDropAreLast
)
return
true
;
else
return
false
;
return
sourceIndex
==
index
||
sourceIndex
==
index
-
1
||
sourceAndDropAreLast
;
}
...
...
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