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
Utilities
Konsole
Commits
bee9aa8f
Commit
bee9aa8f
authored
May 13, 2012
by
Kurt Hindenburg
Browse files
minor style fixes - remove empty lines start/end code blocks
parent
f148185e
Changes
29
Hide whitespace changes
Inline
Side-by-side
src/Application.cpp
View file @
bee9aa8f
...
...
@@ -280,7 +280,6 @@ void Application::createTabFromArgs(KCmdLineArgs* args, MainWindow* window,
// This is another side effect of the commit fixing BKO 176902.
window
->
show
();
window
->
hide
();
}
MainWindow
*
Application
::
processWindowArgs
(
KCmdLineArgs
*
args
)
...
...
@@ -318,9 +317,7 @@ MainWindow* Application::processWindowArgs(KCmdLineArgs* args)
// never show
window
->
setNavigationVisibility
(
2
);
}
}
return
window
;
}
...
...
src/ColorSchemeEditor.cpp
View file @
bee9aa8f
...
...
@@ -126,7 +126,6 @@ void ColorSchemeEditor::editColorItem(QTableWidgetItem* item)
_colors
->
setColorTableEntry
(
item
->
row
(),
entry
);
emit
colorsChanged
(
_colors
);
}
}
void
ColorSchemeEditor
::
selectWallpaper
()
...
...
src/ColorSchemeManager.cpp
View file @
bee9aa8f
...
...
@@ -283,7 +283,6 @@ QStringList ColorSchemeManager::listKDE3ColorSchemes()
return
KGlobal
::
dirs
()
->
findAllResources
(
"data"
,
"konsole/*.schema"
,
KStandardDirs
::
NoDuplicates
);
}
const
ColorScheme
ColorSchemeManager
::
_defaultColorScheme
;
...
...
src/EditProfileDialog.cpp
View file @
bee9aa8f
...
...
@@ -769,7 +769,6 @@ void EditProfileDialog::updateTransparencyWarning()
" You need to restart Konsole to see transparent background."
));
_ui
->
transparencyWarningWidget
->
setHidden
(
false
);
}
}
}
...
...
@@ -1061,7 +1060,6 @@ void EditProfileDialog::setupAdvancedPage(const Profile::Ptr profile)
connect
(
codecAction
,
SIGNAL
(
triggered
(
QTextCodec
*
)),
this
,
SLOT
(
setDefaultCodec
(
QTextCodec
*
)));
_ui
->
characterEncodingLabel
->
setText
(
profile
->
defaultEncoding
());
}
void
EditProfileDialog
::
setDefaultCodec
(
QTextCodec
*
codec
)
{
...
...
@@ -1140,7 +1138,6 @@ void EditProfileDialog::fontSelected(const QFont& aFont)
preview
(
Profile
::
Font
,
aFont
);
updateTempProfileProperty
(
Profile
::
Font
,
aFont
);
}
void
EditProfileDialog
::
showFontDialog
()
{
...
...
@@ -1186,7 +1183,6 @@ void EditProfileDialog::setFontSliderRange(const QFont& aFont)
// Maximum is the greater of 2 times the current size and 14
slider
->
setRange
(
qMin
(
4
*
10
,
qRound
(
aFont
.
pointSizeF
()
*
10
)),
qMax
(
14
*
10
,
2
*
qRound
(
aFont
.
pointSize
()
*
10
)));
}
void
EditProfileDialog
::
setFontSliderValue
(
const
QFont
&
aFont
)
...
...
@@ -1197,7 +1193,6 @@ void EditProfileDialog::setFontSliderValue(const QFont& aFont)
ColorSchemeViewDelegate
::
ColorSchemeViewDelegate
(
QObject
*
aParent
)
:
QAbstractItemDelegate
(
aParent
)
{
}
void
ColorSchemeViewDelegate
::
setEntryTimeLine
(
QTimeLine
*
timeLine
)
...
...
@@ -1315,7 +1310,6 @@ void ColorSchemeViewDelegate::paint(QPainter* painter, const QStyleOptionViewIte
painter
->
drawText
(
option
.
rect
,
Qt
::
AlignCenter
,
index
.
data
(
Qt
::
DisplayRole
).
value
<
QString
>
());
}
QSize
ColorSchemeViewDelegate
::
sizeHint
(
const
QStyleOptionViewItem
&
option
,
...
...
src/Emulation.cpp
View file @
bee9aa8f
...
...
@@ -361,7 +361,6 @@ void Emulation::setImageSize(int lines, int columns)
// SIGNAL(imageSizeChanged()); See #203185
QTimer
::
singleShot
(
200
,
this
,
SIGNAL
(
imageSizeInitialized
()));
}
}
QSize
Emulation
::
imageSize
()
const
...
...
src/ExtendedCharTable.cpp
View file @
bee9aa8f
...
...
@@ -78,7 +78,6 @@ ushort ExtendedCharTable::createExtendedChar(const ushort* unicodePoints , ushor
foreach
(
const
Session
*
s
,
sm
->
sessions
())
{
foreach
(
const
TerminalDisplay
*
td
,
s
->
views
())
{
usedExtendedChars
+=
td
->
screenWindow
()
->
screen
()
->
usedExtendedChars
();
}
}
...
...
src/History.cpp
View file @
bee9aa8f
...
...
@@ -228,7 +228,6 @@ int HistoryScrollFile::startOfLine(int lineno)
{
if
(
lineno
<=
0
)
return
0
;
if
(
lineno
<=
getLines
())
{
if
(
!
index
.
isMapped
())
index
.
map
();
...
...
src/HistorySizeDialog.cpp
View file @
bee9aa8f
...
...
@@ -43,7 +43,6 @@ HistorySizeDialog::HistorySizeDialog(QWidget* parent)
_ui
->
tempWarningWidget
->
setMessageType
(
KMessageWidget
::
Information
);
_ui
->
tempWarningWidget
->
setText
(
i18nc
(
"@info:status"
,
"Any adjustments are only temporary to this session."
));
}
HistorySizeDialog
::~
HistorySizeDialog
()
...
...
src/HistorySizeWidget.cpp
View file @
bee9aa8f
...
...
@@ -86,7 +86,6 @@ void HistorySizeWidget::setMode(Enum::HistoryModeEnum aMode)
_ui
->
unlimitedHistoryButton
->
setChecked
(
true
);
}
_ui
->
unlimitedWarningWidget
->
setVisible
(
Enum
::
UnlimitedHistory
==
aMode
);
}
Enum
::
HistoryModeEnum
HistorySizeWidget
::
mode
()
const
...
...
src/KeyboardTranslator.cpp
View file @
bee9aa8f
...
...
@@ -485,7 +485,6 @@ QByteArray KeyboardTranslator::Entry::unescape(const QByteArray& input) const
QByteArray
result
(
input
);
for
(
int
i
=
0
;
i
<
result
.
count
()
-
1
;
i
++
)
{
QByteRef
ch
=
result
[
i
];
if
(
ch
==
'\\'
)
{
char
replacement
[
2
]
=
{
0
,
0
};
...
...
src/KeyboardTranslatorManager.cpp
View file @
bee9aa8f
...
...
@@ -90,7 +90,6 @@ void KeyboardTranslatorManager::findTranslators()
// the name with a null pointer to indicate that the translator
// has not yet been loaded from disk
foreach
(
const
QString
&
translatorPath
,
list
)
{
QString
name
=
QFileInfo
(
translatorPath
).
baseName
();
if
(
!
_translators
.
contains
(
name
))
...
...
src/MainWindow.cpp
View file @
bee9aa8f
...
...
@@ -722,7 +722,6 @@ void MainWindow::showEvent(QShowEvent* aEvent)
{
// Make sure the 'initial' visibility is applied only once.
if
(
!
_menuBarInitialVisibilityApplied
)
{
// the initial visibility of menubar should be applied at this last
// moment. Otherwise, the initial visibility will be determined by
// what KMainWindow has automatically stored in konsolerc, but not by
...
...
src/ManageProfilesDialog.cpp
View file @
bee9aa8f
...
...
@@ -132,7 +132,6 @@ void ManageProfilesDialog::itemDataChanged(QStandardItem* item)
ProfileManager
::
instance
()
->
changeProfile
(
profile
,
properties
);
}
}
}
int
ManageProfilesDialog
::
rowForProfile
(
const
Profile
::
Ptr
profile
)
const
...
...
@@ -272,7 +271,6 @@ void ManageProfilesDialog::tableSelectionChanged(const QItemSelection&)
// do not allow the default session type to be removed
_ui
->
deleteProfileButton
->
setEnabled
(
isDeletable
&&
isNotDefault
);
_ui
->
setAsDefaultButton
->
setEnabled
(
isNotDefault
&&
(
selectedRows
<
2
));
}
void
ManageProfilesDialog
::
deleteSelected
()
{
...
...
src/ProcessInfo.cpp
View file @
bee9aa8f
...
...
@@ -983,7 +983,6 @@ SSHProcessInfo::SSHProcessInfo(const ProcessInfo& process)
// host has already been found, this must be the command argument
_command
=
args
[
i
];
}
}
}
else
{
kWarning
()
<<
"Could not read arguments"
;
...
...
src/ProfileManager.cpp
View file @
bee9aa8f
...
...
@@ -228,7 +228,6 @@ void ProfileManager::loadAllProfiles()
void
ProfileManager
::
sortProfiles
(
QList
<
Profile
::
Ptr
>&
list
)
{
QList
<
Profile
::
Ptr
>
lackingIndices
;
QList
<
Profile
::
Ptr
>
havingIndices
;
...
...
@@ -575,7 +574,6 @@ void ProfileManager::saveFavorites()
QStringList
paths
;
foreach
(
const
Profile
::
Ptr
&
profile
,
_favorites
)
{
Q_ASSERT
(
_profiles
.
contains
(
profile
)
&&
profile
);
QFileInfo
fileInfo
(
profile
->
path
());
...
...
src/ProfileReader.cpp
View file @
bee9aa8f
...
...
@@ -62,7 +62,6 @@ void KDE4ProfileReader::readProperties(const KConfig& config, Profile::Ptr profi
if
(
group
.
hasKey
(
name
))
profile
->
setProperty
(
properties
->
property
,
group
.
readEntry
(
name
,
QVariant
(
properties
->
type
)));
}
properties
++
;
...
...
src/ProfileWriter.cpp
View file @
bee9aa8f
...
...
@@ -77,7 +77,6 @@ QString KDE4ProfileWriter::getPath(const Profile::Ptr profile)
}
else
{
newPath
=
candidateLocalPath
;
}
}
return
newPath
;
...
...
src/Screen.cpp
View file @
bee9aa8f
...
...
@@ -141,7 +141,6 @@ void Screen::setMargins(int top, int bot)
_bottomMargin
=
bot
;
_cuX
=
0
;
_cuY
=
getMode
(
MODE_Origin
)
?
top
:
0
;
}
int
Screen
::
topMargin
()
const
...
...
@@ -435,7 +434,6 @@ void Screen::copyFromScreen(Character* dest , int startLine , int count) const
if
(
_selBegin
!=
-
1
&&
isSelected
(
column
,
line
+
_history
->
getLines
()))
reverseRendition
(
dest
[
destIndex
]);
}
}
}
...
...
@@ -1313,7 +1311,6 @@ void Screen::addHistLine()
_selBegin
=
_selBottomRight
;
}
}
}
int
Screen
::
getHistLines
()
const
...
...
src/Session.cpp
View file @
bee9aa8f
...
...
@@ -609,7 +609,6 @@ void Session::silenceTimerDone()
}
else
{
emit
stateChanged
(
NOTIFYNORMAL
);
}
}
void
Session
::
activityTimerDone
()
...
...
src/SessionController.cpp
View file @
bee9aa8f
...
...
@@ -372,7 +372,6 @@ void SessionController::updateWebSearchMenu()
if
(
KUriFilter
::
self
()
->
filterSearchUri
(
filterData
,
KUriFilter
::
NormalTextFilter
))
{
const
QStringList
searchProviders
=
filterData
.
preferredSearchProviders
();
if
(
!
searchProviders
.
isEmpty
())
{
_webSearchMenu
->
setText
(
i18n
(
"Search for '%1' with"
,
KStringHandler
::
rsqueeze
(
searchText
,
16
)));
KAction
*
action
=
0
;
...
...
@@ -395,9 +394,7 @@ void SessionController::updateWebSearchMenu()
_webSearchMenu
->
setVisible
(
true
);
}
}
}
void
SessionController
::
handleWebShortcutAction
()
...
...
@@ -678,7 +675,6 @@ void SessionController::setupExtraActions()
_searchToggleAction
->
setShortcut
(
QKeySequence
(
Qt
::
CTRL
+
Qt
::
SHIFT
+
Qt
::
Key_F
));
_findPreviousAction
->
setShortcut
(
QKeySequence
(
Qt
::
Key_F3
));
_findPreviousAction
->
setShortcut
(
QKeySequence
(
Qt
::
SHIFT
+
Qt
::
Key_F3
));
}
void
SessionController
::
switchProfile
(
Profile
::
Ptr
profile
)
...
...
@@ -976,7 +972,6 @@ void SessionController::copyInputToNone()
delete
_copyToGroup
;
_copyToGroup
=
0
;
snapshot
();
}
void
SessionController
::
searchClosed
()
...
...
@@ -1442,7 +1437,6 @@ void SaveHistoryTask::execute()
// to save that session's history.
// then start a KIO job to transfer the data from the history to the chosen URL
foreach
(
const
SessionPtr
&
session
,
sessions
())
{
dialog
->
setCaption
(
i18n
(
"Save Output From %1"
,
session
->
title
(
Session
::
NameRole
)));
int
result
=
dialog
->
exec
();
...
...
@@ -1666,7 +1660,6 @@ void SearchHistoryTask::executeOnScreenWindow(SessionPtr session , ScreenWindowP
//clear the current block of text and move to the next one
string
.
clear
();
line
=
endLine
;
}
while
(
startLine
!=
endLine
);
// if no match was found, clear selection to indicate this
...
...
@@ -1695,7 +1688,6 @@ SearchHistoryTask::SearchHistoryTask(QObject* parent)
:
SessionTask
(
parent
)
,
_direction
(
ForwardsSearch
)
{
}
void
SearchHistoryTask
::
setSearchDirection
(
SearchDirection
direction
)
{
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
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