Index: kopenwithdialog.cpp
===================================================================
--- kopenwithdialog.cpp	(revision 720233)
+++ kopenwithdialog.cpp	(working copy)
@@ -52,11 +52,11 @@
 #include <kconfiggroup.h>
 
 template <> inline
-void KConfigGroup::writeEntry( const char *pKey,
+void KConfigGroup::writeEntry( const QByteArray &key,
                               const KGlobalSettings::Completion& aValue,
                               KConfigBase::WriteConfigFlags flags)
 {
-  writeEntry(pKey, int(aValue), flags);
+  writeEntry(key, int(aValue), flags);
 }
 
 class AppNode
Index: kpropertiesdialog.cpp
===================================================================
--- kpropertiesdialog.cpp	(revision 720233)
+++ kpropertiesdialog.cpp	(working copy)
@@ -379,7 +379,7 @@
     delete d;
 
     KConfigGroup group(KGlobal::config(), "KPropertiesDialog");
-    saveDialogSize(group, KConfigFlags::Persistent);
+    saveDialogSize(group, KConfigBase::Persistent);
 }
 
 void KPropertiesDialog::insertPlugin (KPropertiesDialogPlugin* plugin)
@@ -1428,7 +1428,7 @@
           KConfigGroup cg = config.desktopGroup();
           QString nameStr = nameFromFileName(properties->kurl().fileName());
           cg.writeEntry( "Name", nameStr );
-          cg.writeEntry( "Name", nameStr, KConfigBase::Persistent|KConfigBase::NLS);
+          cg.writeEntry( "Name", nameStr, KConfigGroup::Persistent|KConfigGroup::NLS);
       }
   }
 }
@@ -2665,7 +2665,7 @@
   {
     QString nameStr = nameFromFileName(properties->kurl().fileName());
     dg.writeEntry( "Name", nameStr );
-    dg.writeEntry( "Name", nameStr, KConfigBase::Persistent|KConfigBase::NLS );
+    dg.writeEntry( "Name", nameStr, KConfig::Persistent|KConfig::NLS );
 
   }
 }
@@ -2832,7 +2832,7 @@
   dg.writeEntry( "Patterns",  d->patternEdit->text() );
   dg.writeEntry( "Comment", d->commentEdit->text() );
   dg.writeEntry( "Comment",
-		     d->commentEdit->text(), KConfigBase::Persistent|KConfigBase::NLS ); // for compat
+		     d->commentEdit->text(), KConfigGroup::Persistent|KConfigGroup::NLS ); // for compat
   dg.writeEntry( "MimeType", d->mimeEdit->text() );
   if ( d->cbAutoEmbed->checkState() == Qt::PartiallyChecked )
       dg.deleteEntry( "X-KDE-AutoEmbed" );
@@ -3363,9 +3363,9 @@
   KConfigGroup config = _config.desktopGroup();
   config.writeEntry( "Type", QString::fromLatin1("Application"));
   config.writeEntry( "Comment", d->w->commentEdit->text() );
-  config.writeEntry( "Comment", d->w->commentEdit->text(), KConfigBase::Persistent|KConfigBase::NLS ); // for compat
+  config.writeEntry( "Comment", d->w->commentEdit->text(), KConfigGroup::Persistent|KConfigGroup::NLS ); // for compat
   config.writeEntry( "GenericName", d->w->genNameEdit->text() );
-  config.writeEntry( "GenericName", d->w->genNameEdit->text(), KConfigBase::Persistent|KConfigBase::NLS ); // for compat
+  config.writeEntry( "GenericName", d->w->genNameEdit->text(), KConfigGroup::Persistent|KConfigGroup::NLS ); // for compat
 
   if (d->m_systrayBool)
     config.writePathEntry( "Exec", d->w->commandEdit->text().prepend("ksystraycmd ") );
@@ -3390,7 +3390,7 @@
   if ( !d->w->nameEdit->isHidden() ) {
       QString nameStr = d->w->nameEdit->text();
       config.writeEntry( "Name", nameStr );
-      config.writeEntry( "Name", nameStr, KConfigBase::Persistent|KConfigBase::NLS );
+      config.writeEntry( "Name", nameStr, KConfigGroup::Persistent|KConfigGroup::NLS );
   }
 
   config.writeEntry("Terminal", d->m_terminalBool);