[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:14:23 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=1a0bd75
The following commit has been merged in the master branch:
commit 1a0bd756811147acb9b807a5c4d35e48ab476fa7
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date: Tue May 15 15:11:57 2012 +0200
Rename Config to AppletConfig class to avoid confusions with config.h and make krazy happy
---
contact-applet/CMakeLists.txt | 4 ++--
contact-applet/src/{config.cpp => applet_config.cpp} | 16 ++++++++--------
contact-applet/src/{config.h => applet_config.h} | 14 +++++++-------
contact-applet/src/{config.ui => applet_config.ui} | 0
contact-applet/src/contact-wrapper.h | 4 ++--
contact-applet/src/telepathy-contact.cpp | 6 +++---
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/contact-applet/CMakeLists.txt b/contact-applet/CMakeLists.txt
index a5dc7b5..1d5f838 100644
--- a/contact-applet/CMakeLists.txt
+++ b/contact-applet/CMakeLists.txt
@@ -8,14 +8,14 @@ include_directories(
set(plasma_applet_ktp_contact_SRCS
src/abstract-contact-delegate.cpp
- src/config.cpp
+ src/applet_config.cpp
src/contact-delegate.cpp
src/contact-wrapper.cpp
src/telepathy-contact.cpp
)
kde4_add_ui_files(plasma_applet_ktp_contact_SRCS
- src/config.ui
+ src/applet_config.ui
)
kde4_add_plugin(plasma_applet_ktp_contact ${plasma_applet_ktp_contact_SRCS})
diff --git a/contact-applet/src/config.cpp b/contact-applet/src/applet_config.cpp
similarity index 92%
rename from contact-applet/src/config.cpp
rename to contact-applet/src/applet_config.cpp
index 5e7a75e..5a60e69 100644
--- a/contact-applet/src/config.cpp
+++ b/contact-applet/src/applet_config.cpp
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-#include "config.h"
+#include "applet_config.h"
#include "contact-delegate.h"
#include <KTp/Models/accounts-model.h>
@@ -28,7 +28,7 @@
#include <KDebug>
#include <KPushButton>
-Config::Config(const Tp::AccountManagerPtr &accountManager, QWidget* parent)
+AppletConfig::AppletConfig(const Tp::AccountManagerPtr &accountManager, QWidget* parent)
: KDialog(parent)
, m_model(0)
, m_modelFilter(0)
@@ -45,19 +45,19 @@ Config::Config(const Tp::AccountManagerPtr &accountManager, QWidget* parent)
connect(this, SIGNAL(buttonClicked(KDialog::ButtonCode)), this, SLOT(slotButtonClicked(int)));
}
-Config::~Config()
+AppletConfig::~AppletConfig()
{
m_groupsModel->deleteLater();
m_model->deleteLater();
m_modelFilter->deleteLater();
}
-void Config::activateOkButton()
+void AppletConfig::activateOkButton()
{
button(Ok)->setEnabled(true);
}
-void Config::enableGroupsView(bool enable)
+void AppletConfig::enableGroupsView(bool enable)
{
if (enable) {
m_modelFilter->setSourceModel(m_groupsModel);
@@ -66,12 +66,12 @@ void Config::enableGroupsView(bool enable)
}
}
-void Config::enableOfflineContacts(bool enable)
+void AppletConfig::enableOfflineContacts(bool enable)
{
m_modelFilter->setPresenceTypeFilterFlags(enable ? AccountsFilterModel::DoNotFilterByPresence : AccountsFilterModel::ShowOnlyConnected);
}
-void Config::setupContactsList()
+void AppletConfig::setupContactsList()
{
// prepare models
m_model = new AccountsModel(this);
@@ -109,7 +109,7 @@ void Config::setupContactsList()
connect(ui.showGroups, SIGNAL(toggled(bool)), this, SLOT(enableGroupsView(bool)));
}
-void Config::slotButtonClicked(int button)
+void AppletConfig::slotButtonClicked(int button)
{
QModelIndex selectedItem = ui.contactsList->currentIndex();
diff --git a/contact-applet/src/config.h b/contact-applet/src/applet_config.h
similarity index 89%
rename from contact-applet/src/config.h
rename to contact-applet/src/applet_config.h
index ce6a447..98bfd41 100644
--- a/contact-applet/src/config.h
+++ b/contact-applet/src/applet_config.h
@@ -17,10 +17,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-#ifndef CONFIG_H
-#define CONFIG_H
+#ifndef APPLET_CONFIG_H
+#define APPLET_CONFIG_H
-#include "ui_config.h"
+#include "ui_applet_config.h"
#include <KDialog>
#include <TelepathyQt/AccountManager>
@@ -33,13 +33,13 @@ class AccountsModel;
class AccountsFilterModel;
class GroupsModel;
-class Config : public KDialog
+class AppletConfig : public KDialog
{
Q_OBJECT
public:
- explicit Config(const Tp::AccountManagerPtr &accountManager, QWidget *parent = 0);
- ~Config();
+ explicit AppletConfig(const Tp::AccountManagerPtr &accountManager, QWidget *parent = 0);
+ ~AppletConfig();
signals:
void setNewContact(const Tp::ContactPtr &newContact, const Tp::AccountPtr &relatedAccount);
@@ -64,4 +64,4 @@ private:
};
-#endif // CONFIG_H
+#endif // APPLET_CONFIG_H
diff --git a/contact-applet/src/config.ui b/contact-applet/src/applet_config.ui
similarity index 100%
rename from contact-applet/src/config.ui
rename to contact-applet/src/applet_config.ui
diff --git a/contact-applet/src/contact-wrapper.h b/contact-applet/src/contact-wrapper.h
index 5e04d0e..7b37907 100644
--- a/contact-applet/src/contact-wrapper.h
+++ b/contact-applet/src/contact-wrapper.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-#ifndef CONTACT_WRAPER_H
-#define CONTACT_WRAPER_H
+#ifndef CONTACT_WRAPPER_H
+#define CONTACT_WRAPPER_H
#include <QtCore/QObject>
diff --git a/contact-applet/src/telepathy-contact.cpp b/contact-applet/src/telepathy-contact.cpp
index 7445cb5..8709aa2 100644
--- a/contact-applet/src/telepathy-contact.cpp
+++ b/contact-applet/src/telepathy-contact.cpp
@@ -17,9 +17,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-#include "config.h"
-#include "contact-wrapper.h"
#include "telepathy-contact.h"
+#include "applet_config.h"
+#include "contact-wrapper.h"
#include <KConfig>
#include <KStandardDirs>
@@ -225,7 +225,7 @@ void TelepathyContact::setContact(const Tp::ContactPtr& newContact, const Tp::Ac
void TelepathyContact::showConfigurationInterface()
{
if (!isUserConfiguring()) {
- Config *config = new Config(m_accountManager, 0);
+ AppletConfig *config = new AppletConfig(m_accountManager, 0);
connect(config, SIGNAL(setNewContact(Tp::ContactPtr,Tp::AccountPtr)), this, SLOT(setContact(Tp::ContactPtr,Tp::AccountPtr)));
config->show();
}
--
ktp-contact-applet packaging
More information about the pkg-kde-commits
mailing list