On Wednesday 19 June 2013 15:54:53 Jonathan Riddell wrote: > Another one is 7d8f948e33b861b3d5f013deb985ede3e36725b2 > virtual QList<KAction *> *customContextMenuActions( > ChatSession *manager ); > > Jonathan
Jonathan, please test this patch if it now fixing all API breakage.
diff --git a/libkopete/kopetecontact.cpp b/libkopete/kopetecontact.cpp
index 5ba9a85..a8aa3b7 100644
--- a/libkopete/kopetecontact.cpp
+++ b/libkopete/kopetecontact.cpp
@@ -518,6 +518,11 @@ QList<KAction *> *Contact::customContextMenuActions()
return 0L;
}
+QList<KAction*> *Contact::customContextMenuActions( ChatSession * /* manager
*/ )
+{
+ return customContextMenuActions();
+}
+
bool Contact::isOnline() const
{
return onlineStatus().isDefinitelyOnline();
diff --git a/libkopete/kopetecontact.h b/libkopete/kopetecontact.h
index 9564989..dc70bcf 100644
--- a/libkopete/kopetecontact.h
+++ b/libkopete/kopetecontact.h
@@ -232,6 +232,11 @@ public:
virtual QList<KAction *> *customContextMenuActions();
/**
+ * @deprecated
+ */
+ virtual KDE_DEPRECATED QList<KAction *> *customContextMenuActions(
ChatSession *manager );
+
+ /**
* @brief Get the Context Menu for this contact
*
* This menu includes generic actions common to each protocol, and
action defined in
diff --git a/libkopete/kopetemimetypehandler.cpp
b/libkopete/kopetemimetypehandler.cpp
index 4e79d16..9a32d54 100644
--- a/libkopete/kopetemimetypehandler.cpp
+++ b/libkopete/kopetemimetypehandler.cpp
@@ -184,6 +184,11 @@ void MimeTypeHandler::handleURL( const QString &mimeType,
const KUrl &url ) cons
Q_UNUSED( url );
}
+void MimeTypeHandler::handleURL( const KUrl &url ) const
+{
+ handleURL( QString(), url );
+}
+
EmoticonMimeTypeHandler::EmoticonMimeTypeHandler()
: MimeTypeHandler( false )
@@ -198,6 +203,11 @@ void EmoticonMimeTypeHandler::handleURL( const QString &,
const KUrl &url ) cons
Emoticons::self()->installTheme( url.toLocalFile() );
}
+void EmoticonMimeTypeHandler::handleURL( const KUrl &url ) const
+{
+ handleURL( QString(), url );
+}
+
} // END namespace Kopete
diff --git a/libkopete/kopetemimetypehandler.h
b/libkopete/kopetemimetypehandler.h
index 88b916e..de09af8 100644
--- a/libkopete/kopetemimetypehandler.h
+++ b/libkopete/kopetemimetypehandler.h
@@ -74,6 +74,11 @@ public:
*/
virtual void handleURL( const QString &mimeType, const KUrl &url )
const;
+ /**
+ * @deprecated
+ */
+ virtual KDE_DEPRECATED void handleURL( const KUrl &url ) const;
+
protected:
/**
* Register this object as the handler of type @p mimeType.
@@ -119,6 +124,7 @@ public:
const QStringList mimeTypes() const;
void handleURL( const QString &mimeType, const KUrl &url ) const;
+ KDE_DEPRECATED void handleURL( const KUrl &url ) const;
};
} // Kopete
--
1.7.10.4
--
Pali Rohár
pali.ro...@gmail.com
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ kopete-devel mailing list kopete-devel@kde.org https://mail.kde.org/mailman/listinfo/kopete-devel
