Commit 3d06b44f authored by Kurt Hindenburg's avatar Kurt Hindenburg

minor style fixes - remove empty lines start/end code blocks

parent bee9aa8f
......@@ -36,7 +36,6 @@ class KActionCollection;
namespace Konsole
{
class ViewProperties;
/**
......@@ -55,7 +54,6 @@ class KONSOLEPRIVATE_EXPORT BookmarkHandler : public QObject, public KBookmarkOw
Q_OBJECT
public:
/**
* Constructs a new bookmark handler for Konsole bookmarks.
*
......@@ -123,7 +121,6 @@ private:
ViewProperties* _activeView;
QList<ViewProperties*> _views;
};
}
#endif // KONSOLEBOOKMARKHANDLER_H
......@@ -31,7 +31,6 @@
namespace Konsole
{
typedef unsigned char LineProperty;
static const int LINE_DEFAULT = 0;
......@@ -161,7 +160,6 @@ public:
inline bool isSpace() const {
return (rendition & RE_EXTENDED_CHAR) ? false : QChar(character).isSpace();
}
};
inline bool operator == (const Character& a, const Character& b)
......@@ -202,7 +200,6 @@ inline ColorEntry::FontWeight Character::fontWeight(const ColorEntry* base) cons
else
return ColorEntry::UseCurrentFormat;
}
}
Q_DECLARE_TYPEINFO(Konsole::Character, Q_MOVABLE_TYPE);
......
......@@ -31,7 +31,6 @@
namespace Konsole
{
/**
* An entry in a terminal display's color palette.
*
......@@ -294,7 +293,6 @@ inline void CharacterColor::setIntensive()
_v = 1;
}
}
}
#endif // CHARACTERCOLOR_H
......
......@@ -37,7 +37,6 @@ class QPainter;
namespace Konsole
{
/**
* This class holds the wallpaper pixmap associated with a color scheme.
* The wallpaper object is shared between multiple TerminalDisplay.
......@@ -239,7 +238,6 @@ class AccessibleColorScheme : public ColorScheme
public:
AccessibleColorScheme();
};
}
Q_DECLARE_METATYPE(const Konsole::ColorScheme*)
......
......@@ -32,7 +32,6 @@ class ColorSchemeEditor;
namespace Konsole
{
class ColorScheme;
/**
......@@ -82,7 +81,6 @@ private:
Ui::ColorSchemeEditor* _ui;
ColorScheme* _colors;
};
}
#endif // COLORSCHEMEEDITOR_H
......@@ -31,7 +31,6 @@
namespace Konsole
{
/**
* Manages the color schemes available for use by terminal displays.
* See ColorScheme
......@@ -39,7 +38,6 @@ namespace Konsole
class ColorSchemeManager
{
public:
/**
* Constructs a new ColorSchemeManager and loads the list
* of available color schemes.
......@@ -112,7 +110,6 @@ private:
static const ColorScheme _defaultColorScheme;
};
}
#endif //COLORSCHEMEMANAGER_H
......@@ -131,7 +131,6 @@ inline int CheckableSessionModel::checkColumn() const
{
return _checkColumn;
}
}
#endif // COPYINPUTDIALOG
......
......@@ -44,7 +44,6 @@ class EditProfileDialog;
namespace Konsole
{
/**
* A dialog which allows the user to edit a profile.
* After the dialog is created, it can be initialized with the settings
......@@ -275,9 +274,7 @@ public:
private:
QPointer<QTimeLine> _entryTimeLine;
};
}
#endif // EDITPROFILEDIALOG_H
......@@ -35,7 +35,6 @@ class QKeyEvent;
namespace Konsole
{
class KeyboardTranslator;
class HistoryType;
class Screen;
......@@ -120,7 +119,6 @@ class KONSOLEPRIVATE_EXPORT Emulation : public QObject
Q_OBJECT
public:
/** Constructs a new terminal emulation */
Emulation();
~Emulation();
......@@ -470,7 +468,6 @@ protected slots:
void checkSelectedText();
private slots:
// triggered by timer, causes the emulation to send an updated screen image to each
// view
void showBulk();
......@@ -482,9 +479,7 @@ private:
QTimer _bulkTimer1;
QTimer _bulkTimer2;
bool _imageSizeInitialized;
};
}
#endif // ifndef EMULATION_H
......@@ -24,7 +24,6 @@
namespace Konsole
{
/**
* This class serves as a place for putting enum definitions that are
* used or referenced in multiple places in the code. Keep it small.
......@@ -32,7 +31,6 @@ namespace Konsole
class Enum
{
public:
/**
* This enum describes the modes available to remember lines of output
* produced by the terminal.
......@@ -111,9 +109,7 @@ public:
/** No bell effects */
NoBell = 3
};
};
}
#endif // ENUMERATION_H
......@@ -27,7 +27,6 @@
namespace Konsole
{
/**
* A table which stores sequences of unicode characters, referenced
* by hash keys. The hash key itself is the same size as a unicode
......@@ -78,6 +77,5 @@ private:
// themselves.
QHash<ushort, ushort*> extendedCharTable;
};
}
#endif // end of EXTENDEDCHARTABLE_H
......@@ -33,7 +33,6 @@ class QAction;
namespace Konsole
{
/**
* A filter processes blocks of text looking for certain patterns (such as URLs or keywords from a list)
* and marks the areas which match the filter's patterns as 'hotspots'.
......@@ -124,7 +123,6 @@ public:
int _endLine;
int _endColumn;
Type _type;
};
/** Constructs a new filter. */
......@@ -275,7 +273,6 @@ protected:
virtual RegExpFilter::HotSpot* newHotSpot(int, int, int, int);
private:
static const QRegExp FullUrlRegExp;
static const QRegExp EmailAddressRegExp;
......@@ -341,7 +338,6 @@ public:
QList<Filter::HotSpot*> hotSpots() const;
/** Returns a list of all hotspots at the given line in all the chain's filters */
QList<Filter::HotSpot> hotSpotsAtLine(int line) const;
};
/** A filter chain which processes character images from terminal displays */
......@@ -366,6 +362,5 @@ private:
QString* _buffer;
QList<int>* _linePositions;
};
}
#endif //FILTER_H
......@@ -34,7 +34,6 @@
namespace Konsole
{
/*
An extendable tmpfile(1) based buffer.
*/
......@@ -117,7 +116,6 @@ public:
protected:
HistoryType* _historyType;
};
//////////////////////////////////////////////////////////////////////
......@@ -198,7 +196,6 @@ public:
class CompactHistoryBlock
{
public:
CompactHistoryBlock() {
blockLength = 4096 * 64; // 256kb
head = (quint8*) mmap(0, blockLength, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
......@@ -381,7 +378,6 @@ public:
protected:
unsigned int m_nbLines;
};
}
#endif // TEHISTORY_H
......@@ -34,7 +34,6 @@ class HistorySizeDialog;
namespace Konsole
{
class HistorySizeDialog : public KDialog
{
Q_OBJECT
......@@ -43,7 +42,6 @@ public:
explicit HistorySizeDialog(QWidget* parent = 0);
~HistorySizeDialog();
/** See HistorySizeWidget::setMode. */
void setMode(Enum::HistoryModeEnum aMode);
......@@ -59,7 +57,6 @@ public:
private:
Ui::HistorySizeDialog* _ui;
};
}
#endif
......@@ -36,7 +36,6 @@ class HistorySizeWidget;
namespace Konsole
{
/**
* A widget for controlling hisotry related options
*/
......@@ -65,7 +64,6 @@ public:
int lineCount() const;
signals:
/** Emitted when the history mode is changed. */
void historyModeChanged(Enum::HistoryModeEnum) const;
......@@ -73,17 +71,14 @@ signals:
void historySizeChanged(int) const;
private slots:
void buttonClicked(QAbstractButton*) const;
private:
Ui::HistorySizeWidget* _ui;
// 1000 lines was the default in the KDE3 series
static const int DefaultLineCount = 1000;
};
}
#endif // HISTORYSIZEWIDGET_H
......@@ -31,7 +31,6 @@ class KLineEdit;
namespace Konsole
{
/**
* A widget which allows users to search incrementally through a document for a
* a text string or regular expression.
......@@ -58,7 +57,6 @@ class IncrementalSearchBar : public QWidget
Q_OBJECT
public:
/**
* This enum defines the options that can be checked.
*/
......@@ -139,6 +137,5 @@ private:
QTimer* _searchTimer;
};
}
#endif // INCREMENTALSEARCHBAR_H
......@@ -32,7 +32,6 @@ class KeyBindingEditor;
namespace Konsole
{
class KeyboardTranslator;
/**
......@@ -99,7 +98,6 @@ private:
// when setup() is called
KeyboardTranslator* _translator;
};
}
#endif //KEYBINDINGEDITOR_H
......@@ -36,7 +36,6 @@ class QTextStream;
namespace Konsole
{
/**
* A convertor which maps between key sequences pressed by the user and the
* character strings which should be sent to the terminal and commands
......@@ -526,7 +525,6 @@ inline KeyboardTranslator::States KeyboardTranslator::Entry::stateMask() const
{
return _stateMask;
}
}
Q_DECLARE_METATYPE(Konsole::KeyboardTranslator::Entry)
......
......@@ -34,7 +34,6 @@ class QIODevice;
namespace Konsole
{
/**
* Manages the keyboard translations available for use by terminal sessions,
* see KeyboardTranslator.
......@@ -90,7 +89,6 @@ public:
static KeyboardTranslatorManager* instance();
private:
void findTranslators(); // locate all available translators
// loads the translator with the given name
......@@ -104,9 +102,7 @@ private:
const KeyboardTranslator* _fallbackTranslator;
QHash<QString, KeyboardTranslator*> _translators;
};
}
#endif // KEYBOARDTRANSLATOR_MANAGER_H
......
......@@ -36,7 +36,6 @@ class KToggleAction;
namespace Konsole
{
class IncrementalSearchBar;
class ViewManager;
class ViewProperties;
......@@ -210,7 +209,6 @@ private:
bool _menuBarInitialVisibility;
bool _menuBarInitialVisibilityApplied;
};
}
#endif // KONSOLEMAINWINDOW_H
......@@ -43,7 +43,6 @@ class ManageProfilesDialog;
namespace Konsole
{
/**
* A dialog which lists the available types of profiles and allows
* the user to add new profiles, and remove or edit existing
......@@ -158,7 +157,6 @@ private:
mutable QSet<QWidget*> _modifiedEditors;
mutable QSet<QModelIndex> _itemsBeingEdited;
};
}
#endif // MANAGEPROFILESDIALOG_H
......@@ -213,7 +213,6 @@ private:
SessionController* _pluggedController;
QAction* _manageProfilesAction;
};
}
#endif // PART_H
......@@ -28,7 +28,6 @@
namespace Konsole
{
/**
* Takes a snapshot of the state of a process and provides access to
* information such as the process name, parent process,
......@@ -457,6 +456,5 @@ private:
QString _port;
QString _command;
};
}
#endif //PROCESSINFO_H
......@@ -59,7 +59,6 @@ class ProfileGroup;
*/
class KONSOLEPRIVATE_EXPORT Profile : public QSharedData
{
friend class KDE4ProfileReader;
friend class KDE4ProfileWriter;
friend class ProfileGroup;
......@@ -650,9 +649,7 @@ public:
* properties and values.
*/
QHash<Profile::Property, QVariant> parse(const QString& input);
};
}
Q_DECLARE_METATYPE(Konsole::Profile::Ptr)
......
......@@ -35,7 +35,6 @@ class QKeySequence;
namespace Konsole
{
class Profile;
/**
......@@ -103,7 +102,6 @@ private:
QAction* _emptyListAction;
QSet<QWidget*> _registeredWidgets;
};
}
#endif // PROFILELIST_H
......@@ -36,7 +36,6 @@
namespace Konsole
{
/**
* Manages profiles which specify various settings for terminal sessions
* and their displays.
......@@ -51,7 +50,6 @@ class KONSOLEPRIVATE_EXPORT ProfileManager : public QObject
Q_OBJECT
public:
/**
* Constructs a new profile manager and loads information about the available
* profiles.
......@@ -240,7 +238,6 @@ signals:
void shortcutChanged(Profile::Ptr profile , const QKeySequence& newShortcut);
public slots:
/** Saves settings (favorites, shortcuts, default profile etc.) to disk. */
void saveSettings();
......@@ -249,7 +246,6 @@ protected slots:
private slots:
private:
// loads the mappings between shortcut key sequences and
// profile paths
void loadShortcuts();
......@@ -287,7 +283,6 @@ private:
QString profilePath;
};
QMap<QKeySequence, ShortcutData> _shortcuts; // shortcut keys -> profile path
};
/**
......@@ -310,6 +305,5 @@ private:
QStack<T>& _stack;
int _count;
};
}
#endif //PROFILEMANAGER_H
......@@ -28,7 +28,6 @@ class KConfig;
namespace Konsole
{
/** Interface for all classes which can load profile settings from a file. */
class ProfileReader
{
......@@ -61,7 +60,6 @@ private:
void readProperties(const KConfig& config, Profile::Ptr profile,
const Profile::PropertyInfo* properties);
};
}
#endif // PROFILEREADER_H
......@@ -28,7 +28,6 @@ class KConfig;
namespace Konsole
{
/** Interface for all classes which can write profile settings to a file. */
class ProfileWriter
{
......@@ -58,7 +57,6 @@ private:
void writeProperties(KConfig& config, const Profile::Ptr profile,
const Profile::PropertyInfo* properties);
};
}
#endif // PROFILEWRITER_H
......@@ -36,7 +36,6 @@ class QStringList;
namespace Konsole
{
/**
* The Pty class is used to start the terminal process,
* send data to it, receive data from it and manipulate
......@@ -55,7 +54,6 @@ class Pty: public KPtyProcess
Q_OBJECT
public:
/**
* Constructs a new Pty.
*
......@@ -147,7 +145,6 @@ public:
void closePty();
public slots:
/**
* Put the pty into UTF-8 mode on systems which support it.
*/
......@@ -163,7 +160,6 @@ public slots:
void sendData(const char* buffer, int length);
signals:
/**
* Emitted when a new block of data is received from
* the teletype.
......@@ -181,7 +177,6 @@ private slots:
void dataReceived();
private:
void init();
// takes a list of key=value pairs and adds them
......@@ -194,7 +189,6 @@ private:
bool _xonXoff;
bool _utf8;
};
}
#endif // PTY_H
......@@ -30,7 +30,6 @@ class RenameTabDialog;
namespace Konsole
{
class RenameTabDialog : public KDialog
{
Q_OBJECT
......@@ -50,7 +49,6 @@ public:
private:
Ui::RenameTabDialog* _ui;
};
}
#endif
......@@ -30,7 +30,6 @@ class RenameTabWidget;
namespace Konsole
{
class RenameTabWidget : public QWidget
{
Q_OBJECT
......@@ -58,7 +57,6 @@ public slots:
private:
Ui::RenameTabWidget* _ui;
};
}
#endif
......@@ -43,7 +43,6 @@
namespace Konsole
{
class TerminalCharacterDecoder;
class TerminalDisplay;
class HistoryType;
......@@ -578,7 +577,6 @@ public:
static const Character defaultChar;
private:
//copies a line of text from the screen or history into a stream using a
//specified character decoder. Returns the number of lines actually copied,
//which may be less than 'count' if (start+count) is more than the number of characters on
......@@ -700,9 +698,7 @@ private:
// last position where we added a character
int _lastPos;
};
}
#endif // SCREEN_H
......@@ -30,7 +30,6 @@
namespace Konsole
{
class Screen;
/**
......@@ -265,6 +264,5 @@ private:
int _scrollCount; // count of lines which the window has been scrolled by since
// the last call to resetScrollCount()
};
}
#endif // SCREENWINDOW_H
......@@ -46,7 +46,6 @@ class KProcess;
namespace Konsole
{
class Emulation;
class Pty;
class ProcessInfo;
......@@ -677,7 +676,6 @@ private slots:
void onPrimaryScreenInUse(bool use);
private:
// checks that the binary 'program' is available and can be executed
// returns the binary name if available or an empty string otherwise
static QString checkProgram(const QString& program);
......@@ -748,7 +746,6 @@ private:
QSize _preferredSize;
static int lastSessionId;
};
/**
......@@ -824,7 +821,6 @@ private:
int _masterMode;
};
}
#endif
......@@ -54,7 +54,6 @@ class KActionMenu;
namespace Konsole
{
class Session;
class SessionGroup;
class ScreenWindow;
......@@ -87,9 +86,7 @@ class KONSOLEPRIVATE_EXPORT SessionController : public ViewProperties , public K
Q_OBJECT
public:
enum CopyInputToEnum {
/** Copy keyboard input to all the other tabs in current window */
CopyInputToAllTabsMode = 0 ,
......@@ -385,12 +382,10 @@ signals:
void completed(bool success);
protected:
/** Returns a list of sessions in the group */
QList< SessionPtr > sessions() const;
private:
bool _autoDelete;
QList< SessionPtr > _sessions;
};
......@@ -431,7 +426,6 @@ private:
TerminalCharacterDecoder* decoder; // decoder used to convert terminal characters
// into output
};
QHash<KJob*, SaveJob> _jobSession;
......@@ -510,7 +504,6 @@ private:
//static QPointer<SearchHistoryThread> _thread;
};
}
#endif //SESSIONCONTROLLER_H
......
......@@ -28,7 +28,6 @@
namespace Konsole
{