Remove use of KDE_IS_VERSION

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/70/head
Michele Calgaro 5 days ago
parent e7207f65b2
commit ccfa8e40c2
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -58,11 +58,7 @@
#include <kxmlguifactory.h>
#include <kdockwidget.h>
#include <tdeio/job.h>
#if KDE_IS_VERSION(3,1,90)
#include <kinputdialog.h>
#else
#include <tqinputdialog.h>
#endif
// local
#include "kimagemapeditor.h"
@ -522,9 +518,7 @@ void KImageMapEditor::setupActions()
showAltAction = new TDEToggleAction(i18n("Show Alt Tag"),0, this, TQ_SLOT (slotShowAltTag()),
actionCollection(), "view_showalt");
#if KDE_IS_VERSION(3,2,90)
showAltAction->setCheckedState(i18n("Hide Alt Tag"));
#endif
mapNameAction= new TDEAction(i18n("Map &Name..."),0,this,TQ_SLOT(mapEditName()),
actionCollection(), "map_name");
@ -703,11 +697,9 @@ void KImageMapEditor::setupActions()
configureShowImageListAction = new TDEToggleAction( i18n("Show Image List"), 0L, 0,
this, TQ_SLOT(configureShowImageList()),
actionCollection(), "configure_show_imagelist" );
#if KDE_IS_VERSION(3,2,90)
configureShowAreaListAction->setCheckedState(i18n("Hide Area List"));
configureShowMapListAction->setCheckedState(i18n("Hide Map List"));
configureShowImageListAction->setCheckedState(i18n("Hide Image List"));
#endif
}
updateActionAccess();
@ -1507,15 +1499,9 @@ void KImageMapEditor::mapDefaultArea()
void KImageMapEditor::mapEditName()
{
bool ok=false;
#if KDE_IS_VERSION(3, 1, 90)
TQString input = KInputDialog::getText(i18n("Enter Map Name"),
i18n("Enter the name of the map:"),
_mapName,&ok,widget());
#else
TQString input = KLineEditDlg::getText(i18n("Enter Map Name"),
i18n("Enter the name of the map:"),
_mapName,&ok,widget());
#endif
if (ok) {
if (input != _mapName) {
if (mapsListView->nameAlreadyExists(input))
@ -2756,11 +2742,7 @@ void KImageMapEditor::imageUsemap() {
index = 0;
}
#if KDE_IS_VERSION(3, 1, 90)
TQString input = KInputDialog::getItem(i18n("Enter Usemap"),
#else
TQString input = TQInputDialog::getItem(i18n("Enter Usemap"),
#endif
i18n("Enter the usemap value:"),
maps,index,true,&ok,widget());
if (ok) {

@ -21,15 +21,8 @@
#ifndef _KOMMANDER_EXPORT_H
#define _KOMMANDER_EXPORT_H
#include <tdeversion.h>
#if KDE_IS_VERSION(3,3,90)
#include <tdemacros.h>
#define KOMMANDER_EXPORT TDE_EXPORT
#else
#define KOMMANDER_EXPORT
#endif
#endif /* _KOMMANDER_EXPORT_H */

@ -260,11 +260,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva )
TDEAction *a = new ToggleToolViewAction( i18n( "Show %1" ).arg( mtva->wrappedWidget() ->caption() ),
/*TQString()*/sc, dynamic_cast<KDockWidget*>( mtva->wrapperWidget() ),
m_mdiMainFrm, actionCollection(), aname.latin1() );
#if KDE_IS_VERSION(3,2,90)
( ( ToggleToolViewAction* ) a ) ->setCheckedState( i18n( "Hide %1" ).arg( mtva->wrappedWidget() ->caption() ) );
#endif
connect( a, TQ_SIGNAL( destroyed( TQObject* ) ), this, TQ_SLOT( actionDeleted( TQObject* ) ) );
m_toolViewActions.append( a );
m_toolMenu->insert( a );

@ -847,11 +847,7 @@ void ProjectPrivate::slotAcceptCreateProject()
url = QExtFileInfo::toRelative(toolbarURL, baseURL);
el.firstChild().setNodeValue(QuantaCommon::qUrl(url));
#if KDE_IS_VERSION(3,4,89)
m_projectRecent->addURL(projectURL, projectName);
#else
m_projectRecent->addURL(projectURL);
#endif
m_projectRecent->setCurrentItem(0);
// remember the project in config
writeConfig();
@ -1327,12 +1323,8 @@ void ProjectPrivate::loadProjectFromTemp(const KURL &url, const TQString &tempFi
}
loadProjectXML();
openCurrentView();
#if KDE_IS_VERSION(3,4,89)
kdDebug(24000) << "Add recent project: " << url << " : projectName= " << projectName << endl;
m_projectRecent->addURL(url, projectName);
#else
m_projectRecent->addURL( url );
#endif
m_projectRecent->setCurrentItem(0);
// remember the project in config
writeConfig();

Loading…
Cancel
Save