[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [konsole] src: normalize SIGNALS
From: Kurt Hindenburg <kurt.hindenburg () gmail ! com>
Date: 2012-04-06 12:58:58
Message-ID: 20120406125858.84BF5A60A9 () git ! kde ! org
[Download RAW message or body]
Git commit ba34c4ebe245f493a1d3a3331a68c9aa97b83ac6 by Kurt Hindenburg.
Committed on 06/04/2012 at 14:57.
Pushed by hindenburg into branch 'master'.
normalize SIGNALS
It is annoying that kdelibs-style and Qt normalize conflict
M +2 -2 src/EditProfileDialog.cpp
M +3 -3 src/ManageProfilesDialog.cpp
M +2 -2 src/Part.cpp
M +4 -4 src/ProfileList.cpp
M +23 -23 src/Session.cpp
M +2 -2 src/SessionController.cpp
M +2 -2 src/ViewContainer.cpp
M +7 -7 src/ViewManager.cpp
M +2 -2 src/tests/PartTest.cpp
http://commits.kde.org/konsole/ba34c4ebe245f493a1d3a3331a68c9aa97b83ac6
diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp
index 6773cc5..1c0a462 100644
--- a/src/EditProfileDialog.cpp
+++ b/src/EditProfileDialog.cpp
@@ -425,7 +425,7 @@ void EditProfileDialog::setupAppearancePage(const Profile::Ptr \
profile)
_ui->colorSchemeList->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
connect(_ui->colorSchemeList->selectionModel(),
- SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+ SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
this, SLOT(colorSchemeSelected()));
connect(_ui->colorSchemeList, SIGNAL(entered(QModelIndex)), this,
SLOT(previewColorScheme(QModelIndex)));
@@ -816,7 +816,7 @@ void EditProfileDialog::setupKeyboardPage(const Profile::Ptr /* \
profile */) updateKeyBindingsList(true);
connect(_ui->keyBindingList->selectionModel(),
- SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+ SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
SLOT(keyBindingSelected()));
connect(_ui->newKeyBindingsButton, SIGNAL(clicked()), this,
SLOT(newKeyBinding()));
diff --git a/src/ManageProfilesDialog.cpp b/src/ManageProfilesDialog.cpp
index b2a8820..466e003 100644
--- a/src/ManageProfilesDialog.cpp
+++ b/src/ManageProfilesDialog.cpp
@@ -67,8 +67,8 @@ ManageProfilesDialog::ManageProfilesDialog(QWidget* aParent)
connect(ProfileManager::instance(), SIGNAL(profileChanged(Profile::Ptr)), this,
SLOT(updateItems(Profile::Ptr)));
connect(ProfileManager::instance() ,
- SIGNAL(favoriteStatusChanged(Profile::Ptr, bool)), this,
- SLOT(updateFavoriteStatus(Profile::Ptr, bool)));
+ SIGNAL(favoriteStatusChanged(Profile::Ptr,bool)), this,
+ SLOT(updateFavoriteStatus(Profile::Ptr,bool)));
// resize the session table to the full width of the table
_ui->sessionTable->horizontalHeader()->setHighlightSections(false);
@@ -228,7 +228,7 @@ void ManageProfilesDialog::populateTable()
// it appears that the selection model is changed when the model itself is \
replaced,
// so the signals need to be reconnected each time the model is updated.
connect(_ui->sessionTable->selectionModel(),
- SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this,
+ SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this,
SLOT(tableSelectionChanged(QItemSelection)));
_ui->sessionTable->selectRow(0);
diff --git a/src/Part.cpp b/src/Part.cpp
index 5a7a9c7..3e5339e 100644
--- a/src/Part.cpp
+++ b/src/Part.cpp
@@ -254,8 +254,8 @@ void Part::activeViewChanged(SessionController* controller)
connect(controller, SIGNAL(currentDirectoryChanged(QString)), this,
SIGNAL(currentDirectoryChanged(QString)));
- const char* displaySignal = SIGNAL(overrideShortcutCheck(QKeyEvent*, bool&));
- const char* partSlot = SLOT(overrideTerminalShortcut(QKeyEvent*, bool&));
+ const char* displaySignal = SIGNAL(overrideShortcutCheck(QKeyEvent*,bool&));
+ const char* partSlot = SLOT(overrideTerminalShortcut(QKeyEvent*,bool&));
disconnect(controller->view(), displaySignal, this, partSlot);
connect(controller->view(), displaySignal, this, partSlot);
diff --git a/src/ProfileList.cpp b/src/ProfileList.cpp
index 0cd0097..80ce32d 100644
--- a/src/ProfileList.cpp
+++ b/src/ProfileList.cpp
@@ -57,10 +57,10 @@ ProfileList::ProfileList(bool addShortcuts , QObject* parent)
connect(_group, SIGNAL(triggered(QAction*)), this, SLOT(triggered(QAction*)));
// listen for future changes to the profiles
- connect(manager, SIGNAL(favoriteStatusChanged(Profile::Ptr, bool)), this,
- SLOT(favoriteChanged(Profile::Ptr, bool)));
- connect(manager, SIGNAL(shortcutChanged(Profile::Ptr, QKeySequence)), this,
- SLOT(shortcutChanged(Profile::Ptr, QKeySequence)));
+ connect(manager, SIGNAL(favoriteStatusChanged(Profile::Ptr,bool)), this,
+ SLOT(favoriteChanged(Profile::Ptr,bool)));
+ connect(manager, SIGNAL(shortcutChanged(Profile::Ptr,QKeySequence)), this,
+ SLOT(shortcutChanged(Profile::Ptr,QKeySequence)));
connect(manager, SIGNAL(profileChanged(Profile::Ptr)), this,
SLOT(profileChanged(Profile::Ptr)));
}
diff --git a/src/Session.cpp b/src/Session.cpp
index 34147e7..740819b 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -125,8 +125,8 @@ Session::Session(QObject* parent) :
//create emulation backend
_emulation = new Vt102Emulation();
- connect(_emulation, SIGNAL(titleChanged(int, QString)),
- this, SLOT(setUserTitle(int, QString)));
+ connect(_emulation, SIGNAL(titleChanged(int,QString)),
+ this, SLOT(setUserTitle(int,QString)));
connect(_emulation, SIGNAL(stateSet(int)),
this, SLOT(activityStateSet(int)));
connect(_emulation, SIGNAL(zmodemDetected()), this,
@@ -183,13 +183,13 @@ void Session::openTeletype(int fd)
_shellProcess->setUtf8Mode(_emulation->utf8());
//connect teletype to emulation backend
- connect(_shellProcess, SIGNAL(receivedData(const char*, int)), this,
- SLOT(onReceiveBlock(const char*, int)));
- connect(_emulation, SIGNAL(sendData(const char*, int)), _shellProcess,
- SLOT(sendData(const char*, int)));
+ connect(_shellProcess, SIGNAL(receivedData(const char*,int)), this,
+ SLOT(onReceiveBlock(const char*,int)));
+ connect(_emulation, SIGNAL(sendData(const char*,int)), _shellProcess,
+ SLOT(sendData(const char*,int)));
connect(_emulation, SIGNAL(useUtf8Request(bool)), _shellProcess, \
SLOT(setUtf8Mode(bool)));
- connect(_shellProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, \
SLOT(done(int, QProcess::ExitStatus)));
- connect(_emulation, SIGNAL(imageSizeChanged(int, int)), this, \
SLOT(updateWindowSize(int, int))); + connect(_shellProcess, \
SIGNAL(finished(int,QProcess::ExitStatus)), this, \
SLOT(done(int,QProcess::ExitStatus))); + connect(_emulation, \
SIGNAL(imageSizeChanged(int,int)), this, \
SLOT(updateWindowSize(int,int)));
connect(_emulation, SIGNAL(imageSizeInitialized()), this, SLOT(run()));
}
@@ -304,8 +304,8 @@ void Session::addView(TerminalDisplay* widget)
// connect emulation - view signals and slots
connect(widget, SIGNAL(keyPressedSignal(QKeyEvent*)), _emulation,
SLOT(sendKeyEvent(QKeyEvent*)));
- connect(widget, SIGNAL(mouseSignal(int, int, int, int)), _emulation,
- SLOT(sendMouseEvent(int, int, int, int)));
+ connect(widget, SIGNAL(mouseSignal(int,int,int,int)), _emulation,
+ SLOT(sendMouseEvent(int,int,int,int)));
connect(widget, SIGNAL(sendStringToEmu(const char*)), _emulation,
SLOT(sendString(const char*)));
@@ -319,8 +319,8 @@ void Session::addView(TerminalDisplay* widget)
widget->setScreenWindow(_emulation->createWindow());
//connect view signals and slots
- QObject::connect(widget, SIGNAL(changedContentSizeSignal(int, int)), this,
- SLOT(onViewSizeChange(int, int)));
+ QObject::connect(widget, SIGNAL(changedContentSizeSignal(int,int)), this,
+ SLOT(onViewSizeChange(int,int)));
QObject::connect(widget, SIGNAL(destroyed(QObject*)), this,
SLOT(viewDestroyed(QObject*)));
@@ -802,8 +802,8 @@ void Session::sendMouseEvent(int buttons, int column, int line, \
int eventType) void Session::done(int exitCode, QProcess::ExitStatus exitStatus)
{
// This slot should be triggered only one time
- disconnect(_shellProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
- this, SLOT(done(int, QProcess::ExitStatus)));
+ disconnect(_shellProcess, SIGNAL(finished(int,QProcess::ExitStatus)),
+ this, SLOT(done(int,QProcess::ExitStatus)));
if (!_autoClose) {
_userTitle = i18nc("@info:shell This session is done", "Finished");
@@ -1152,13 +1152,13 @@ void Session::startZModem(const QString& zmodem, const \
QString& dir, const QStri this, SLOT(zmodemReadAndSendBlock()));
connect(_zmodemProc, SIGNAL(readyReadStandardError()),
this, SLOT(zmodemReadStatus()));
- connect(_zmodemProc, SIGNAL(finished(int, QProcess::ExitStatus)),
+ connect(_zmodemProc, SIGNAL(finished(int,QProcess::ExitStatus)),
this, SLOT(zmodemFinished()));
_zmodemProc->start();
- disconnect(_shellProcess, SIGNAL(receivedData(const char*, int)), this, \
SLOT(onReceiveBlock(const char*, int)));
- connect(_shellProcess, SIGNAL(receivedData(const char*, int)), this, \
SLOT(zmodemRcvBlock(const char*, int))); + disconnect(_shellProcess, \
SIGNAL(receivedData(const char*,int)), this, SLOT(onReceiveBlock(const char*,int))); \
+ connect(_shellProcess, SIGNAL(receivedData(const char*,int)), this, \
SLOT(zmodemRcvBlock(const char*,int)));
_zmodemProgress = new ZModemDialog(QApplication::activeWindow(), false,
i18n("ZModem Progress"));
@@ -1221,8 +1221,8 @@ void Session::zmodemFinished()
_zmodemBusy = false;
delete process; // Now, the KProcess may be disposed safely.
- disconnect(_shellProcess, SIGNAL(receivedData(const char*, int)), this , \
SLOT(zmodemRcvBlock(const char*, int)));
- connect(_shellProcess, SIGNAL(receivedData(const char*, int)), this, \
SLOT(onReceiveBlock(const char*, int))); + disconnect(_shellProcess, \
SIGNAL(receivedData(const char*,int)), this , SLOT(zmodemRcvBlock(const char*,int))); \
+ connect(_shellProcess, SIGNAL(receivedData(const char*,int)), this, \
SLOT(onReceiveBlock(const char*,int)));
_shellProcess->sendData("\030\030\030\030", 4); // Abort
_shellProcess->sendData("\001\013\n", 3); // Try to get prompt back
@@ -1446,11 +1446,11 @@ void SessionGroup::setMasterStatus(Session* session , bool \
master) _sessions[session] = master;
if (master) {
- connect(session->emulation(), SIGNAL(sendData(const char*, int)), this,
- SLOT(forwardData(const char*, int)));
+ connect(session->emulation(), SIGNAL(sendData(const char*,int)), this,
+ SLOT(forwardData(const char*,int)));
} else {
- disconnect(session->emulation(), SIGNAL(sendData(const char*, int)), this,
- SLOT(forwardData(const char*, int)));
+ disconnect(session->emulation(), SIGNAL(sendData(const char*,int)), this,
+ SLOT(forwardData(const char*,int)));
}
}
void SessionGroup::forwardData(const char* data, int size)
diff --git a/src/SessionController.cpp b/src/SessionController.cpp
index f9c44b9..f4cfb71 100644
--- a/src/SessionController.cpp
+++ b/src/SessionController.cpp
@@ -1399,8 +1399,8 @@ void SaveHistoryTask::execute()
_jobSession.insert(job, jobInfo);
- connect(job, SIGNAL(dataReq(KIO::Job*, QByteArray&)),
- this, SLOT(jobDataRequested(KIO::Job*, QByteArray&)));
+ connect(job, SIGNAL(dataReq(KIO::Job*,QByteArray&)),
+ this, SLOT(jobDataRequested(KIO::Job*,QByteArray&)));
connect(job, SIGNAL(result(KJob*)),
this, SLOT(jobResult(KJob*)));
}
diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp
index 132a36a..a0963fb 100644
--- a/src/ViewContainer.cpp
+++ b/src/ViewContainer.cpp
@@ -435,8 +435,8 @@ TabbedViewContainer::TabbedViewContainer(NavigationPosition \
position , QObject*
connect(_tabBar, SIGNAL(newTabRequest()), this, SIGNAL(newViewRequest()));
connect(_tabBar, SIGNAL(wheelDelta(int)), this, SLOT(wheelScrolled(int)));
connect(_tabBar, SIGNAL(initiateDrag(int)), this, SLOT(startTabDrag(int)));
- connect(_tabBar, SIGNAL(contextMenu(int, QPoint)), this,
- SLOT(openTabContextMenu(int, QPoint)));
+ connect(_tabBar, SIGNAL(contextMenu(int,QPoint)), this,
+ SLOT(openTabContextMenu(int,QPoint)));
// The context menu of tab bar
_contextPopupMenu = new KMenu(_tabBar);
diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
index c128b2a..557b5d3 100644
--- a/src/ViewManager.cpp
+++ b/src/ViewManager.cpp
@@ -616,11 +616,11 @@ ViewContainer* ViewManager::createContainer()
case TabbedNavigation: {
container = new TabbedViewContainer(_navigationPosition, _viewSplitter);
- connect(container, SIGNAL(detachTab(ViewContainer*, QWidget*)),
- this, SLOT(detachView(ViewContainer*, QWidget*))
+ connect(container, SIGNAL(detachTab(ViewContainer*,QWidget*)),
+ this, SLOT(detachView(ViewContainer*,QWidget*))
);
- connect(container, SIGNAL(closeTab(ViewContainer*, QWidget*)),
- this, SLOT(closeTabFromContainer(ViewContainer*, QWidget*)));
+ connect(container, SIGNAL(closeTab(ViewContainer*,QWidget*)),
+ this, SLOT(closeTabFromContainer(ViewContainer*,QWidget*)));
}
break;
case NoNavigation:
@@ -631,15 +631,15 @@ ViewContainer* ViewManager::createContainer()
applyNavigationOptions(container);
// connect signals and slots
- connect(container , SIGNAL(viewAdded(QWidget*, ViewProperties*)) , \
_containerSignalMapper , + connect(container , \
SIGNAL(viewAdded(QWidget*,ViewProperties*)) , _containerSignalMapper , SLOT(map()));
connect(container , SIGNAL(viewRemoved(QWidget*)) , _containerSignalMapper ,
SLOT(map()));
_containerSignalMapper->setMapping(container, container);
connect(container, SIGNAL(newViewRequest()), this, SIGNAL(newViewRequest()));
- connect(container, SIGNAL(moveViewRequest(int, int, bool&)),
- this , SLOT(containerMoveViewRequest(int, int, bool&)));
+ connect(container, SIGNAL(moveViewRequest(int,int,bool&)),
+ this , SLOT(containerMoveViewRequest(int,int,bool&)));
connect(container , SIGNAL(viewRemoved(QWidget*)) , this , \
SLOT(viewDestroyed(QWidget*)));
connect(container , SIGNAL(activeViewChanged(QWidget*)) , this , \
SLOT(viewActivated(QWidget*)));
diff --git a/src/tests/PartTest.cpp b/src/tests/PartTest.cpp
index 78ada52..b3214f4 100644
--- a/src/tests/PartTest.cpp
+++ b/src/tests/PartTest.cpp
@@ -117,8 +117,8 @@ void PartTest::testShortcutOverride()
_shortcutTriggered = false;
_override = false;
_overrideCalled = false;
- QVERIFY(connect(terminalPart, SIGNAL(overrideShortcut(QKeyEvent*, bool&)),
- this, SLOT(overrideShortcut(QKeyEvent*, bool&))));
+ QVERIFY(connect(terminalPart, SIGNAL(overrideShortcut(QKeyEvent*,bool&)),
+ this, SLOT(overrideShortcut(QKeyEvent*,bool&))));
//QTest::keyClick(terminalPart->widget(),Qt::Key_S,Qt::ControlModifier);
_shortcutEventLoop = new QEventLoop();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic