summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/adblock/adblockmanager.cpp2
-rw-r--r--src/analyzer/analyzerpanel.cpp8
-rw-r--r--src/analyzer/networkanalyzer.cpp2
-rw-r--r--src/application.cpp6
-rw-r--r--src/bookmarks/bookmarkmanager.cpp6
-rw-r--r--src/bookmarks/bookmarkstoolbar.cpp2
-rw-r--r--src/bookmarks/bookmarkstreemodel.cpp2
-rwxr-xr-xsrc/data/rekonq.desktop16
-rw-r--r--src/downloadmanager.cpp2
-rw-r--r--src/history/historymodels.cpp48
-rw-r--r--src/mainview.cpp18
-rw-r--r--src/mainwindow.cpp26
-rw-r--r--src/opensearch/opensearchmanager.cpp4
-rw-r--r--src/paneltreeview.cpp2
-rw-r--r--src/sync/synccheckwidget.cpp2
-rw-r--r--src/tabbar.cpp2
-rw-r--r--src/urlbar/completionwidget.cpp8
-rw-r--r--src/urlbar/listitem.cpp4
-rw-r--r--src/urlbar/urlbar.cpp4
-rw-r--r--src/webtab.cpp12
-rw-r--r--src/webtab.h2
-rw-r--r--src/webview.cpp10
22 files changed, 91 insertions, 97 deletions
diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index a63d2d8e..5078f215 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -283,7 +283,7 @@ void AdBlockManager::updateNextSubscription()
job->metaData().insert("cookies", "none");
job->metaData().insert("no-auth", "true");
- connect(job, SIGNAL(data(KIO::Job*, QByteArray)), this, SLOT(subscriptionData(KIO::Job*, QByteArray)));
+ connect(job, SIGNAL(data(KIO::Job*,QByteArray)), this, SLOT(subscriptionData(KIO::Job*,QByteArray)));
connect(job, SIGNAL(result(KJob*)), this, SLOT(slotResult(KJob*)));
return;
diff --git a/src/analyzer/analyzerpanel.cpp b/src/analyzer/analyzerpanel.cpp
index 3ecc57d3..099a4123 100644
--- a/src/analyzer/analyzerpanel.cpp
+++ b/src/analyzer/analyzerpanel.cpp
@@ -73,14 +73,14 @@ void NetworkAnalyzerPanel::toggle(bool enable)
if (enable)
{
connect(page, SIGNAL(loadStarted()), _viewer, SLOT(clear()));
- connect(manager, SIGNAL(networkData(QNetworkAccessManager::Operation, QNetworkRequest, QNetworkReply*)),
- _viewer, SLOT(addRequest(QNetworkAccessManager::Operation, QNetworkRequest, QNetworkReply*)));
+ connect(manager, SIGNAL(networkData(QNetworkAccessManager::Operation,QNetworkRequest,QNetworkReply*)),
+ _viewer, SLOT(addRequest(QNetworkAccessManager::Operation,QNetworkRequest,QNetworkReply*)));
}
else
{
disconnect(page, SIGNAL(loadStarted()), _viewer, SLOT(clear()));
- disconnect(manager, SIGNAL(networkData(QNetworkAccessManager::Operation, QNetworkRequest, QNetworkReply*)),
- _viewer, SLOT(addRequest(QNetworkAccessManager::Operation, QNetworkRequest, QNetworkReply*)));
+ disconnect(manager, SIGNAL(networkData(QNetworkAccessManager::Operation,QNetworkRequest,QNetworkReply*)),
+ _viewer, SLOT(addRequest(QNetworkAccessManager::Operation,QNetworkRequest,QNetworkReply*)));
}
setVisible(enable);
diff --git a/src/analyzer/networkanalyzer.cpp b/src/analyzer/networkanalyzer.cpp
index 166555ef..0cf26f90 100644
--- a/src/analyzer/networkanalyzer.cpp
+++ b/src/analyzer/networkanalyzer.cpp
@@ -68,7 +68,7 @@ NetworkAnalyzer::NetworkAnalyzer(QWidget *parent)
_requestList->setContextMenuPolicy(Qt::CustomContextMenu);
connect(_mapper, SIGNAL(mapped(QObject*)), this, SLOT(requestFinished(QObject*)));
- connect(_requestList, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)), this, SLOT(showItemDetails(QTreeWidgetItem*)));
+ connect(_requestList, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(showItemDetails(QTreeWidgetItem*)));
connect(_requestList, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(popupContextMenu(QPoint)));
}
diff --git a/src/application.cpp b/src/application.cpp
index 1bf7b556..e0570a5b 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -325,8 +325,8 @@ int Application::newInstance()
historyManager();
// bookmarks loading
- connect(bookmarkManager(), SIGNAL(openUrl(KUrl, Rekonq::OpenType)),
- instance(), SLOT(loadUrl(KUrl, Rekonq::OpenType)));
+ connect(bookmarkManager(), SIGNAL(openUrl(KUrl,Rekonq::OpenType)),
+ instance(), SLOT(loadUrl(KUrl,Rekonq::OpenType)));
ReKonfig::setRecoverOnCrash(ReKonfig::recoverOnCrash() + 1);
saveConfiguration();
@@ -851,7 +851,7 @@ void Application::createWebAppShortcut()
QWidget widget;
wAppWidget.setupUi(&widget);
- const QString title = mainWindow()->currentTab()->view()->title().remove("&");
+ const QString title = mainWindow()->currentTab()->view()->title().remove('&');
wAppWidget.iconLabel->setPixmap(iconManager()->iconForUrl(u).pixmap(32));
wAppWidget.titleLabel->setText(title);
wAppWidget.kcfg_createDesktopAppShortcut->setChecked(ReKonfig::createDesktopAppShortcut());
diff --git a/src/bookmarks/bookmarkmanager.cpp b/src/bookmarks/bookmarkmanager.cpp
index 43f4dd3a..165966d2 100644
--- a/src/bookmarks/bookmarkmanager.cpp
+++ b/src/bookmarks/bookmarkmanager.cpp
@@ -69,12 +69,12 @@ BookmarkManager::BookmarkManager(QObject *parent)
delete tempManager;
}
- connect(m_manager, SIGNAL(changed(QString, QString)), this, SLOT(slotBookmarksChanged()));
+ connect(m_manager, SIGNAL(changed(QString,QString)), this, SLOT(slotBookmarksChanged()));
// setup menu
m_owner = new BookmarkOwner(m_manager, this);
- connect(m_owner, SIGNAL(openUrl(KUrl, Rekonq::OpenType)),
- this, SIGNAL(openUrl(KUrl, Rekonq::OpenType)));
+ connect(m_owner, SIGNAL(openUrl(KUrl,Rekonq::OpenType)),
+ this, SIGNAL(openUrl(KUrl,Rekonq::OpenType)));
KAction *a = KStandardAction::addBookmark(m_owner, SLOT(bookmarkCurrentPage()), this);
m_actionCollection->addAction(QL1S("rekonq_add_bookmark"), a);
diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp
index 9a94f938..8dbda960 100644
--- a/src/bookmarks/bookmarkstoolbar.cpp
+++ b/src/bookmarks/bookmarkstoolbar.cpp
@@ -164,7 +164,7 @@ BookmarkToolBar::BookmarkToolBar(KToolBar *toolBar, QObject *parent)
{
toolBar->setContextMenuPolicy(Qt::CustomContextMenu);
connect(toolBar, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenu(QPoint)));
- connect(rApp->bookmarkManager()->manager(), SIGNAL(changed(QString, QString)), this, SLOT(hideMenu()));
+ connect(rApp->bookmarkManager()->manager(), SIGNAL(changed(QString,QString)), this, SLOT(hideMenu()));
toolBar->setAcceptDrops(true);
toolBar->installEventFilter(this);
toolBar->setShortcutEnabled(false);
diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp
index 4121a6ee..534e9698 100644
--- a/src/bookmarks/bookmarkstreemodel.cpp
+++ b/src/bookmarks/bookmarkstreemodel.cpp
@@ -167,7 +167,7 @@ BookmarksTreeModel::BookmarksTreeModel(QObject *parent)
, m_root(0)
{
resetModel();
- connect(rApp->bookmarkManager()->manager(), SIGNAL(changed(QString, QString)),
+ connect(rApp->bookmarkManager()->manager(), SIGNAL(changed(QString,QString)),
this, SLOT(bookmarksChanged(QString)));
}
diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop
index d2d4f1dd..5f7a9846 100755
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -1,7 +1,6 @@
[Desktop Entry]
Name=rekonq
Name[bg]=rekonq
-Name[bs]=rekonq
Name[ca]=rekonq
Name[ca@valencia]=rekonq
Name[cs]=rekonq
@@ -12,15 +11,15 @@ Name[en_GB]=rekonq
Name[es]=rekonq
Name[et]=rekonq
Name[eu]=rekonq
-Name[fa]=ریکانک
Name[fi]=rekonq
Name[fr]=rekonq
Name[ga]=rekonq
Name[gl]=rekonq
Name[hu]=Rekonq
Name[it]=rekonq
-Name[ko]=rekonq
+Name[km]=rekonq
Name[lt]=rekonq
+Name[ms]=rekonq
Name[nb]=rekonq
Name[nds]=Rekonq
Name[nl]=rekonq
@@ -31,13 +30,12 @@ Name[ro]=rekonq
Name[ru]=rekonq
Name[si]=rekonq
Name[sk]=rekonq
-Name[sl]=rekonq
+Name[sl]=Rekonq
Name[sr]=Реконк
Name[sr@ijekavian]=Реконк
Name[sr@ijekavianlatin]=Rekonq
Name[sr@latin]=Rekonq
Name[sv]=Rekonq
-Name[th]=rekonq
Name[tr]=rekonq
Name[ug]=rekonq
Name[uk]=rekonq
@@ -45,8 +43,6 @@ Name[x-test]=xxrekonqxx
Name[zh_CN]=rekonq
Name[zh_TW]=rekonq
GenericName=Web Browser
-GenericName[bg]=Уеб-браузър
-GenericName[bs]=Pregled Internet WWW stranica
GenericName[ca]=Navegador web
GenericName[ca@valencia]=Navegador web
GenericName[cs]=Webový prohlížeč
@@ -57,15 +53,15 @@ GenericName[en_GB]=Web Browser
GenericName[es]=Navegador web
GenericName[et]=Veebilehitseja
GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
GenericName[fi]=WWW-selain
GenericName[fr]=Navigateur web
GenericName[ga]=Brabhsálaí Gréasáin
GenericName[gl]=Navegador web
GenericName[hu]=Webböngésző
GenericName[it]=Browser Web
-GenericName[ko]=웹 브라우저
+GenericName[km]=កម្មវិធី​រុករក​បណ្ដាញ
GenericName[lt]=Žiniatinklio naršyklė
+GenericName[ms]=Pelayar Web
GenericName[nb]=Nettleser
GenericName[nds]=Nettkieker
GenericName[nl]=Webbrowser
@@ -82,11 +78,9 @@ GenericName[sr@ijekavian]=Веб прегледач
GenericName[sr@ijekavianlatin]=Veb pregledač
GenericName[sr@latin]=Veb pregledač
GenericName[sv]=Webbläsare
-GenericName[th]=เว็บเบราว์เซอร์
GenericName[ug]=توركۆرگۈ
GenericName[uk]=Переглядач Інтернету
GenericName[x-test]=xxWeb Browserxx
-GenericName[zh_CN]=网页浏览器
GenericName[zh_TW]=網頁瀏覽器
Icon=rekonq
Type=Application
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index dd3cb119..a3165764 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -190,7 +190,7 @@ bool DownloadManager::downloadResource(const KUrl &srcUrl, const KIO::MetaData &
KIO::Job *job = KIO::copy(srcUrl, destUrl, KIO::Overwrite);
if (item)
{
- QObject::connect(job, SIGNAL(percent(KJob*, ulong)), item, SLOT(updateProgress(KJob*, ulong)));
+ QObject::connect(job, SIGNAL(percent(KJob*,ulong)), item, SLOT(updateProgress(KJob*,ulong)));
QObject::connect(job, SIGNAL(finished(KJob*)), item, SLOT(onFinished(KJob*)));
}
diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp
index f31d90d3..16054054 100644
--- a/src/history/historymodels.cpp
+++ b/src/history/historymodels.cpp
@@ -230,12 +230,12 @@ void HistoryFilterModel::setSourceModel(QAbstractItemModel *newSourceModel)
if (sourceModel())
{
disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
- disconnect(sourceModel(), SIGNAL(dataChanged(QModelIndex, QModelIndex)),
- this, SLOT(dataChanged(QModelIndex, QModelIndex)));
- disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)),
- this, SLOT(sourceRowsInserted(QModelIndex, int, int)));
- disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
- this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
+ disconnect(sourceModel(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ this, SLOT(dataChanged(QModelIndex,QModelIndex)));
+ disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
+ this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
+ disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
}
QAbstractProxyModel::setSourceModel(newSourceModel);
@@ -244,12 +244,12 @@ void HistoryFilterModel::setSourceModel(QAbstractItemModel *newSourceModel)
{
m_loaded = false;
connect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
- connect(sourceModel(), SIGNAL(dataChanged(QModelIndex, QModelIndex)),
- this, SLOT(sourceDataChanged(QModelIndex, QModelIndex)));
- connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)),
- this, SLOT(sourceRowsInserted(QModelIndex, int, int)));
- connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
- this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
+ connect(sourceModel(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ this, SLOT(sourceDataChanged(QModelIndex,QModelIndex)));
+ connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
+ this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
+ connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
}
}
@@ -411,16 +411,16 @@ bool HistoryFilterModel::removeRows(int row, int count, const QModelIndex &paren
if (row < 0 || count <= 0 || row + count > rowCount(parent) || parent.isValid())
return false;
int lastRow = row + count - 1;
- disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
- this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
+ disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
beginRemoveRows(parent, row, lastRow);
int oldCount = rowCount();
int start = sourceModel()->rowCount() - m_sourceRow.value(row);
int end = sourceModel()->rowCount() - m_sourceRow.value(lastRow);
sourceModel()->removeRows(start, end - start + 1);
endRemoveRows();
- connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
- this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
+ connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
m_loaded = false;
if (oldCount - count != rowCount())
reset();
@@ -631,10 +631,10 @@ void HistoryTreeModel::setSourceModel(QAbstractItemModel *newSourceModel)
{
disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
disconnect(sourceModel(), SIGNAL(layoutChanged()), this, SLOT(sourceReset()));
- disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)),
- this, SLOT(sourceRowsInserted(QModelIndex, int, int)));
- disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
- this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
+ disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
+ this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
+ disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
}
QAbstractProxyModel::setSourceModel(newSourceModel);
@@ -643,10 +643,10 @@ void HistoryTreeModel::setSourceModel(QAbstractItemModel *newSourceModel)
{
connect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
connect(sourceModel(), SIGNAL(layoutChanged()), this, SLOT(sourceReset()));
- connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)),
- this, SLOT(sourceRowsInserted(QModelIndex, int, int)));
- connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
- this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
+ connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
+ this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
+ connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
}
reset();
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 2e187809..8c637639 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -87,7 +87,7 @@ MainView::MainView(QWidget *parent)
connect(tabBar, SIGNAL(detachTab(int)), this, SLOT(detachTab(int)));
connect(tabBar, SIGNAL(tabCloseRequested(int)), this, SLOT(closeTab(int)));
- connect(tabBar, SIGNAL(tabMoved(int, int)), m_widgetBar, SLOT(moveBar(int, int)));
+ connect(tabBar, SIGNAL(tabMoved(int,int)), m_widgetBar, SLOT(moveBar(int,int)));
// current page index changing
connect(this, SIGNAL(currentChanged(int)), this, SLOT(currentChanged(int)));
@@ -248,13 +248,13 @@ void MainView::currentChanged(int index)
// disconnecting webpage from mainview
disconnect(oldTab->page(), SIGNAL(statusBarMessage(QString)),
this, SIGNAL(showStatusBarMessage(QString)));
- disconnect(oldTab->page(), SIGNAL(linkHovered(QString, QString, QString)),
+ disconnect(oldTab->page(), SIGNAL(linkHovered(QString,QString,QString)),
this, SIGNAL(linkHovered(QString)));
}
connect(tab->page(), SIGNAL(statusBarMessage(QString)),
this, SIGNAL(showStatusBarMessage(QString)));
- connect(tab->page(), SIGNAL(linkHovered(QString, QString, QString)),
+ connect(tab->page(), SIGNAL(linkHovered(QString,QString,QString)),
this, SIGNAL(linkHovered(QString)));
emit currentTitle(tab->view()->title());
@@ -766,27 +766,27 @@ void MainView::detachTab(int index, MainWindow *toWindow)
// disconnecting webview with old mainview
disconnect(tab->view(), SIGNAL(loadStarted()));
disconnect(tab->view(), SIGNAL(loadFinished(bool)));
- disconnect(tab, SIGNAL(titleChanged(const QString &)));
- disconnect(tab->view(), SIGNAL(urlChanged(const QUrl &)));
+ disconnect(tab, SIGNAL(titleChanged(QString)));
+ disconnect(tab->view(), SIGNAL(urlChanged(QUrl)));
disconnect(tab->view(), SIGNAL(iconChanged()));
disconnect(tab->view(), SIGNAL(openPreviousInHistory()));
disconnect(tab->view(), SIGNAL(openNextInHistory()));
// disconnecting webPage signals with old mainview
disconnect(tab->page(), SIGNAL(windowCloseRequested()));
- disconnect(tab->page(), SIGNAL(printRequested(QWebFrame *)));
+ disconnect(tab->page(), SIGNAL(printRequested(QWebFrame*)));
// connecting webview with new mainview
connect(tab->view(), SIGNAL(loadStarted()), w->mainView(), SLOT(webViewLoadStarted()));
connect(tab->view(), SIGNAL(loadFinished(bool)), w->mainView(), SLOT(webViewLoadFinished(bool)));
- connect(tab, SIGNAL(titleChanged(const QString &)), w->mainView(), SLOT(webViewTitleChanged(const QString &)));
- connect(tab->view(), SIGNAL(urlChanged(const QUrl &)), w->mainView(), SLOT(webViewUrlChanged(const QUrl &)));
+ connect(tab, SIGNAL(titleChanged(QString)), w->mainView(), SLOT(webViewTitleChanged(QString)));
+ connect(tab->view(), SIGNAL(urlChanged(QUrl)), w->mainView(), SLOT(webViewUrlChanged(QUrl)));
connect(tab->view(), SIGNAL(iconChanged()), w->mainView(), SLOT(webViewIconChanged()));
connect(tab->view(), SIGNAL(openPreviousInHistory()), w->mainView(), SIGNAL(openPreviousInHistory()));
connect(tab->view(), SIGNAL(openNextInHistory()), w->mainView(), SIGNAL(openNextInHistory()));
// connecting webPage signals with new mainview
connect(tab->page(), SIGNAL(windowCloseRequested()), w->mainView(), SLOT(windowCloseRequested()));
- connect(tab->page(), SIGNAL(printRequested(QWebFrame *)), w->mainView(), SIGNAL(printRequested(QWebFrame *)));
+ connect(tab->page(), SIGNAL(printRequested(QWebFrame*)), w->mainView(), SIGNAL(printRequested(QWebFrame*)));
}
}
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 2ada5ccd..54f1b800 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -173,7 +173,7 @@ MainWindow::MainWindow()
setupBookmarksAndToolsShortcuts();
// setting popup notification
- connect(rApp, SIGNAL(focusChanged(QWidget*, QWidget*)), m_popup, SLOT(hide()));
+ connect(rApp, SIGNAL(focusChanged(QWidget*,QWidget*)), m_popup, SLOT(hide()));
m_popup->setAutoFillBackground(true);
m_popup->setMargin(4);
m_popup->raise();
@@ -181,10 +181,10 @@ MainWindow::MainWindow()
connect(m_hidePopupTimer, SIGNAL(timeout()), m_popup, SLOT(hide()));
// notification system
- connect(m_view, SIGNAL(showStatusBarMessage(QString, Rekonq::Notify)), this, SLOT(notifyMessage(QString, Rekonq::Notify)));
+ connect(m_view, SIGNAL(showStatusBarMessage(QString,Rekonq::Notify)), this, SLOT(notifyMessage(QString,Rekonq::Notify)));
connect(m_view, SIGNAL(linkHovered(QString)), this, SLOT(notifyMessage(QString)));
- connect(rApp->downloadManager(), SIGNAL(notifyDownload(QString, Rekonq::Notify)),
- this, SLOT(notifyMessage(QString, Rekonq::Notify)));
+ connect(rApp->downloadManager(), SIGNAL(notifyDownload(QString,Rekonq::Notify)),
+ this, SLOT(notifyMessage(QString,Rekonq::Notify)));
// connect signals and slots
connect(m_view, SIGNAL(currentTitle(QString)), this, SLOT(updateWindowTitle(QString)));
@@ -352,7 +352,7 @@ void MainWindow::setupActions()
a->setShortcut(fullScreenShortcut);
a = actionCollection()->addAction(KStandardAction::Home);
- connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(homePage()));
+ connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(homePage()));
KStandardAction::preferences(this, SLOT(preferences()), actionCollection());
a = KStandardAction::redisplay(m_view, SLOT(webReload()), actionCollection());
@@ -417,8 +417,8 @@ void MainWindow::setupActions()
// ========================= History related actions ==============================
a = actionCollection()->addAction(KStandardAction::Back);
- connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)),
- this, SLOT(openPrevious(Qt::MouseButtons, Qt::KeyboardModifiers)));
+ connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)),
+ this, SLOT(openPrevious(Qt::MouseButtons,Qt::KeyboardModifiers)));
m_historyBackMenu = new KMenu(this);
a->setMenu(m_historyBackMenu);
@@ -426,8 +426,8 @@ void MainWindow::setupActions()
connect(m_historyBackMenu, SIGNAL(triggered(QAction*)), this, SLOT(openActionUrl(QAction*)));
a = actionCollection()->addAction(KStandardAction::Forward);
- connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)),
- this, SLOT(openNext(Qt::MouseButtons, Qt::KeyboardModifiers)));
+ connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)),
+ this, SLOT(openNext(Qt::MouseButtons,Qt::KeyboardModifiers)));
m_historyForwardMenu = new KMenu(this);
a->setMenu(m_historyForwardMenu);
@@ -572,8 +572,8 @@ void MainWindow::setupPanels()
// Setup history panel
const QString historyTitle = i18n("History Panel");
m_historyPanel = new HistoryPanel(historyTitle, this);
- connect(m_historyPanel, SIGNAL(openUrl(KUrl, Rekonq::OpenType)),
- rApp, SLOT(loadUrl(KUrl, Rekonq::OpenType)));
+ connect(m_historyPanel, SIGNAL(openUrl(KUrl,Rekonq::OpenType)),
+ rApp, SLOT(loadUrl(KUrl,Rekonq::OpenType)));
connect(m_historyPanel, SIGNAL(itemHovered(QString)), this, SLOT(notifyMessage(QString)));
connect(m_historyPanel, SIGNAL(destroyed()), rApp, SLOT(saveConfiguration()));
@@ -590,8 +590,8 @@ void MainWindow::setupPanels()
// Setup bookmarks panel
const QString bookmarksTitle = i18n("Bookmarks Panel");
m_bookmarksPanel = new BookmarksPanel(bookmarksTitle, this);
- connect(m_bookmarksPanel, SIGNAL(openUrl(KUrl, Rekonq::OpenType)),
- rApp, SLOT(loadUrl(KUrl, Rekonq::OpenType)));
+ connect(m_bookmarksPanel, SIGNAL(openUrl(KUrl,Rekonq::OpenType)),
+ rApp, SLOT(loadUrl(KUrl,Rekonq::OpenType)));
connect(m_bookmarksPanel, SIGNAL(itemHovered(QString)), this, SLOT(notifyMessage(QString)));
connect(m_bookmarksPanel, SIGNAL(destroyed()), rApp, SLOT(saveConfiguration()));
diff --git a/src/opensearch/opensearchmanager.cpp b/src/opensearch/opensearchmanager.cpp
index 7eea3c7b..12b93ec2 100644
--- a/src/opensearch/opensearchmanager.cpp
+++ b/src/opensearch/opensearchmanager.cpp
@@ -127,7 +127,7 @@ void OpenSearchManager::addOpenSearchEngine(const KUrl &url, const QString &titl
m_currentJob = KIO::get(url, KIO::NoReload, KIO::HideProgressInfo);
m_jobUrl = url;
m_state = REQ_DESCRIPTION;
- connect(m_currentJob, SIGNAL(data(KIO::Job*, QByteArray)), this, SLOT(dataReceived(KIO::Job*, QByteArray)));
+ connect(m_currentJob, SIGNAL(data(KIO::Job*,QByteArray)), this, SLOT(dataReceived(KIO::Job*,QByteArray)));
connect(m_currentJob, SIGNAL(result(KJob*)), this, SLOT(jobFinished(KJob*)));
}
@@ -155,7 +155,7 @@ void OpenSearchManager::requestSuggestion(const QString &searchText)
_typedText = searchText;
m_currentJob = KIO::get(url, KIO::NoReload, KIO::HideProgressInfo);
m_state = REQ_SUGGESTION;
- connect(m_currentJob, SIGNAL(data(KIO::Job*, QByteArray)), this, SLOT(dataReceived(KIO::Job*, QByteArray)));
+ connect(m_currentJob, SIGNAL(data(KIO::Job*,QByteArray)), this, SLOT(dataReceived(KIO::Job*,QByteArray)));
connect(m_currentJob, SIGNAL(result(KJob*)), this, SLOT(jobFinished(KJob*)));
}
}
diff --git a/src/paneltreeview.cpp b/src/paneltreeview.cpp
index 575b4412..a4966f1b 100644
--- a/src/paneltreeview.cpp
+++ b/src/paneltreeview.cpp
@@ -44,7 +44,7 @@ PanelTreeView::PanelTreeView(QWidget *parent)
: QTreeView(parent)
{
connect(this, SIGNAL(itemHovered(QString)), parent, SIGNAL(itemHovered(QString)));
- connect(this, SIGNAL(openUrl(KUrl, Rekonq::OpenType)), parent, SIGNAL(openUrl(KUrl, Rekonq::OpenType)));
+ connect(this, SIGNAL(openUrl(KUrl,Rekonq::OpenType)), parent, SIGNAL(openUrl(KUrl,Rekonq::OpenType)));
setMouseTracking(true);
setExpandsOnDoubleClick(false);
}
diff --git a/src/sync/synccheckwidget.cpp b/src/sync/synccheckwidget.cpp
index 92cce8a8..9dbf5fc3 100644
--- a/src/sync/synccheckwidget.cpp
+++ b/src/sync/synccheckwidget.cpp
@@ -125,7 +125,7 @@ void SyncCheckWidget::initializePage()
rApp->syncManager()->loadSettings();
SyncHandler *h = rApp->syncManager()->handler();
- connect(h, SIGNAL(syncStatus(Rekonq::SyncData, bool, QString)), this, SLOT(updateWidget(Rekonq::SyncData, bool, QString)));
+ connect(h, SIGNAL(syncStatus(Rekonq::SyncData,bool,QString)), this, SLOT(updateWidget(Rekonq::SyncData,bool,QString)));
}
diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 74e549e5..c079d54e 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -82,7 +82,7 @@ TabBar::TabBar(QWidget *parent)
setContextMenuPolicy(Qt::CustomContextMenu);
- connect(this, SIGNAL(contextMenu(int, QPoint)), this, SLOT(contextMenu(int, QPoint)));
+ connect(this, SIGNAL(contextMenu(int,QPoint)), this, SLOT(contextMenu(int,QPoint)));
connect(this, SIGNAL(emptyAreaContextMenu(QPoint)), this, SLOT(emptyAreaContextMenu(QPoint)));
connect(m_animationMapper, SIGNAL(mapped(int)), this, SLOT(removeAnimation(int)));
diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index 8fe70811..f4e7220a 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -73,9 +73,9 @@ void CompletionWidget::insertItems(const UrlSearchList &list, const QString& tex
ListItem *suggestion = ListItemFactory::create(item, text, this);
suggestion->setBackgroundRole(offset % 2 ? QPalette::AlternateBase : QPalette::Base);
connect(suggestion,
- SIGNAL(itemClicked(ListItem*, Qt::MouseButton, Qt::KeyboardModifiers)),
+ SIGNAL(itemClicked(ListItem*,Qt::MouseButton,Qt::KeyboardModifiers)),
this,
- SLOT(itemChosen(ListItem*, Qt::MouseButton, Qt::KeyboardModifiers)));
+ SLOT(itemChosen(ListItem*,Qt::MouseButton,Qt::KeyboardModifiers)));
connect(suggestion, SIGNAL(updateList()), this, SLOT(updateList()));
connect(this, SIGNAL(nextItemSubChoice()), suggestion, SLOT(nextItemSubChoice()));
@@ -384,8 +384,8 @@ void CompletionWidget::suggestUrls(const QString &text)
}
UrlResolver *res = new UrlResolver(text);
- connect(res, SIGNAL(suggestionsReady(UrlSearchList, QString)),
- this, SLOT(updateSearchList(UrlSearchList, QString)));
+ connect(res, SIGNAL(suggestionsReady(UrlSearchList,QString)),
+ this, SLOT(updateSearchList(UrlSearchList,QString)));
_resList = res->orderedSearchItems();
// NOTE: It's important to call this AFTER orderedSearchItems() to let everything work
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index d3e95ef3..c66d3727 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -391,8 +391,8 @@ ImageLabel::ImageLabel(const QString &url, int width, int height, QWidget *paren
else
{
KIO::TransferJob *job = KIO::get(KUrl(url), KIO::NoReload, KIO::HideProgressInfo);
- connect(job, SIGNAL(data(KIO::Job*, QByteArray)),
- this, SLOT(slotData(KIO::Job*, QByteArray)));
+ connect(job, SIGNAL(data(KIO::Job*,QByteArray)),
+ this, SLOT(slotData(KIO::Job*,QByteArray)));
connect(job, SIGNAL(result(KJob*)),
this, SLOT(slotResult(KJob*)));
}
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index a7cb680c..c0da3ff1 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -133,7 +133,7 @@ UrlBar::UrlBar(QWidget *parent)
connect(_tab->view(), SIGNAL(iconChanged()), this, SLOT(refreshFavicon()));
// search icon
- connect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(QString, QString, QString)),
+ connect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(QString,QString,QString)),
this, SLOT(updateRightIcons()));
_suggestionTimer->setSingleShot(true);
@@ -449,7 +449,7 @@ void UrlBar::activateSuggestions(bool b)
{
_box = new CompletionWidget(this);
installEventFilter(_box.data());
- connect(_box.data(), SIGNAL(chosenUrl(KUrl, Rekonq::OpenType)), this, SLOT(loadRequestedUrl(KUrl, Rekonq::OpenType)));
+ connect(_box.data(), SIGNAL(chosenUrl(KUrl,Rekonq::OpenType)), this, SLOT(loadRequestedUrl(KUrl,Rekonq::OpenType)));
// activate suggestions on edit text
connect(this, SIGNAL(textChanged(QString)), this, SLOT(detectTypedString(QString)));
diff --git a/src/webtab.cpp b/src/webtab.cpp
index 8b140866..e5cfac56 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -81,8 +81,8 @@ WebTab::WebTab(QWidget *parent)
if (wallet)
{
- connect(wallet, SIGNAL(saveFormDataRequested(QString, QUrl)),
- this, SLOT(createWalletBar(QString, QUrl)));
+ connect(wallet, SIGNAL(saveFormDataRequested(QString,QUrl)),
+ this, SLOT(createWalletBar(QString,QUrl)));
}
connect(m_webView, SIGNAL(loadProgress(int)), this, SLOT(updateProgress(int)));
@@ -298,9 +298,9 @@ void WebTab::showSearchEngine(const QPoint &pos)
WebShortcutWidget *widget = new WebShortcutWidget(window());
widget->setWindowFlags(Qt::Popup);
- connect(widget, SIGNAL(webShortcutSet(KUrl, QString, QString)),
- rApp->opensearchManager(), SLOT(addOpenSearchEngine(KUrl, QString, QString)));
- connect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(QString, QString, QString)),
+ connect(widget, SIGNAL(webShortcutSet(KUrl,QString,QString)),
+ rApp->opensearchManager(), SLOT(addOpenSearchEngine(KUrl,QString,QString)));
+ connect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(QString,QString,QString)),
this, SLOT(openSearchEngineAdded()));
widget->show(extractOpensearchUrl(e), title, pos);
@@ -313,7 +313,7 @@ void WebTab::openSearchEngineAdded()
// If the providers changed, tell sycoca to rebuild its database...
KBuildSycocaProgressDialog::rebuildKSycoca(this);
- disconnect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(QString, QString, QString)),
+ disconnect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(QString,QString,QString)),
this, SLOT(openSearchEngineAdded()));
}
diff --git a/src/webtab.h b/src/webtab.h
index b875e4fe..954db13c 100644
--- a/src/webtab.h
+++ b/src/webtab.h
@@ -102,7 +102,7 @@ private Q_SLOTS:
void showRSSInfo(const QPoint &pos);
void showSearchEngine(const QPoint &pos);
void openSearchEngineAdded();
-
+
void showMessageBar();
Q_SIGNALS:
diff --git a/src/webview.cpp b/src/webview.cpp
index 0b171aa7..a581664a 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -87,8 +87,8 @@ WebView::WebView(QWidget* parent)
connect(this, SIGNAL(linkMiddleOrCtrlClicked(KUrl)), this, SLOT(loadUrlInNewTab(KUrl)));
// loadUrl signal
- connect(this, SIGNAL(loadUrl(KUrl, Rekonq::OpenType)),
- rApp, SLOT(loadUrl(KUrl, Rekonq::OpenType)));
+ connect(this, SIGNAL(loadUrl(KUrl,Rekonq::OpenType)),
+ rApp, SLOT(loadUrl(KUrl,Rekonq::OpenType)));
// Auto scroll timer
connect(m_autoScrollTimer, SIGNAL(timeout()), this, SLOT(scrollFrameChanged()));
@@ -266,15 +266,15 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
a = new KAction(KIcon("view-preview"), i18n("&View Image"), this);
a->setData(result.imageUrl());
- connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)),
- this, SLOT(viewImage(Qt::MouseButtons, Qt::KeyboardModifiers)));
+ connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)),
+ this, SLOT(viewImage(Qt::MouseButtons,Qt::KeyboardModifiers)));
menu.addAction(a);
menu.addAction(pageAction(KWebPage::DownloadImageToDisk));
a = new KAction(KIcon("view-media-visualization"), i18n("&Copy Image Location"), this);
a->setData(result.imageUrl());
- connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(slotCopyImageLocation()));
+ connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(slotCopyImageLocation()));
menu.addAction(a);
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-11 03:30:59 +0000