CVS commit by woebbe: 

ancient times are over.


  M +2 -10     logdlg.cpp   1.57
  M +0 -8      settingsdlg.cpp   1.40
  M +0 -10     cvsservice/sshagent.cpp   1.7


--- kdesdk/cervisia/logdlg.cpp  #1.56:1.57
@@ -187,14 +187,6 @@ LogDialog::LogDialog(KConfig& cfg, QWidg
              this, SLOT(findClicked()) );
 
-#if KDE_IS_VERSION(3,2,90)
-    setButtonGuiItem(Ok, KGuiItem(i18n("to view something", "&View"),"fileopen","",""));
-#else
-    if( KGlobalSettings::showIconsOnPushButtons() )
-      actionButton(Ok)->setIconSet(SmallIcon(QString::fromLatin1("fileopen")));
-    setButtonText(Ok, i18n("to view something", "&View"));
-    setButtonTip(Ok, QString::null);
-    setButtonWhatsThis(Ok, QString::null);
-#endif
-    setButtonGuiItem(Apply, KGuiItem(i18n("Create Patch..."), "", "", ""));
+    setButtonGuiItem(Ok, KGuiItem(i18n("to view something", "&View"),"fileopen"));
+    setButtonGuiItem(Apply, KGuiItem(i18n("Create Patch...")));
     setHelp("browsinglogs");
 

--- kdesdk/cervisia/settingsdlg.cpp  #1.39:1.40
@@ -162,9 +162,5 @@ void SettingsDialog::writeSettings()
     // write entries to cvs DCOP service configuration
     serviceConfig->setGroup("General");
-#if KDE_IS_VERSION(3,1,3)
     serviceConfig->writePathEntry("CVSPath", cvspathedit->url());
-#else
-    serviceConfig->writeEntry("CVSPath", cvspathedit->url());
-#endif
     serviceConfig->writeEntry("Compression",
         m_advancedPage->kcfg_Compression->value());
@@ -179,9 +175,5 @@ void SettingsDialog::writeSettings()
     config->writeEntry("Username", usernameedit->text());
 
-#if KDE_IS_VERSION(3,1,3)
     config->writePathEntry("ExternalDiff", extdiffedit->url());
-#else
-    config->writeEntry("ExternalDiff", extdiffedit->url());
-#endif
 
     config->writeEntry("ContextLines", (unsigned)contextedit->value());

--- kdesdk/cervisia/cvsservice/sshagent.cpp  #1.6:1.7
@@ -108,11 +108,6 @@ bool SshAgent::addSshIdentities()
 
     // wait for process to finish
-#if KDE_IS_VERSION(3,1,90)
     // TODO CL use timeout?
     proc.wait();
-#else
-    while( proc.isRunning() )
-        kapp->processEvents();
-#endif
 
     kdDebug(8051) << "SshAgent::slotProcessExited(): added identities" << endl;
@@ -233,11 +228,6 @@ bool SshAgent::startSshAgent()
 
     // wait for process to finish
-#if KDE_IS_VERSION(3,1,90)
     // TODO CL use timeout?
     proc.wait();
-#else
-    while( proc.isRunning() )
-        kapp->processEvents();
-#endif
 
     return (proc.normalExit() && proc.exitStatus() == 0);