[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Re: [PATCH] Fix kdesdk compilation
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2007-12-18 16:33:51
Message-ID: 20071218163351.GA32597 () morpheus ! apaku ! dnsalias ! org
[Download RAW message or body]

On 18.12.07 10:25:46, Mike Smiley wrote:
> The attached patch applies to the kdesdk svn root directory.
> It affects 5 files.
> Compilation was not possible due to member functions not found,
> ambiguous constructors, and wrong path for #include.

Hmm, kdesdk compiles here just fine.

> Index: kate/app/katemdi.cpp
> ===================================================================
> --- kate/app/katemdi.cpp	(revision 750039)
> +++ kate/app/katemdi.cpp	(working copy)
> @@ -137,7 +137,7 @@
>      actionCollection()->setConfigGroup( "Shortcuts" );
>      actionCollection()->readSettings();
>  
> -    actionCollection()->setAssociatedWidget(m_mw);
> +    actionCollection()->associateWidget(m_mw);

That looks like your kdelibs is out of date. Its addAssociateWidget
nowadays

> Index: kate/kicker/sessionmenu/katesessionmenu.cpp
> ===================================================================
> --- kate/kicker/sessionmenu/katesessionmenu.cpp	(revision 750039)
> +++ kate/kicker/sessionmenu/katesessionmenu.cpp	(working copy)
> @@ -31,7 +31,7 @@
>  #include <kmessagebox.h>
>  #include <kstandarddirs.h>
>  #include <ktoolinvocation.h>
> -#include <libworkspace/kworkspace.h>
> +#include <kworkspace/kworkspace.h>

This is already in svn.

> Index: kcachegrind/kcachegrind/configuration.cpp
> ===================================================================
> --- kcachegrind/kcachegrind/configuration.cpp	(revision 750039)
> +++ kcachegrind/kcachegrind/configuration.cpp	(working copy)
> @@ -128,7 +128,7 @@
>    Configuration* c = config();
>  
>    // color options
> -  KConfigGroup colorConfig(kconfig, QByteArray("CostColors"));
> +  KConfigGroup colorConfig(kconfig, QString("CostColors"));

This and the following are all fixed in svn.

> Index: kcachegrind/kcachegrind/toplevel.cpp
> ===================================================================
> --- kcachegrind/kcachegrind/toplevel.cpp	(revision 750039)
> +++ kcachegrind/kcachegrind/toplevel.cpp	(working copy)
> @@ -216,12 +216,12 @@
>  void TopLevel::saveCurrentState(QString postfix)
>  {
>    KConfig *kconfig = KGlobal::config().data();
> -  QByteArray pf = postfix.ascii();
> +  QString pf = postfix.ascii();

This is wrong. QString::ascii() returns a QByteArray.

> -  KConfigGroup psConfig(kconfig, QByteArray("PartOverview")+pf);
> +  KConfigGroup psConfig(kconfig, QString("PartOverview")+pf);

Fixed already, same with the other KConfigGroup lines.

> @@ -269,10 +269,10 @@
>  {
>    KConfig *kconfig = KGlobal::config().data();
>    QStringList gList = kconfig->groupList();
> -  QByteArray pf = postfix.ascii();
> +  QString pf = postfix.ascii();

Same as above

>    // dock properties (not position, this should be have done before)
> -  QByteArray group = QByteArray("PartOverview");
> +  QString group = QString("PartOverview");

Fixed already.

So unfortunately there's nothing to apply left :)

Andreas

-- 
Is this really happening?
 
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<
[prev in list] [next in list] [prev in thread] [next in thread]