[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim-runtime] resources/google: normalize SIGNALs and SLOTs (using normalize)
From: Allen Winter <allen.winter () kdab ! com>
Date: 2012-04-30 23:28:39
Message-ID: 20120430232839.B948FA60BB () git ! kde ! org
[Download RAW message or body]
Git commit 20dcb110543f8ab8310d4ba0998e30cc1dcf75aa by Allen Winter.
Committed on 01/05/2012 at 00:20.
Pushed by winterz into branch 'master'.
normalize SIGNALs and SLOTs (using normalize)
M +2 -2 resources/google/calendar/calendareditor.cpp
M +22 -22 resources/google/calendar/calendarresource.cpp
M +1 -1 resources/google/calendar/resource_tasks.cpp
M +79 -79 resources/google/calendar/settingsdialog.cpp
M +2 -2 resources/google/calendar/tasklisteditor.cpp
M +15 -15 resources/google/contacts/contactsresource.cpp
M +8 -8 resources/google/contacts/settingsdialog.cpp
http://commits.kde.org/kdepim-runtime/20dcb110543f8ab8310d4ba0998e30cc1dcf75aa
diff --git a/resources/google/calendar/calendareditor.cpp \
b/resources/google/calendar/calendareditor.cpp index f1a5c6a..b7f06dd 100644
--- a/resources/google/calendar/calendareditor.cpp
+++ b/resources/google/calendar/calendareditor.cpp
@@ -45,8 +45,8 @@ CalendarEditor::CalendarEditor( Calendar *calendar ) :
}
}
- connect( m_ui->buttons, SIGNAL( accepted() ),
- this, SLOT( accepted() ) );
+ connect( m_ui->buttons, SIGNAL(accepted()),
+ this, SLOT(accepted()) );
}
CalendarEditor::~CalendarEditor()
diff --git a/resources/google/calendar/calendarresource.cpp \
b/resources/google/calendar/calendarresource.cpp index b2b695e..04868fb 100644
--- a/resources/google/calendar/calendarresource.cpp
+++ b/resources/google/calendar/calendarresource.cpp
@@ -70,15 +70,15 @@ CalendarResource::CalendarResource( const QString &id ):
setOnline( true );
m_gam = new AccessManager();
- connect( m_gam, SIGNAL( error( KGoogle::Error, QString ) ),
- this, SLOT( error( KGoogle::Error, QString ) ) );
- connect( m_gam, SIGNAL( replyReceived( KGoogle::Reply * ) ),
- this, SLOT( replyReceived( KGoogle::Reply * ) ) );
+ connect( m_gam, SIGNAL(error(KGoogle::Error,QString)),
+ this, SLOT(error(KGoogle::Error,QString)) );
+ connect( m_gam, SIGNAL(replyReceived(KGoogle::Reply*)),
+ this, SLOT(replyReceived(KGoogle::Reply*)) );
- connect( this, SIGNAL( abortRequested() ),
- this, SLOT( slotAbortRequested() ) );
- connect( this, SIGNAL( reloadConfiguration() ),
- this, SLOT( reloadConfig() ) );
+ connect( this, SIGNAL(abortRequested()),
+ this, SLOT(slotAbortRequested()) );
+ connect( this, SIGNAL(reloadConfiguration()),
+ this, SLOT(reloadConfig()) );
changeRecorder()->itemFetchScope().fetchFullPayload( true );
changeRecorder()->itemFetchScope().setAncestorRetrieval( ItemFetchScope::All );
@@ -174,10 +174,10 @@ void CalendarResource::retrieveItems( const Akonadi::Collection \
&collection )
* to be fetched from this collection! */
if ( collection.parentCollection() != Akonadi::Collection::root() ) {
ItemFetchJob *fetchJob = new ItemFetchJob( collection, this );
- connect( fetchJob, SIGNAL( finished( KJob * ) ),
- this, SLOT( cachedItemsRetrieved( KJob * ) ) );
- connect( fetchJob, SIGNAL( finished( KJob * ) ),
- fetchJob, SLOT( deleteLater() ) );
+ connect( fetchJob, SIGNAL(finished(KJob*)),
+ this, SLOT(cachedItemsRetrieved(KJob*)) );
+ connect( fetchJob, SIGNAL(finished(KJob*)),
+ fetchJob, SLOT(deleteLater()) );
fetchJob->fetchScope().fetchFullPayload( false );
fetchJob->setProperty( "collection", qVariantFromValue( collection ) );
@@ -233,10 +233,10 @@ void CalendarResource::cachedItemsRetrieved( KJob *job )
FetchListJob *fetchJob = new FetchListJob( url, service, account->accountName() );
fetchJob->setProperty( "collection", qVariantFromValue( collection ) );
- connect( fetchJob, SIGNAL( finished( KJob * ) ),
- this, SLOT( itemsReceived( KJob * ) ) );
- connect( fetchJob, SIGNAL( percent( KJob *, ulong ) ),
- this, SLOT( emitPercent( KJob *, ulong ) ) );
+ connect( fetchJob, SIGNAL(finished(KJob*)),
+ this, SLOT(itemsReceived(KJob*)) );
+ connect( fetchJob, SIGNAL(percent(KJob*,ulong)),
+ this, SLOT(emitPercent(KJob*,ulong)) );
fetchJob->start();
}
@@ -300,13 +300,13 @@ void CalendarResource::retrieveCollections()
FetchListJob *fetchJob;
fetchJob = new FetchListJob( Services::Calendar::fetchCalendarsUrl(), "Calendar", \
account->accountName() );
- connect( fetchJob, SIGNAL( finished( KJob * ) ),
- this, SLOT( calendarsReceived( KJob * ) ) );
+ connect( fetchJob, SIGNAL(finished(KJob*)),
+ this, SLOT(calendarsReceived(KJob*)) );
fetchJob->start();
fetchJob = new FetchListJob( Services::Tasks::fetchTaskListsUrl(), "Tasks", \
account->accountName() );
- connect( fetchJob, SIGNAL( finished( KJob * ) ),
- this, SLOT( taskListReceived( KJob * ) ) );
+ connect( fetchJob, SIGNAL(finished(KJob*)),
+ this, SLOT(taskListReceived(KJob*)) );
fetchJob->start();
}
@@ -457,8 +457,8 @@ void CalendarResource::itemRemoved( const Akonadi::Item &item )
fetchJob->setAutoDelete( true );
fetchJob->fetchScope().fetchFullPayload( true );
fetchJob->setProperty( "Item", qVariantFromValue( item ) );
- connect( fetchJob, SIGNAL( finished( KJob * ) ),
- this, SLOT( removeTaskFetchJobFinished( KJob * ) ) );
+ connect( fetchJob, SIGNAL(finished(KJob*)),
+ this, SLOT(removeTaskFetchJobFinished(KJob*)) );
fetchJob->start();
} else {
diff --git a/resources/google/calendar/resource_tasks.cpp \
b/resources/google/calendar/resource_tasks.cpp index 56ddb6d..9a94dd9 100644
--- a/resources/google/calendar/resource_tasks.cpp
+++ b/resources/google/calendar/resource_tasks.cpp
@@ -268,7 +268,7 @@ void CalendarResource::removeTaskFetchJobFinished( KJob *job )
ItemModifyJob *modifyJob = new ItemModifyJob( detachItems );
modifyJob->setProperty( "Item", qVariantFromValue( removedItem ) );
modifyJob->setAutoDelete( true );
- connect( modifyJob, SIGNAL( finished( KJob * ) ), this, SLOT( doRemoveTask( KJob * \
) ) ); + connect( modifyJob, SIGNAL(finished(KJob*)), this, \
SLOT(doRemoveTask(KJob*)) ); modifyJob->start();
}
diff --git a/resources/google/calendar/settingsdialog.cpp \
b/resources/google/calendar/settingsdialog.cpp index 7b2e45a..bf1817c 100644
--- a/resources/google/calendar/settingsdialog.cpp
+++ b/resources/google/calendar/settingsdialog.cpp
@@ -67,45 +67,45 @@ SettingsDialog::SettingsDialog( WId windowId, QWidget *parent ):
m_ui->addTasksBtn->setIcon( QIcon::fromTheme( "list-add" ) );
m_ui->removeTasksBtn->setIcon( QIcon::fromTheme( "list-remove" ) );
- connect( m_ui->addAccountBtn, SIGNAL( clicked() ),
- this, SLOT( addAccountClicked() ) );
- connect( m_ui->removeAccountBtn, SIGNAL( clicked() ),
- this, SLOT( removeAccountClicked() ) );
- connect( m_ui->accountsCombo, SIGNAL( currentIndexChanged( int ) ),
- this, SLOT( accountChanged() ) );
- connect( m_ui->addCalBtn, SIGNAL( clicked() ),
- this, SLOT( addCalendarClicked() ) );
- connect( m_ui->editCalBtn, SIGNAL( clicked() ),
- this, SLOT( editCalendarClicked() ) );
- connect( m_ui->calendarsList, SIGNAL( itemDoubleClicked( QListWidgetItem * ) ),
- this, SLOT( editCalendarClicked() ) );
- connect( m_ui->removeCalBtn, SIGNAL( clicked() ),
- this, SLOT( removeCalendarClicked() ) );
- connect( m_ui->reloadCalendarsBtn, SIGNAL( clicked() ),
- this, SLOT( reloadCalendarsClicked() ) );
- connect( m_ui->addTasksBtn, SIGNAL( clicked() ),
- this, SLOT( addTaskListClicked() ) );
- connect( m_ui->editTasksBtn, SIGNAL( clicked() ),
- this, SLOT( editTaskListClicked() ) );
- connect( m_ui->tasksList, SIGNAL( itemDoubleClicked( QListWidgetItem * ) ),
- this, SLOT( editTaskListClicked() ) );
- connect( m_ui->removeTasksBtn, SIGNAL( clicked() ),
- this, SLOT( removeTaskListClicked() ) );
- connect( m_ui->reloadTasksBtn, SIGNAL( clicked() ),
- this, SLOT( reloadTaskListsClicked() ) );
-
- connect( this, SIGNAL( accepted() ),
- this, SLOT( saveSettings() ) );
+ connect( m_ui->addAccountBtn, SIGNAL(clicked()),
+ this, SLOT(addAccountClicked()) );
+ connect( m_ui->removeAccountBtn, SIGNAL(clicked()),
+ this, SLOT(removeAccountClicked()) );
+ connect( m_ui->accountsCombo, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(accountChanged()) );
+ connect( m_ui->addCalBtn, SIGNAL(clicked()),
+ this, SLOT(addCalendarClicked()) );
+ connect( m_ui->editCalBtn, SIGNAL(clicked()),
+ this, SLOT(editCalendarClicked()) );
+ connect( m_ui->calendarsList, SIGNAL(itemDoubleClicked(QListWidgetItem*)),
+ this, SLOT(editCalendarClicked()) );
+ connect( m_ui->removeCalBtn, SIGNAL(clicked()),
+ this, SLOT(removeCalendarClicked()) );
+ connect( m_ui->reloadCalendarsBtn, SIGNAL(clicked()),
+ this, SLOT(reloadCalendarsClicked()) );
+ connect( m_ui->addTasksBtn, SIGNAL(clicked()),
+ this, SLOT(addTaskListClicked()) );
+ connect( m_ui->editTasksBtn, SIGNAL(clicked()),
+ this, SLOT(editTaskListClicked()) );
+ connect( m_ui->tasksList, SIGNAL(itemDoubleClicked(QListWidgetItem*)),
+ this, SLOT(editTaskListClicked()) );
+ connect( m_ui->removeTasksBtn, SIGNAL(clicked()),
+ this, SLOT(removeTaskListClicked()) );
+ connect( m_ui->reloadTasksBtn, SIGNAL(clicked()),
+ this, SLOT(reloadTaskListsClicked()) );
+
+ connect( this, SIGNAL(accepted()),
+ this, SLOT(saveSettings()) );
m_gam = new KGoogle::AccessManager;
- connect( m_gam, SIGNAL( replyReceived( KGoogle::Reply * ) ),
- this, SLOT( gam_objectsListReceived( KGoogle::Reply * ) ) );
- connect( m_gam, SIGNAL( error( KGoogle::Error, QString ) ),
- this, SLOT( error( KGoogle::Error, QString ) ) );
+ connect( m_gam, SIGNAL(replyReceived(KGoogle::Reply*)),
+ this, SLOT(gam_objectsListReceived(KGoogle::Reply*)) );
+ connect( m_gam, SIGNAL(error(KGoogle::Error,QString)),
+ this, SLOT(error(KGoogle::Error,QString)) );
KGoogle::Auth *auth = KGoogle::Auth::instance();
- connect( auth, SIGNAL( authenticated( KGoogle::Account::Ptr & ) ),
- this, SLOT( reloadAccounts() ) );
+ connect( auth, SIGNAL(authenticated(KGoogle::Account::Ptr&)),
+ this, SLOT(reloadAccounts()) );
m_ui->accountsCombo->clear();
reloadAccounts();
@@ -161,8 +161,8 @@ void SettingsDialog::saveSettings()
void SettingsDialog::reloadAccounts()
{
- disconnect( m_ui->accountsCombo, SIGNAL( currentIndexChanged( int ) ),
- this, SLOT( accountChanged() ) );
+ disconnect( m_ui->accountsCombo, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(accountChanged()) );
int accCnt = m_ui->accountsCombo->count();
m_ui->accountsCombo->reload();
@@ -176,8 +176,8 @@ void SettingsDialog::reloadAccounts()
if ( accCnt != m_ui->accountsCombo->count() )
accountChanged();
- connect( m_ui->accountsCombo, SIGNAL( currentIndexChanged( int ) ),
- this, SLOT( accountChanged() ) );
+ connect( m_ui->accountsCombo, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(accountChanged()) );
}
void SettingsDialog::addAccountClicked()
@@ -251,8 +251,8 @@ void SettingsDialog::accountChanged()
void SettingsDialog::addCalendarClicked()
{
CalendarEditor *editor = new CalendarEditor;
- connect( editor, SIGNAL( accepted( KGoogle::Objects::Calendar * ) ),
- this, SLOT( addCalendar( KGoogle::Objects::Calendar * ) ) );
+ connect( editor, SIGNAL(accepted(KGoogle::Objects::Calendar*)),
+ this, SLOT(addCalendar(KGoogle::Objects::Calendar*)) );
editor->exec();
@@ -275,10 +275,10 @@ void SettingsDialog::addCalendar( KGoogle::Objects::Calendar \
*calendar ) m_ui->calendarsBox->setDisabled( true );
gam = new KGoogle::AccessManager;
- connect( gam, SIGNAL( replyReceived( KGoogle::Reply * ) ),
- this, SLOT( gam_objectCreated( KGoogle::Reply * ) ) );
- connect( gam, SIGNAL( requestFinished( KGoogle::Request * ) ),
- gam, SLOT( deleteLater() ) );
+ connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)),
+ this, SLOT(gam_objectCreated(KGoogle::Reply*)) );
+ connect( gam, SIGNAL(requestFinished(KGoogle::Request*)),
+ gam, SLOT(deleteLater()) );
request = new KGoogle::Request( Services::Calendar::createCalendarUrl(),
Request::Create, "Calendar", account );
@@ -308,8 +308,8 @@ void SettingsDialog::editCalendarClicked()
return;
CalendarEditor *editor = new CalendarEditor( calendar );
- connect( editor, SIGNAL( accepted( KGoogle::Objects::Calendar * ) ),
- this, SLOT( editCalendar( KGoogle::Objects::Calendar * ) ) );
+ connect( editor, SIGNAL(accepted(KGoogle::Objects::Calendar*)),
+ this, SLOT(editCalendar(KGoogle::Objects::Calendar*)) );
editor->exec();
@@ -332,10 +332,10 @@ void SettingsDialog::editCalendar( KGoogle::Objects::Calendar \
*calendar ) m_ui->calendarsBox->setDisabled( true );
gam = new KGoogle::AccessManager;
- connect( gam, SIGNAL( replyReceived( KGoogle::Reply * ) ),
- this, SLOT( gam_objectModified( KGoogle::Reply * ) ) );
- connect( gam, SIGNAL( requestFinished( KGoogle::Request * ) ),
- gam, SLOT( deleteLater() ) );
+ connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)),
+ this, SLOT(gam_objectModified(KGoogle::Reply*)) );
+ connect( gam, SIGNAL(requestFinished(KGoogle::Request*)),
+ gam, SLOT(deleteLater()) );
request = new KGoogle::Request( Services::Calendar::updateCalendarUrl( \
calendar->uid() ), Request::Update, "Calendar", account );
@@ -385,10 +385,10 @@ void SettingsDialog::removeCalendarClicked()
m_ui->calendarsBox->setDisabled( true );
gam = new KGoogle::AccessManager;
- connect( gam, SIGNAL( replyReceived( KGoogle::Reply * ) ),
- this, SLOT( reloadCalendarsClicked() ) );
- connect( gam, SIGNAL( requestFinished( KGoogle::Request * ) ),
- gam, SLOT( deleteLater() ) );
+ connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)),
+ this, SLOT(reloadCalendarsClicked()) );
+ connect( gam, SIGNAL(requestFinished(KGoogle::Request*)),
+ gam, SLOT(deleteLater()) );
request = new KGoogle::Request( Services::Calendar::removeCalendarUrl( \
calendar->uid() ), Request::Remove, "Calendar", account );
@@ -398,8 +398,8 @@ void SettingsDialog::removeCalendarClicked()
void SettingsDialog::addTaskListClicked()
{
TasklistEditor *editor = new TasklistEditor;
- connect( editor, SIGNAL( accepted( KGoogle::Objects::TaskList * ) ),
- this, SLOT( addTaskList( KGoogle::Objects::TaskList * ) ) );
+ connect( editor, SIGNAL(accepted(KGoogle::Objects::TaskList*)),
+ this, SLOT(addTaskList(KGoogle::Objects::TaskList*)) );
editor->exec();
@@ -421,10 +421,10 @@ void SettingsDialog::reloadCalendarsClicked()
m_ui->calendarsList->clear();
gam = new KGoogle::AccessManager;
- connect( gam, SIGNAL( replyReceived( KGoogle::Reply * ) ),
- this, SLOT( gam_objectsListReceived( KGoogle::Reply * ) ) );
- connect( gam, SIGNAL( requestFinished( KGoogle::Request * ) ),
- gam, SLOT( deleteLater() ) );
+ connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)),
+ this, SLOT(gam_objectsListReceived(KGoogle::Reply*)) );
+ connect( gam, SIGNAL(requestFinished(KGoogle::Request*)),
+ gam, SLOT(deleteLater()) );
request = new KGoogle::Request( Services::Calendar::fetchCalendarsUrl(), \
Request::FetchAll, "Calendar", account ); gam->sendRequest( request );
@@ -446,10 +446,10 @@ void SettingsDialog::addTaskList( TaskList *taskList )
m_ui->tasksBox->setDisabled( true );
gam = new KGoogle::AccessManager;
- connect( gam, SIGNAL( replyReceived( KGoogle::Reply * ) ),
- this, SLOT( gam_objectCreated( KGoogle::Reply * ) ) );
- connect( gam, SIGNAL( requestFinished( KGoogle::Request * ) ),
- gam, SLOT( deleteLater() ) );
+ connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)),
+ this, SLOT(gam_objectCreated(KGoogle::Reply*)) );
+ connect( gam, SIGNAL(requestFinished(KGoogle::Request*)),
+ gam, SLOT(deleteLater()) );
request = new KGoogle::Request( Services::Tasks::createTaskListUrl(), \
Request::Create, "Tasks", account ); data = parser.objectToJSON( dynamic_cast< \
KGoogle::Object * >( taskList ) ); @@ -478,8 +478,8 @@ void \
SettingsDialog::editTaskListClicked() return;
TasklistEditor *editor = new TasklistEditor( taskList );
- connect( editor, SIGNAL( accepted( KGoogle::Objects::TaskList * ) ),
- this, SLOT( editTaskList( KGoogle::Objects::TaskList * ) ) );
+ connect( editor, SIGNAL(accepted(KGoogle::Objects::TaskList*)),
+ this, SLOT(editTaskList(KGoogle::Objects::TaskList*)) );
editor->exec();
@@ -502,10 +502,10 @@ void SettingsDialog::editTaskList( TaskList *taskList )
m_ui->tasksBox->setDisabled( true );
gam = new KGoogle::AccessManager;
- connect( gam, SIGNAL( replyReceived( KGoogle::Reply * ) ),
- this, SLOT( gam_objectModified( KGoogle::Reply * ) ) );
- connect( gam, SIGNAL( requestFinished( KGoogle::Request * ) ),
- gam, SLOT( deleteLater() ) );
+ connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)),
+ this, SLOT(gam_objectModified(KGoogle::Reply*)) );
+ connect( gam, SIGNAL(requestFinished(KGoogle::Request*)),
+ gam, SLOT(deleteLater()) );
request = new KGoogle::Request( Services::Tasks::updateTaskListUrl( \
taskList->uid() ), Request::Update, "Tasks", account );
@@ -555,10 +555,10 @@ void SettingsDialog::removeTaskListClicked()
m_ui->tasksBox->setDisabled( true );
gam = new KGoogle::AccessManager;
- connect( gam, SIGNAL( replyReceived( KGoogle::Reply * ) ),
- this, SLOT( reloadTaskListsClicked() ) );
- connect( gam, SIGNAL( requestFinished( KGoogle::Request * ) ),
- gam, SLOT( deleteLater() ) );
+ connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)),
+ this, SLOT(reloadTaskListsClicked()) );
+ connect( gam, SIGNAL(requestFinished(KGoogle::Request*)),
+ gam, SLOT(deleteLater()) );
request = new KGoogle::Request( Services::Tasks::removeTaskListUrl( \
taskList->uid() ), Request::Remove, "Tasks", account );
@@ -581,10 +581,10 @@ void SettingsDialog::reloadTaskListsClicked()
m_ui->tasksList->clear();
gam = new KGoogle::AccessManager;
- connect( gam, SIGNAL( replyReceived( KGoogle::Reply * ) ),
- this, SLOT( gam_objectsListReceived( KGoogle::Reply * ) ) );
- connect( gam, SIGNAL( requestFinished( KGoogle::Request * ) ),
- gam, SLOT( deleteLater() ) );
+ connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)),
+ this, SLOT(gam_objectsListReceived(KGoogle::Reply*)) );
+ connect( gam, SIGNAL(requestFinished(KGoogle::Request*)),
+ gam, SLOT(deleteLater()) );
request = new KGoogle::Request( Services::Tasks::fetchTaskListsUrl(), \
Request::FetchAll, "Tasks", account ); gam->sendRequest( request );
diff --git a/resources/google/calendar/tasklisteditor.cpp \
b/resources/google/calendar/tasklisteditor.cpp index 546bcec..633bcd4 100644
--- a/resources/google/calendar/tasklisteditor.cpp
+++ b/resources/google/calendar/tasklisteditor.cpp
@@ -31,8 +31,8 @@ TasklistEditor::TasklistEditor( TaskList *taskList ):
if ( m_taskList )
m_ui->nameEdit->setText( m_taskList->title() );
- connect( m_ui->buttons, SIGNAL( accepted() ),
- this, SLOT( accepted() ) );
+ connect( m_ui->buttons, SIGNAL(accepted()),
+ this, SLOT(accepted()) );
}
TasklistEditor::~TasklistEditor()
diff --git a/resources/google/contacts/contactsresource.cpp \
b/resources/google/contacts/contactsresource.cpp index 7ede1af..a23869a 100644
--- a/resources/google/contacts/contactsresource.cpp
+++ b/resources/google/contacts/contactsresource.cpp
@@ -71,17 +71,17 @@ ContactsResource::ContactsResource( const QString &id ):
m_gam = new KGoogle::AccessManager();
m_photoNam = new KIO::Integration::AccessManager( this );
- connect( m_gam, SIGNAL( replyReceived( KGoogle::Reply * ) ),
- this, SLOT( replyReceived( KGoogle::Reply * ) ) );
-
- connect( m_gam, SIGNAL( error( KGoogle::Error, QString ) ),
- this, SLOT( error( KGoogle::Error, QString ) ) );
- connect( this, SIGNAL( abortRequested() ),
- this, SLOT( slotAbortRequested() ) );
- connect( this, SIGNAL( reloadConfiguration() ),
- this, SLOT( reloadConfig() ) );
- connect( m_photoNam, SIGNAL( finished( QNetworkReply * ) ),
- this, SLOT( photoRequestFinished( QNetworkReply * ) ) );
+ connect( m_gam, SIGNAL(replyReceived(KGoogle::Reply*)),
+ this, SLOT(replyReceived(KGoogle::Reply*)) );
+
+ connect( m_gam, SIGNAL(error(KGoogle::Error,QString)),
+ this, SLOT(error(KGoogle::Error,QString)) );
+ connect( this, SIGNAL(abortRequested()),
+ this, SLOT(slotAbortRequested()) );
+ connect( this, SIGNAL(reloadConfiguration()),
+ this, SLOT(reloadConfig()) );
+ connect( m_photoNam, SIGNAL(finished(QNetworkReply*)),
+ this, SLOT(photoRequestFinished(QNetworkReply*)) );
changeRecorder()->itemFetchScope().fetchFullPayload( true );
changeRecorder()->fetchCollection( true );
@@ -182,8 +182,8 @@ void ContactsResource::retrieveItems( const Akonadi::Collection \
&collection ) ItemFetchJob *fetchJob = new ItemFetchJob( collection, this );
fetchJob->fetchScope().fetchFullPayload( true );
fetchJob->setProperty( "Collection", qVariantFromValue( collection ) );
- connect( fetchJob, SIGNAL( finished( KJob * ) ),
- this, SLOT( initialItemsFetchJobFinished( KJob * ) ) );
+ connect( fetchJob, SIGNAL(finished(KJob*)),
+ this, SLOT(initialItemsFetchJobFinished(KJob*)) );
fetchJob->start();
}
@@ -290,8 +290,8 @@ void ContactsResource::initialItemsFetchJobFinished( KJob *job )
FetchListJob *fetchJob = new FetchListJob( url, "Contacts", account->accountName() \
); fetchJob->setProperty( "Collection", qVariantFromValue( collection ) );
- connect( fetchJob, SIGNAL( finished( KJob * ) ), this, SLOT( contactListReceived( \
KJob * ) ) );
- connect( fetchJob, SIGNAL( percent( KJob *, ulong ) ), this, SLOT( emitPercent( \
KJob *, ulong ) ) ); + connect( fetchJob, SIGNAL(finished(KJob*)), this, \
SLOT(contactListReceived(KJob*)) ); + connect( fetchJob, \
SIGNAL(percent(KJob*,ulong)), this, SLOT(emitPercent(KJob*,ulong)) ); \
fetchJob->start(); }
diff --git a/resources/google/contacts/settingsdialog.cpp \
b/resources/google/contacts/settingsdialog.cpp index 6ea79c0..5e2bd1f 100644
--- a/resources/google/contacts/settingsdialog.cpp
+++ b/resources/google/contacts/settingsdialog.cpp
@@ -50,17 +50,17 @@ SettingsDialog::SettingsDialog( WId windowId, QWidget *parent ):
m_ui->addAccountBtn->setIcon( QIcon::fromTheme( "list-add-user" ) );
m_ui->removeAccountBtn->setIcon( QIcon::fromTheme( "list-remove-user" ) );
- connect( this, SIGNAL( accepted() ),
- this, SLOT( saveSettings() ) );
+ connect( this, SIGNAL(accepted()),
+ this, SLOT(saveSettings()) );
- connect( m_ui->addAccountBtn, SIGNAL( clicked( bool ) ),
- this, SLOT( addAccountClicked() ) );
- connect( m_ui->removeAccountBtn, SIGNAL( clicked( bool ) ),
- this, SLOT( removeAccountClicked() ) );
+ connect( m_ui->addAccountBtn, SIGNAL(clicked(bool)),
+ this, SLOT(addAccountClicked()) );
+ connect( m_ui->removeAccountBtn, SIGNAL(clicked(bool)),
+ this, SLOT(removeAccountClicked()) );
KGoogle::Auth *auth = KGoogle::Auth::instance();
- connect( auth, SIGNAL( authenticated( KGoogle::Account::Ptr & ) ),
- this, SLOT( reloadAccounts() ) );
+ connect( auth, SIGNAL(authenticated(KGoogle::Account::Ptr&)),
+ this, SLOT(reloadAccounts()) );
reloadAccounts();
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic