Remove use of KDE_IS_VERSION

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/80/head
Michele Calgaro 3 days ago
parent 647091e6d3
commit 95292c3fe7
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -1,7 +1,6 @@
#MIN_CONFIG(3.3.0)
AM_INIT_AUTOMAKE(tdevelop, 3.5.4)
KDEV_CHECK_TDE_VERSION
KDE_NEED_FLEX
KDEV_CHECK_DOCBASE

@ -111,11 +111,7 @@ void %{APPNAME}::saveProperties(TDEConfig *config)
// later when this app is restored
if (!m_view->currentURL().isEmpty()) {
#if KDE_IS_VERSION(3,1,3)
config->writePathEntry("lastURL", m_view->currentURL());
#else
config->writeEntry("lastURL", m_view->currentURL());
#endif
}
}

@ -56,10 +56,8 @@
connect(m_manager, TQ_SIGNAL(activePartChanged(KParts::Part*)),
this, TQ_SLOT(createGUI(KParts::Part*)) );
#if KDE_IS_VERSION(3, 3, 0)
setToolviewStyle( KMdi::TextAndIcon );
tabWidget()->setHoverCloseButton( false );
#endif
setMenuForSDIModeSysButtons( menuBar() );
setManagedDockPositionModeEnabled(true);
@ -85,7 +83,6 @@
addToolWindow( m_console, KDockWidget::DockBottom, getMainDockWidget(), 20 );
#if KDE_IS_VERSION(3, 3, 0)
if (Settings::showCloseTabsButton())
{
TQToolButton *but = new TQToolButton(tabWidget());
@ -95,7 +92,6 @@
connect(but, TQ_SIGNAL(clicked()), actionCollection()->action( "file_close" ), TQ_SIGNAL(activated()));
tabWidget()->setCornerWidget(but, TopRight);
}
#endif
// apply the saved mainwindow settings, if any, and ask the mainwindow
// to automatically save settings if changed: window size, toolbar

@ -80,16 +80,6 @@ void EditorProxy::setLineNumber(KParts::Part *part, int lineNum, int col)
ViewCursorInterface *iface = dynamic_cast<ViewCursorInterface*>(part->widget());
if (iface)
{
#if KDE_IS_VERSION(3,5,5)
#else
if (!part->widget()->hasFocus()) //workaround for TQXIMInputContext crashes. Keep for KDE <=3.5.4!
{
m_delayedPart = part;
m_delayedLine = lineNum;
m_delayedCol = col;
m_delayedLineTimer->start( 1, true );
} else
#endif
iface->setCursorPositionReal(lineNum, col == -1 ? 0 : col);
}
else {

@ -290,11 +290,7 @@ void ProjectManager::slotLoadProject( )
kdWarning() << i18n("error during restoring of the TDevelop session !") << endl;
}
}
#if KDE_IS_VERSION(3,5,0)
m_openRecentProjectAction->addURL(projectFile(), projectName()); // KDE >= 3.5.x
#else
m_openRecentProjectAction->addURL(projectFile()); // KDE 3.4.x
#endif
m_closeProjectAction->setEnabled(true);
m_projectOptionsAction->setEnabled(true);

@ -439,47 +439,6 @@ AC_SUBST(DB3INCLUDES)
AC_SUBST(DB3LDFLAGS)
])
dnl **********
dnl check wether KDE is at least version 3.4.0
dnl **********
AC_DEFUN([KDEV_CHECK_TDE_VERSION],
[
AC_MSG_CHECKING(for KDE >= 3.4.0)
AC_CACHE_VAL(ac_cv_kde_version_check,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $TQT_INCLUDES -I$ac_kde_includes"
AC_TRY_COMPILE([
#include <tdeversion.h>
],
[
#if KDE_IS_VERSION(3,4,0)
#else
KDE_choke me
#endif
],
ac_cv_kde_version_check=yes,
ac_cv_kde_version_check=no
)
CXXFLAGS="$save_CXXFLAGS"
AC_LANG_RESTORE
])
if test "$ac_cv_kde_version_check" = "yes"; then
AC_MSG_RESULT(yes)
else
AC_MSG_ERROR(Installed KDE needs to be version 3.4.0 or later)
fi
])
dnl **********
dnl check for new valgrind version (>= 2.1.0)
dnl **********

Loading…
Cancel
Save