Minor style changes

Use 'git diff -w --ignore-all-space' for non-whitespace changes.
wilder-portage
Kurt Hindenburg 14 years ago
parent aa9f6ccc95
commit ba77864413
  1. 4
      src/Application.cpp
  2. 27
      src/Application.h

@ -233,7 +233,6 @@ void Application::processTabsFromFileArgs(KCmdLineArgs* args,
QString key = lineParts.at(i).section(':', 0, 0).trimmed().toLower();
QString value = lineParts.at(i).section(':', 1, 1).trimmed();
lineTokens[key] = value;
}
// command: is the only token required
if (lineTokens.contains("command")) {
@ -323,7 +322,8 @@ void Application::processProfileSelectArgs(KCmdLineArgs* args,
MainWindow* window)
{
if (args->isSet("profile")) {
Profile::Ptr profile = SessionManager::instance()->loadProfile(args->getOption("profile"));
Profile::Ptr profile = SessionManager::instance()->loadProfile(
args->getOption("profile"));
if (!profile)
profile = SessionManager::instance()->defaultProfile();

@ -17,8 +17,8 @@
02110-1301 USA.
*/
#ifndef APPLICATION_H
#define APPLICATION_H
#ifndef SRC_APPLICATION_H_
#define SRC_APPLICATION_H_
// KDE
#include <KUniqueApplication>
@ -39,13 +39,14 @@ class Session;
/**
* The Konsole Application.
*
* The application consists of one or more main windows and a set of factories to create
* new sessions and views.
* The application consists of one or more main windows and a set of
* factories to create new sessions and views.
*
* To create a new main window with a default terminal session, call the newInstance() method.
* Empty main windows can be created using newMainWindow().
* To create a new main window with a default terminal session, call
* the newInstance(). Empty main windows can be created using newMainWindow().
*
* The factory used to create new terminal sessions can be retrieved using the sessionManager() accessor.
* The factory used to create new terminal sessions can be retrieved using
* the sessionManager() accessor.
*/
class Application : public KUniqueApplication
{
@ -71,8 +72,10 @@ public:
static Application* self();
private slots:
Session* createSession(Profile::Ptr profile, const QString& directory , ViewManager* view);
Session* createSSHSession(Profile::Ptr profile, const KUrl& url, ViewManager* view);
Session* createSession(Profile::Ptr profile, const QString& directory,
ViewManager* view);
Session* createSSHSession(Profile::Ptr profile, const KUrl& url,
ViewManager* view);
void createWindow(Profile::Ptr profile , const QString& directory);
void detachView(Session* session);
@ -88,10 +91,10 @@ private:
void processProfileSelectArgs(KCmdLineArgs* args, MainWindow* window);
void processProfileChangeArgs(KCmdLineArgs* args, MainWindow* window);
void processTabsFromFileArgs(KCmdLineArgs* args, MainWindow* window);
void createTabFromArgs(KCmdLineArgs* args, MainWindow* window, const QHash<QString, QString>&);
void createTabFromArgs(KCmdLineArgs* args, MainWindow* window,
const QHash<QString, QString>&);
MainWindow* _backgroundInstance;
};
}
#endif //APPLICATION_H
#endif // SRC_APPLICATION_H_

Loading…
Cancel
Save