[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:01:15 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=42f6d7c
The following commit has been merged in the master branch:
commit 42f6d7c23536ab4cb7d126be092c5ffee2fe8f67
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Sat Dec 31 14:06:03 2011 +0100
Cleanup
---
plugins/butterfly/butterfly-account-ui.h | 1 -
plugins/butterfly/main-options-widget.h | 1 -
plugins/gabble/main-options-widget-facebook.h | 3 +--
plugins/gabble/main-options-widget-msn.h | 3 +--
plugins/gabble/main-options-widget.h | 1 -
plugins/haze/aim-main-options-widget.cpp | 2 ++
plugins/haze/aim-main-options-widget.h | 4 ++--
plugins/haze/aim-server-settings-widget.cpp | 2 ++
plugins/haze/aim-server-settings-widget.h | 1 -
plugins/haze/haze-account-ui-plugin.h | 1 -
plugins/haze/haze-aim-account.h | 1 -
plugins/haze/haze-icq-account.h | 1 -
plugins/haze/haze-msn-account.cpp | 2 ++
plugins/haze/haze-myspaceim-account-ui.h | 1 -
plugins/haze/haze-skype-account-ui.h | 1 -
plugins/haze/haze-yahoo-account.cpp | 2 ++
plugins/haze/haze-yahoo-account.h | 1 -
plugins/haze/icq-main-options-widget.h | 1 -
plugins/haze/icq-server-settings-widget.h | 1 -
plugins/haze/msn-main-options-widget.cpp | 1 -
plugins/haze/msn-main-options-widget.h | 1 -
plugins/haze/myspaceim-advanced-settings-widget.cpp | 2 ++
plugins/haze/myspaceim-advanced-settings-widget.h | 1 -
plugins/haze/myspaceim-main-options-widget.h | 1 -
plugins/haze/skype-advanced-settings-widget.cpp | 2 ++
plugins/haze/skype-advanced-settings-widget.h | 1 -
plugins/haze/skype-main-options-widget.h | 1 -
plugins/haze/yahoo-main-options-widget.cpp | 2 ++
plugins/haze/yahoo-main-options-widget.h | 6 ++----
plugins/haze/yahoo-server-settings-widget.cpp | 2 +-
plugins/haze/yahoo-server-settings-widget.h | 1 -
plugins/idle/main-options-widget.h | 1 -
plugins/salut/salut-main-options-widget.cpp | 2 ++
plugins/sunshine/sunshine-main-options-widget.cpp | 2 ++
34 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/plugins/butterfly/butterfly-account-ui.h b/plugins/butterfly/butterfly-account-ui.h
index d6d03c6..1845570 100644
--- a/plugins/butterfly/butterfly-account-ui.h
+++ b/plugins/butterfly/butterfly-account-ui.h
@@ -40,4 +40,3 @@ private:
#endif // header guard
-
diff --git a/plugins/butterfly/main-options-widget.h b/plugins/butterfly/main-options-widget.h
index 3b1f264..19a44c8 100644
--- a/plugins/butterfly/main-options-widget.h
+++ b/plugins/butterfly/main-options-widget.h
@@ -41,4 +41,3 @@ private:
#endif // header guard
-
diff --git a/plugins/gabble/main-options-widget-facebook.h b/plugins/gabble/main-options-widget-facebook.h
index 4653b73..abeacc5 100644
--- a/plugins/gabble/main-options-widget-facebook.h
+++ b/plugins/gabble/main-options-widget-facebook.h
@@ -36,8 +36,7 @@ public:
virtual ~MainOptionsWidgetFacebook();
virtual void submit();
- bool validateParameterValues();
-
+ virtual bool validateParameterValues();
private:
Ui::MainOptionsWidgetFacebook *m_ui;
};
diff --git a/plugins/gabble/main-options-widget-msn.h b/plugins/gabble/main-options-widget-msn.h
index 75ccef3..6d70cbe 100644
--- a/plugins/gabble/main-options-widget-msn.h
+++ b/plugins/gabble/main-options-widget-msn.h
@@ -36,8 +36,7 @@ public:
virtual ~MainOptionsWidgetMSN();
virtual void submit();
- bool validateParameterValues();
-
+ virtual bool validateParameterValues();
private:
Ui::MainOptionsWidgetMSN *m_ui;
};
diff --git a/plugins/gabble/main-options-widget.h b/plugins/gabble/main-options-widget.h
index 5443c28..46c0718 100644
--- a/plugins/gabble/main-options-widget.h
+++ b/plugins/gabble/main-options-widget.h
@@ -40,4 +40,3 @@ private:
};
#endif // header guard
-
diff --git a/plugins/haze/aim-main-options-widget.cpp b/plugins/haze/aim-main-options-widget.cpp
index bc19d9c..99068e2 100644
--- a/plugins/haze/aim-main-options-widget.cpp
+++ b/plugins/haze/aim-main-options-widget.cpp
@@ -39,3 +39,5 @@ AimMainOptionsWidget::~AimMainOptionsWidget()
{
delete m_ui;
}
+
+#include "aim-main-options-widget.moc"
diff --git a/plugins/haze/aim-main-options-widget.h b/plugins/haze/aim-main-options-widget.h
index 2b98548..b966fb6 100644
--- a/plugins/haze/aim-main-options-widget.h
+++ b/plugins/haze/aim-main-options-widget.h
@@ -30,7 +30,7 @@ class AimMainOptionsWidget
: public AbstractAccountParametersWidget
{
Q_OBJECT
- Q_DISABLE_COPY(AimMainOptionsWidget);
+ Q_DISABLE_COPY(AimMainOptionsWidget);
public:
explicit AimMainOptionsWidget(ParameterEditModel* model, QWidget* parent = 0);
@@ -39,4 +39,4 @@ private:
Ui::AimMainOptionsWidget *m_ui;
};
-#endif // HAZE_YAHOO_ACCOUNT_H
+#endif // KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_AIM_ACCOUNT_PARAMETERS_WIDGET_H
diff --git a/plugins/haze/aim-server-settings-widget.cpp b/plugins/haze/aim-server-settings-widget.cpp
index 58ee698..2a01b94 100644
--- a/plugins/haze/aim-server-settings-widget.cpp
+++ b/plugins/haze/aim-server-settings-widget.cpp
@@ -43,3 +43,5 @@ AimServerSettingsWidget::~AimServerSettingsWidget()
{
delete m_ui;
}
+
+#include "aim-server-settings-widget.moc"
diff --git a/plugins/haze/aim-server-settings-widget.h b/plugins/haze/aim-server-settings-widget.h
index f80c3e2..fe7c3ee 100644
--- a/plugins/haze/aim-server-settings-widget.h
+++ b/plugins/haze/aim-server-settings-widget.h
@@ -41,4 +41,3 @@ private:
#endif // header guard
-
diff --git a/plugins/haze/haze-account-ui-plugin.h b/plugins/haze/haze-account-ui-plugin.h
index 7d8c8b5..ac31ca4 100644
--- a/plugins/haze/haze-account-ui-plugin.h
+++ b/plugins/haze/haze-account-ui-plugin.h
@@ -41,4 +41,3 @@ private:
#endif // header guard
-
diff --git a/plugins/haze/haze-aim-account.h b/plugins/haze/haze-aim-account.h
index c20315e..39a0dd0 100644
--- a/plugins/haze/haze-aim-account.h
+++ b/plugins/haze/haze-aim-account.h
@@ -44,4 +44,3 @@ private:
};
#endif // header guard
-
diff --git a/plugins/haze/haze-icq-account.h b/plugins/haze/haze-icq-account.h
index 42c92ca..3d4d940 100644
--- a/plugins/haze/haze-icq-account.h
+++ b/plugins/haze/haze-icq-account.h
@@ -44,4 +44,3 @@ private:
};
#endif // header guard
-
diff --git a/plugins/haze/haze-msn-account.cpp b/plugins/haze/haze-msn-account.cpp
index fb18214..0cb4a54 100644
--- a/plugins/haze/haze-msn-account.cpp
+++ b/plugins/haze/haze-msn-account.cpp
@@ -50,3 +50,5 @@ AbstractAccountParametersWidget *HazeMsnAccountUi::mainOptionsWidget(ParameterEd
{
return new MsnMainOptionsWidget(model, parent);
}
+
+#include "haze-msn-account.moc"
diff --git a/plugins/haze/haze-myspaceim-account-ui.h b/plugins/haze/haze-myspaceim-account-ui.h
index 0265bdb..43ce6dd 100644
--- a/plugins/haze/haze-myspaceim-account-ui.h
+++ b/plugins/haze/haze-myspaceim-account-ui.h
@@ -44,4 +44,3 @@ private:
};
#endif // header guard
-
diff --git a/plugins/haze/haze-skype-account-ui.h b/plugins/haze/haze-skype-account-ui.h
index 7521734..dcfe9f2 100644
--- a/plugins/haze/haze-skype-account-ui.h
+++ b/plugins/haze/haze-skype-account-ui.h
@@ -44,4 +44,3 @@ private:
};
#endif // header guard
-
diff --git a/plugins/haze/haze-yahoo-account.cpp b/plugins/haze/haze-yahoo-account.cpp
index 1c95b63..c365820 100644
--- a/plugins/haze/haze-yahoo-account.cpp
+++ b/plugins/haze/haze-yahoo-account.cpp
@@ -59,3 +59,5 @@ AbstractAccountParametersWidget* HazeYahooAccount::advancedOptionsWidget(
AbstractAccountParametersWidget* yahooserversettings = new YahooServerSettingsWidget(model, parent);
return yahooserversettings;
}
+
+#include "haze-yahoo-account.moc"
diff --git a/plugins/haze/haze-yahoo-account.h b/plugins/haze/haze-yahoo-account.h
index 00fed24..edecd0b 100644
--- a/plugins/haze/haze-yahoo-account.h
+++ b/plugins/haze/haze-yahoo-account.h
@@ -46,4 +46,3 @@ private:
};
#endif // header guard
-
diff --git a/plugins/haze/icq-main-options-widget.h b/plugins/haze/icq-main-options-widget.h
index 89574e7..bef946c 100644
--- a/plugins/haze/icq-main-options-widget.h
+++ b/plugins/haze/icq-main-options-widget.h
@@ -38,4 +38,3 @@ private:
};
#endif // header guard
-
diff --git a/plugins/haze/icq-server-settings-widget.h b/plugins/haze/icq-server-settings-widget.h
index 848343b..cb581d0 100644
--- a/plugins/haze/icq-server-settings-widget.h
+++ b/plugins/haze/icq-server-settings-widget.h
@@ -41,4 +41,3 @@ private:
#endif // header guard
-
diff --git a/plugins/haze/msn-main-options-widget.cpp b/plugins/haze/msn-main-options-widget.cpp
index 3bab791..90d719e 100644
--- a/plugins/haze/msn-main-options-widget.cpp
+++ b/plugins/haze/msn-main-options-widget.cpp
@@ -39,4 +39,3 @@ MsnMainOptionsWidget::~MsnMainOptionsWidget()
}
#include "msn-main-options-widget.moc"
-
diff --git a/plugins/haze/msn-main-options-widget.h b/plugins/haze/msn-main-options-widget.h
index 56ffc30..8dea406 100644
--- a/plugins/haze/msn-main-options-widget.h
+++ b/plugins/haze/msn-main-options-widget.h
@@ -40,4 +40,3 @@ private:
#endif // KCMTELEPATHYACCOUNTS_PLUGIN_MSN_ACCOUNT_PARAMETERS_WIDGET_H
-
diff --git a/plugins/haze/myspaceim-advanced-settings-widget.cpp b/plugins/haze/myspaceim-advanced-settings-widget.cpp
index 07f184e..868db05 100644
--- a/plugins/haze/myspaceim-advanced-settings-widget.cpp
+++ b/plugins/haze/myspaceim-advanced-settings-widget.cpp
@@ -37,3 +37,5 @@ MySpaceIMAdvancedSettingsWidget::~MySpaceIMAdvancedSettingsWidget()
{
delete m_ui;
}
+
+#include "myspaceim-advanced-settings-widget.moc"
diff --git a/plugins/haze/myspaceim-advanced-settings-widget.h b/plugins/haze/myspaceim-advanced-settings-widget.h
index 905053e..da6fbcb 100644
--- a/plugins/haze/myspaceim-advanced-settings-widget.h
+++ b/plugins/haze/myspaceim-advanced-settings-widget.h
@@ -40,4 +40,3 @@ private:
#endif // header guard
-
diff --git a/plugins/haze/myspaceim-main-options-widget.h b/plugins/haze/myspaceim-main-options-widget.h
index 554fc51..6c6de7f 100644
--- a/plugins/haze/myspaceim-main-options-widget.h
+++ b/plugins/haze/myspaceim-main-options-widget.h
@@ -37,4 +37,3 @@ private:
};
#endif // header guard
-
diff --git a/plugins/haze/skype-advanced-settings-widget.cpp b/plugins/haze/skype-advanced-settings-widget.cpp
index 7152911..d5de357 100644
--- a/plugins/haze/skype-advanced-settings-widget.cpp
+++ b/plugins/haze/skype-advanced-settings-widget.cpp
@@ -39,3 +39,5 @@ SkypeAdvancedSettingsWidget::~SkypeAdvancedSettingsWidget()
{
delete m_ui;
}
+
+#include "skype-advanced-settings-widget.moc"
diff --git a/plugins/haze/skype-advanced-settings-widget.h b/plugins/haze/skype-advanced-settings-widget.h
index 520635d..3c6cda8 100644
--- a/plugins/haze/skype-advanced-settings-widget.h
+++ b/plugins/haze/skype-advanced-settings-widget.h
@@ -40,4 +40,3 @@ private:
#endif // header guard
-
diff --git a/plugins/haze/skype-main-options-widget.h b/plugins/haze/skype-main-options-widget.h
index 5e7082c..e081243 100644
--- a/plugins/haze/skype-main-options-widget.h
+++ b/plugins/haze/skype-main-options-widget.h
@@ -37,4 +37,3 @@ private:
};
#endif // header guard
-
diff --git a/plugins/haze/yahoo-main-options-widget.cpp b/plugins/haze/yahoo-main-options-widget.cpp
index a3e4f7c..8dfc87b 100644
--- a/plugins/haze/yahoo-main-options-widget.cpp
+++ b/plugins/haze/yahoo-main-options-widget.cpp
@@ -57,3 +57,5 @@ void YahooMainOptionsWidget::submit()
AbstractAccountParametersWidget::submit();
}
+
+#include "yahoo-main-options-widget.moc"
diff --git a/plugins/haze/yahoo-main-options-widget.h b/plugins/haze/yahoo-main-options-widget.h
index 72a3b30..38ddb1a 100644
--- a/plugins/haze/yahoo-main-options-widget.h
+++ b/plugins/haze/yahoo-main-options-widget.h
@@ -26,8 +26,7 @@
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class YahooMainOptionsWidget
- : public AbstractAccountParametersWidget
+class YahooMainOptionsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
@@ -35,8 +34,7 @@ public:
explicit YahooMainOptionsWidget(ParameterEditModel* model, QWidget* parent = 0);
virtual ~YahooMainOptionsWidget();
- void submit();
-
+ virtual void submit();
private:
Q_DISABLE_COPY(YahooMainOptionsWidget);
Ui::YahooMainOptionsWidget* m_ui;
diff --git a/plugins/haze/yahoo-server-settings-widget.cpp b/plugins/haze/yahoo-server-settings-widget.cpp
index 5e24b3d..4cc66d5 100644
--- a/plugins/haze/yahoo-server-settings-widget.cpp
+++ b/plugins/haze/yahoo-server-settings-widget.cpp
@@ -45,4 +45,4 @@ YahooServerSettingsWidget::~YahooServerSettingsWidget()
delete m_ui;
}
-
+#include "yahoo-server-settings-widget.moc"
diff --git a/plugins/haze/yahoo-server-settings-widget.h b/plugins/haze/yahoo-server-settings-widget.h
index cef13c3..0678821 100644
--- a/plugins/haze/yahoo-server-settings-widget.h
+++ b/plugins/haze/yahoo-server-settings-widget.h
@@ -41,4 +41,3 @@ private:
#endif // header guard
-
diff --git a/plugins/idle/main-options-widget.h b/plugins/idle/main-options-widget.h
index 1f5120f..bf50f30 100644
--- a/plugins/idle/main-options-widget.h
+++ b/plugins/idle/main-options-widget.h
@@ -41,4 +41,3 @@ private:
#endif // header guard
-
diff --git a/plugins/salut/salut-main-options-widget.cpp b/plugins/salut/salut-main-options-widget.cpp
index 64b4167..ff0339a 100644
--- a/plugins/salut/salut-main-options-widget.cpp
+++ b/plugins/salut/salut-main-options-widget.cpp
@@ -50,3 +50,5 @@ SalutMainOptionsWidget::~SalutMainOptionsWidget()
{
delete m_ui;
}
+
+#include "salut-main-options-widget.moc"
diff --git a/plugins/sunshine/sunshine-main-options-widget.cpp b/plugins/sunshine/sunshine-main-options-widget.cpp
index 21a74b7..f6beaec 100644
--- a/plugins/sunshine/sunshine-main-options-widget.cpp
+++ b/plugins/sunshine/sunshine-main-options-widget.cpp
@@ -39,3 +39,5 @@ SunshineMainOptionsWidget::~SunshineMainOptionsWidget()
{
delete m_ui;
}
+
+#include "sunshine-main-options-widget.moc"
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list