summaryrefslogtreecommitdiff
path: root/src/sync
diff options
context:
space:
mode:
Diffstat (limited to 'src/sync')
-rw-r--r--src/sync/googlesynchandler.cpp30
-rw-r--r--src/sync/syncassistant.cpp3
-rw-r--r--src/sync/syncassistant.h4
-rw-r--r--src/sync/synccheckwidget.cpp4
-rw-r--r--src/sync/synccheckwidget.h2
-rw-r--r--src/sync/syncdatawidget.cpp2
-rw-r--r--src/sync/syncdatawidget.h2
-rw-r--r--src/sync/syncgooglesettingswidget.cpp3
-rw-r--r--src/sync/syncgooglesettingswidget.h4
-rw-r--r--src/sync/synchosttypewidget.cpp16
-rw-r--r--src/sync/synchosttypewidget.h2
-rw-r--r--src/sync/syncmanager.cpp6
-rw-r--r--src/sync/syncmanager.h2
13 files changed, 41 insertions, 39 deletions
diff --git a/src/sync/googlesynchandler.cpp b/src/sync/googlesynchandler.cpp
index 801b7b62..fab3c635 100644
--- a/src/sync/googlesynchandler.cpp
+++ b/src/sync/googlesynchandler.cpp
@@ -162,7 +162,7 @@ void GoogleSyncHandler::loadFinished(bool ok)
if (!ok)
{
kDebug() << "Error loading: " << _webPage.mainFrame()->url();
- emit syncStatus(Rekonq::Bookmarks, false, i18n( "Error loading: " + _webPage.mainFrame()->url().toEncoded()));
+ emit syncStatus(Rekonq::Bookmarks, false, i18n("Error loading: " + _webPage.mainFrame()->url().toEncoded()));
_isSyncing = false;
return;
@@ -184,8 +184,8 @@ void GoogleSyncHandler::loadFinished(bool ok)
- email.setAttribute("value",ReKonfig::syncUser());
- passwd.setAttribute("value",ReKonfig::syncPass());
+ email.setAttribute("value", ReKonfig::syncUser());
+ passwd.setAttribute("value", ReKonfig::syncPass());
form.evaluateJavaScript("this.submit();");
emit syncStatus(Rekonq::Bookmarks, true, i18n("Signing in..."));
@@ -219,7 +219,7 @@ void GoogleSyncHandler::loadFinished(bool ok)
if (!_bookmarksToDelete.isEmpty())
{
- for (QSet<QString>::const_iterator iter=_bookmarksToDelete.constBegin(); iter != _bookmarksToDelete.end(); ++iter)
+ for (QSet<QString>::const_iterator iter = _bookmarksToDelete.constBegin(); iter != _bookmarksToDelete.end(); ++iter)
{
QNetworkRequest request;
request.setUrl(QUrl("https://www.google.com/bookmarks/mark?dlq=" + *iter + "&sig=" + sigKey));
@@ -234,7 +234,7 @@ void GoogleSyncHandler::loadFinished(bool ok)
if (!_bookmarksToAdd.isEmpty())
{
emit syncStatus(Rekonq::Bookmarks, true, i18n("Adding bookmarks on server..."));
- for (QSet<KUrl>::const_iterator iter=_bookmarksToAdd.constBegin(); iter != _bookmarksToAdd.end(); ++iter)
+ for (QSet<KUrl>::const_iterator iter = _bookmarksToAdd.constBegin(); iter != _bookmarksToAdd.end(); ++iter)
{
KBookmark bookmark = rApp->bookmarkManager()->bookmarkForUrl(*iter);
QByteArray postData;
@@ -246,7 +246,7 @@ void GoogleSyncHandler::loadFinished(bool ok)
postData.append("&sig=" + sigKey.toUtf8());
QNetworkRequest request;
- request.setUrl(QUrl("https://www.google.com/bookmarks/mark?sig=" + sigKey +"&btnA"));
+ request.setUrl(QUrl("https://www.google.com/bookmarks/mark?sig=" + sigKey + "&btnA"));
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
kDebug() << "Url: " << request.url();
kDebug() << "Post data is :" << postData;
@@ -293,11 +293,11 @@ void GoogleSyncHandler::fetchingBookmarksFinished()
if (_mode == RECEIVE_CHANGES)
{
- for (int i=0; i<bookmarksOnServer.size(); ++i)
+ for (int i = 0; i < bookmarksOnServer.size(); ++i)
{
- QString title = getChildElement(bookmarksOnServer.at(i),"title");
- QString url = getChildElement(bookmarksOnServer.at(i),"url");
+ QString title = getChildElement(bookmarksOnServer.at(i), "title");
+ QString url = getChildElement(bookmarksOnServer.at(i), "url");
KBookmark bookmark = manager->bookmarkForUrl(KUrl(url));
if (bookmark.isNull())
@@ -350,7 +350,7 @@ QString GoogleSyncHandler::getChildElement(const QDomNode &node, QString name)
{
QDomNodeList nodes = node.childNodes();
- for (int j=0; j<nodes.size(); ++j)
+ for (int j = 0; j < nodes.size(); ++j)
{
QDomElement element = nodes.at(j).toElement();
@@ -372,7 +372,7 @@ void GoogleSyncHandler::checkToAddGB(const KBookmarkGroup &root, const QDomNodeL
{
kDebug() << "Checking Url to add on Google Bookmarks: " << current.url();
bool found = false;
- for (int i=0; i < bookmarksOnServer.count(); ++i)
+ for (int i = 0; i < bookmarksOnServer.count(); ++i)
{
if (current.isGroup())
{
@@ -382,7 +382,7 @@ void GoogleSyncHandler::checkToAddGB(const KBookmarkGroup &root, const QDomNodeL
found = true;
break;
}
- else if (current.url().url() == getChildElement(bookmarksOnServer.at(i),"url"))
+ else if (current.url().url() == getChildElement(bookmarksOnServer.at(i), "url"))
{
found = true;
}
@@ -401,15 +401,15 @@ void GoogleSyncHandler::checkToAddGB(const KBookmarkGroup &root, const QDomNodeL
void GoogleSyncHandler::checkToDeleteGB(BookmarkManager *manager, const QDomNodeList &bookmarksOnServer)
{
- for (int i=0; i < bookmarksOnServer.count(); ++i)
+ for (int i = 0; i < bookmarksOnServer.count(); ++i)
{
- QString url = getChildElement(bookmarksOnServer.at(i),"url");
+ QString url = getChildElement(bookmarksOnServer.at(i), "url");
KBookmark result = manager->bookmarkForUrl(KUrl(url));
if (result.isNull())
{
kDebug() << "Deleting from Google Bookmarks: " << url;
- _bookmarksToDelete.insert(getChildElement(bookmarksOnServer.at(i),"id"));
+ _bookmarksToDelete.insert(getChildElement(bookmarksOnServer.at(i), "id"));
}
}
diff --git a/src/sync/syncassistant.cpp b/src/sync/syncassistant.cpp
index 0e51e7b7..651cad75 100644
--- a/src/sync/syncassistant.cpp
+++ b/src/sync/syncassistant.cpp
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -36,6 +36,7 @@
#include "syncftpsettingswidget.h"
#include "syncgooglesettingswidget.h"
+
SyncAssistant::SyncAssistant(QWidget *parent)
: QWizard(parent)
{
diff --git a/src/sync/syncassistant.h b/src/sync/syncassistant.h
index 9853cb2d..e09db71a 100644
--- a/src/sync/syncassistant.h
+++ b/src/sync/syncassistant.h
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -42,7 +42,7 @@ public:
Page_Data,
Page_Type,
Page_FTP_Settings,
- Page_Google_Settings,
+ Page_Google_Settings,
Page_Check
};
diff --git a/src/sync/synccheckwidget.cpp b/src/sync/synccheckwidget.cpp
index 27f19721..5fdf5cd7 100644
--- a/src/sync/synccheckwidget.cpp
+++ b/src/sync/synccheckwidget.cpp
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -130,7 +130,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/sync/synccheckwidget.h b/src/sync/synccheckwidget.h
index 5cec1591..312fe9b4 100644
--- a/src/sync/synccheckwidget.h
+++ b/src/sync/synccheckwidget.h
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
diff --git a/src/sync/syncdatawidget.cpp b/src/sync/syncdatawidget.cpp
index 8b6ca8e3..fe3637b1 100644
--- a/src/sync/syncdatawidget.cpp
+++ b/src/sync/syncdatawidget.cpp
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
diff --git a/src/sync/syncdatawidget.h b/src/sync/syncdatawidget.h
index 30d1ae34..b1676384 100644
--- a/src/sync/syncdatawidget.h
+++ b/src/sync/syncdatawidget.h
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
diff --git a/src/sync/syncgooglesettingswidget.cpp b/src/sync/syncgooglesettingswidget.cpp
index c927a741..0a357d4f 100644
--- a/src/sync/syncgooglesettingswidget.cpp
+++ b/src/sync/syncgooglesettingswidget.cpp
@@ -1,8 +1,9 @@
/* ============================================================
*
* This file is a part of the rekonq project
+*
* Copyright (C) 2012 by Siteshwar Vashisht <siteshwar at gmail dot com>
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
diff --git a/src/sync/syncgooglesettingswidget.h b/src/sync/syncgooglesettingswidget.h
index 25c55dba..a51b1d2c 100644
--- a/src/sync/syncgooglesettingswidget.h
+++ b/src/sync/syncgooglesettingswidget.h
@@ -2,8 +2,8 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2011 by Siteshwar Vashisht <siteshwar AT gmail.com>
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2012 by Siteshwar Vashisht <siteshwar AT gmail.com>
+* Copyright (C) 2011-20112 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
diff --git a/src/sync/synchosttypewidget.cpp b/src/sync/synchosttypewidget.cpp
index 32fd1f9f..d52baf34 100644
--- a/src/sync/synchosttypewidget.cpp
+++ b/src/sync/synchosttypewidget.cpp
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -42,8 +42,8 @@ SyncHostTypeWidget::SyncHostTypeWidget(QWidget *parent)
if (ReKonfig::syncType() == 0)
ftpRadioButton->setChecked(true);
- else if(ReKonfig::syncType() == 1)
- googleRadioButton->setChecked(true);
+ else if (ReKonfig::syncType() == 1)
+ googleRadioButton->setChecked(true);
else
nullRadioButton->setChecked(true);
}
@@ -57,11 +57,11 @@ int SyncHostTypeWidget::nextId() const
ReKonfig::setSyncType(0);
return SyncAssistant::Page_FTP_Settings;
}
- else if (googleRadioButton->isChecked())
- {
- ReKonfig::setSyncType(1);
- return SyncAssistant::Page_Google_Settings;
- }
+ else if (googleRadioButton->isChecked())
+ {
+ ReKonfig::setSyncType(1);
+ return SyncAssistant::Page_Google_Settings;
+ }
else
{
ReKonfig::setSyncType(2);
diff --git a/src/sync/synchosttypewidget.h b/src/sync/synchosttypewidget.h
index 66408825..bc16f00b 100644
--- a/src/sync/synchosttypewidget.h
+++ b/src/sync/synchosttypewidget.h
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
diff --git a/src/sync/syncmanager.cpp b/src/sync/syncmanager.cpp
index 29e76414..aeb543d0 100644
--- a/src/sync/syncmanager.cpp
+++ b/src/sync/syncmanager.cpp
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -74,8 +74,8 @@ void SyncManager::loadSettings()
delete _syncImplementation.data();
_syncImplementation.clear();
}
-
- switch(ReKonfig::syncType())
+
+ switch (ReKonfig::syncType())
{
case 0:
_syncImplementation = new FTPSyncHandler(this);
diff --git a/src/sync/syncmanager.h b/src/sync/syncmanager.h
index cd7dbefa..586f3c4d 100644
--- a/src/sync/syncmanager.h
+++ b/src/sync/syncmanager.h
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-03 01:13:13 +0000