Skip to content
GitLab
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
33c91338
Commit
33c91338
authored
May 09, 2007
by
Robert Knight
Browse files
EBN fixes. Mostly copyright and implementations including their own headers first.
svn path=/trunk/KDE/kdebase/apps/konsole/; revision=662726
parent
c7debcd4
Changes
54
Hide whitespace changes
Inline
Side-by-side
src/Application.cpp
View file @
33c91338
...
...
@@ -17,6 +17,9 @@
02110-1301 USA.
*/
// Own
#include
"Application.h"
#include
"kdebug.h"
// KDE
...
...
@@ -30,7 +33,6 @@
#include
"SessionManager.h"
#include
"KeyTrans.h"
#include
"KeyboardTranslator.h"
#include
"Application.h"
#include
"MainWindow.h"
#include
"Session.h"
#include
"TerminalDisplay.h"
...
...
src/BlockArray.cpp
View file @
33c91338
...
...
@@ -18,6 +18,9 @@
02110-1301 USA.
*/
// Own
#include
"BlockArray.h"
// System
#include
<assert.h>
#include
<sys/mman.h>
...
...
@@ -28,9 +31,6 @@
// KDE
#include
<kdebug.h>
// Konsole
#include
"BlockArray.h"
using
namespace
Konsole
;
static
int
blocksize
=
0
;
...
...
src/BookmarkHandler.cpp
View file @
33c91338
...
...
@@ -21,6 +21,9 @@
// Born as kdelibs/kio/kfile/kfilebookmarkhandler.characterpp
// Own
#include
"BookmarkHandler.h"
// Qt
#include
<QFile>
...
...
@@ -35,7 +38,6 @@
#include
<KStandardDirs>
// Konsole
#include
"BookmarkHandler.h"
#include
"ViewProperties.h"
using
namespace
Konsole
;
...
...
src/BookmarkHandler.h
View file @
33c91338
...
...
@@ -22,6 +22,10 @@
#ifndef KONSOLEBOOKMARKHANDLER_H
#define KONSOLEBOOKMARKHANDLER_H
// Qt
#include
<QMenu>
// KDE
#include
<KBookmarkManager>
class
KMenu
;
...
...
src/ColorScheme.cpp
View file @
33c91338
...
...
@@ -19,6 +19,9 @@
02110-1301 USA.
*/
// Own
#include
"ColorScheme.h"
// Qt
#include
<QFile>
#include
<QFileInfo>
...
...
@@ -29,7 +32,6 @@
#include
<KStandardDirs>
// Konsole
#include
"ColorScheme.h"
#include
"TECommon.h"
using
namespace
Konsole
;
...
...
@@ -212,7 +214,7 @@ ColorScheme* KDE3ColorSchemeReader::read()
while
(
!
_device
->
atEnd
()
)
{
QString
line
(
_device
->
readLine
());
line
.
replace
(
comment
,
QString
::
null
);
line
.
replace
(
comment
,
QString
()
);
line
=
line
.
simplified
();
if
(
line
.
isEmpty
()
)
...
...
src/ColorSchemeEditor.cpp
View file @
33c91338
...
...
@@ -17,6 +17,9 @@
02110-1301 USA.
*/
// Own
#include
"ColorSchemeEditor.h"
// Qt
#include
<QBrush>
#include
<QFontMetrics>
...
...
@@ -29,7 +32,6 @@
#include
<KColorDialog>
// Konsole
#include
"ColorSchemeEditor.h"
#include
"ui_ColorSchemeEditor.h"
#include
"TECommon.h"
...
...
src/EditProfileDialog.cpp
View file @
33c91338
...
...
@@ -17,6 +17,9 @@
02110-1301 USA.
*/
// Own
#include
"EditProfileDialog.h"
// Qt
#include
<QHideEvent>
#include
<QLinearGradient>
...
...
@@ -35,7 +38,6 @@
#include
"ColorScheme.h"
#include
"ColorSchemeEditor.h"
#include
"ui_EditProfileDialog.h"
#include
"EditProfileDialog.h"
#include
"EditTabTitleFormatDialog.h"
#include
"KeyBindingEditor.h"
#include
"KeyboardTranslator.h"
...
...
@@ -104,7 +106,7 @@ void EditProfileDialog::setProfile(const QString& key)
// setup each page of the dialog
setupGeneralPage
(
info
);
setupAppear
e
ncePage
(
info
);
setupAppear
a
ncePage
(
info
);
setupKeyboardPage
(
info
);
setupScrollingPage
(
info
);
setupAdvancedPage
(
info
);
...
...
@@ -123,7 +125,7 @@ void EditProfileDialog::setupGeneralPage(const Profile* info)
_ui
->
commandEdit
->
setText
(
command
.
fullCommand
()
);
KUrlCompletion
*
exeCompletion
=
new
KUrlCompletion
(
KUrlCompletion
::
ExeCompletion
);
exeCompletion
->
setDir
(
QString
::
null
);
exeCompletion
->
setDir
(
QString
()
);
_ui
->
commandEdit
->
setCompletionObject
(
exeCompletion
);
_ui
->
initialDirEdit
->
setText
(
info
->
defaultWorkingDirectory
()
);
_ui
->
initialDirEdit
->
setCompletionObject
(
new
KUrlCompletion
(
KUrlCompletion
::
DirCompletion
)
);
...
...
@@ -256,7 +258,7 @@ void EditProfileDialog::selectInitialDir()
if
(
!
url
.
isEmpty
()
)
_ui
->
initialDirEdit
->
setText
(
url
.
path
());
}
void
EditProfileDialog
::
setupAppear
e
ncePage
(
const
Profile
*
info
)
void
EditProfileDialog
::
setupAppear
a
ncePage
(
const
Profile
*
info
)
{
// setup color list
updateColorSchemeList
();
...
...
src/EditProfileDialog.h
View file @
33c91338
...
...
@@ -95,7 +95,7 @@ private slots:
void
alwaysShowTabBar
();
void
showTabBarAsNeeded
();
// appear
e
nce page
// appear
a
nce page
void
setFontSize
(
int
pointSize
);
void
showFontDialog
();
void
newColorScheme
();
...
...
@@ -139,7 +139,7 @@ private slots:
private:
// initialize various pages of the dialog
void
setupGeneralPage
(
const
Profile
*
info
);
void
setupAppear
e
ncePage
(
const
Profile
*
info
);
void
setupAppear
a
ncePage
(
const
Profile
*
info
);
void
setupKeyboardPage
(
const
Profile
*
info
);
void
setupScrollingPage
(
const
Profile
*
info
);
void
setupAdvancedPage
(
const
Profile
*
info
);
...
...
src/EditTabTitleFormatDialog.cpp
View file @
33c91338
...
...
@@ -17,11 +17,13 @@
02110-1301 USA.
*/
// Own
#include
"EditTabTitleFormatDialog.h"
// KDE
#include
<KLocale>
// Konsole
#include
"EditTabTitleFormatDialog.h"
#include
"ui_EditTabTitleFormatDialog.h"
using
namespace
Konsole
;
...
...
src/Emulation.cpp
View file @
33c91338
...
...
@@ -65,6 +65,9 @@
a fixed rate.
*/
// Own
#include
"Emulation.h"
// System
#include
<assert.h>
#include
<stdio.h>
...
...
@@ -74,7 +77,6 @@
// Qt
#include
<QApplication>
#include
<QClipboard>
#include
<QClipboard>
#include
<QHashIterator>
#include
<QKeyEvent>
#include
<QRegExp>
...
...
@@ -89,7 +91,6 @@
#include
"Screen.h"
#include
"TerminalCharacterDecoder.h"
#include
"ScreenWindow.h"
#include
"Emulation.h"
using
namespace
Konsole
;
...
...
src/Emulation.h
View file @
33c91338
...
...
@@ -94,7 +94,7 @@ public:
*
* @param stream The text stream into which the output history will be written.
* @param decoder A decoder which converts lines of terminal characters with
* appear
e
nce attributes into output text. PlainTextDecoder is the most commonly
* appear
a
nce attributes into output text. PlainTextDecoder is the most commonly
* used decoder.
*/
virtual
void
writeToStream
(
QTextStream
*
stream
,
TerminalCharacterDecoder
*
decoder
,
int
startLine
,
int
endLine
);
...
...
src/Filter.cpp
View file @
33c91338
...
...
@@ -17,6 +17,9 @@
02110-1301 USA.
*/
// Own
#include
"Filter.h"
// System
#include
<iostream>
...
...
@@ -34,7 +37,6 @@
#include
<KRun>
// Konsole
#include
"Filter.h"
#include
"TerminalCharacterDecoder.h"
using
namespace
Konsole
;
...
...
@@ -431,7 +433,7 @@ QString UrlFilter::HotSpot::tooltip() const
else
if
(
kind
==
Email
)
return
i18n
(
"Click to send an email to '%1'."
,
url
);
else
return
QString
::
null
;
return
QString
()
;
}
UrlFilter
::
HotSpot
::
UrlType
UrlFilter
::
HotSpot
::
urlType
()
const
{
...
...
src/Filter.h
View file @
33c91338
...
...
@@ -21,6 +21,7 @@
#define FILTER_H
// Qt
#include
<QAction>
#include
<QList>
#include
<QObject>
#include
<QStringList>
...
...
src/History.cpp
View file @
33c91338
...
...
@@ -18,8 +18,11 @@
02110-1301 USA.
*/
#include
<iostream>
// Own
#include
"History.h"
// System
#include
<iostream>
#include
<stdlib.h>
#include
<assert.h>
#include
<stdio.h>
...
...
@@ -27,6 +30,8 @@
#include
<sys/mman.h>
#include
<unistd.h>
#include
<errno.h>
// KDE
#include
<kdebug.h>
// Reasonable line size
...
...
src/HistorySizeDialog.cpp
View file @
33c91338
...
...
@@ -17,6 +17,9 @@
02110-1301 USA.
*/
// Own
#include
"HistorySizeDialog.h"
// Qt
#include
<QButtonGroup>
#include
<QHBoxLayout>
...
...
@@ -30,7 +33,6 @@
#include
<KLocalizedString>
// Konsole
#include
"HistorySizeDialog.h"
#include
"SessionManager.h"
using
namespace
Konsole
;
...
...
src/IncrementalSearchBar.cpp
View file @
33c91338
...
...
@@ -17,6 +17,9 @@
02110-1301 USA.
*/
// Own
#include
"IncrementalSearchBar.h"
// Qt
#include
<QCheckBox>
#include
<QHBoxLayout>
...
...
@@ -31,9 +34,6 @@
#include
<KLocale>
#include
<KIcon>
// Konsole
#include
"IncrementalSearchBar.h"
using
namespace
Konsole
;
IncrementalSearchBar
::
IncrementalSearchBar
(
Features
features
,
QWidget
*
parent
)
...
...
src/KeyBindingEditor.cpp
View file @
33c91338
...
...
@@ -17,11 +17,13 @@
02110-1301 USA.
*/
// Own
#include
"KeyBindingEditor.h"
// Qt
#include
<QHeaderView>
// Konsole
#include
"KeyBindingEditor.h"
#include
"ui_KeyBindingEditor.h"
#include
"KeyboardTranslator.h"
...
...
src/KeyTrans.cpp
View file @
33c91338
...
...
@@ -25,6 +25,9 @@
FIXME: some bug crept in, disallowing '\0' to be emitted.
*/
// Own
#include
"KeyTrans.h"
// System
#include
<stdio.h>
#include
<stddef.h>
...
...
@@ -39,9 +42,6 @@
#include
<kstandarddirs.h>
#include
<klocale.h>
// Konsole
#include
"KeyTrans.h"
/* KeyEntry
instances represent the individual assignments
...
...
src/KeyboardTranslator.cpp
View file @
33c91338
...
...
@@ -19,6 +19,9 @@
02110-1301 USA.
*/
// Own
#include
"KeyboardTranslator.h"
// System
#include
<stdio.h>
...
...
@@ -32,9 +35,6 @@
// KDE
#include
<KStandardDirs>
// Konsole
#include
"KeyboardTranslator.h"
using
namespace
Konsole
;
KeyboardTranslatorManager
*
KeyboardTranslatorManager
::
_instance
=
0
;
...
...
@@ -266,7 +266,7 @@ QKeySequence KeyboardTranslatorReader::decodeSequence(const QString& text , Keyb
"(
\\
+|
\\
-)newline|"
"(
\\
+|
\\
-)meta)"
,
Qt
::
CaseInsensitive
);
QString
newText
(
text
);
newText
.
replace
(
modifierRemover
,
QString
::
null
);
newText
.
replace
(
modifierRemover
,
QString
()
);
if
(
modifiers
&
Qt
::
ShiftModifier
)
newText
.
prepend
(
"shift+"
);
...
...
src/MainWindow.cpp
View file @
33c91338
...
...
@@ -17,6 +17,9 @@
02110-1301 USA.
*/
// Own
#include
"MainWindow.h"
// Qt
#include
<QApplication>
#include
<QVBoxLayout>
...
...
@@ -41,7 +44,6 @@
#include
"BookmarkHandler.h"
#include
"IncrementalSearchBar.h"
#include
"MainWindow.h"
#include
"RemoteConnectionDialog.h"
#include
"SessionController.h"
#include
"ProfileList.h"
...
...
Prev
1
2
3
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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