summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
m---------admin0
-rw-r--r--kimagemapeditor/kimagemapeditor.cpp18
-rw-r--r--klinkstatus/src/CMakeLists.txt5
-rw-r--r--klinkstatus/src/engine/CMakeLists.txt3
-rw-r--r--klinkstatus/src/ui/CMakeLists.txt3
-rw-r--r--klinkstatus/src/ui/settings/CMakeLists.txt1
-rw-r--r--kommander/editor/orderindicator.cpp2
-rw-r--r--kommander/editor/pixmapchooser.cpp2
-rw-r--r--kommander/editor/propertyeditor.cpp2
-rw-r--r--kommander/editor/sizehandle.cpp2
-rw-r--r--kommander/editor/styledbutton.cpp2
-rw-r--r--kommander/editor/widgetfactory.cpp2
-rw-r--r--kommander/editor/workspace.cpp2
-rw-r--r--kommander/widget/kommander_export.h7
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp4
-rw-r--r--quanta/project/projectprivate.cpp8
16 files changed, 17 insertions, 46 deletions
diff --git a/admin b/admin
-Subproject 585c17a2dda766ac4d442c4b9f998e18cb1b2d9
+Subproject 95578bc83bad7ea609c9c3fbfbfba54864c7abe
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index a34dc4e7..20bb4bb7 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -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) {
diff --git a/klinkstatus/src/CMakeLists.txt b/klinkstatus/src/CMakeLists.txt
index 8b657494..03b31622 100644
--- a/klinkstatus/src/CMakeLists.txt
+++ b/klinkstatus/src/CMakeLists.txt
@@ -41,14 +41,15 @@ tde_add_kpart( libklinkstatuspart AUTOMOC
engine-static
klinkstatus-parser-static
utils-static
-
+
DEPENDENCIES
ui-static
settings-static
engine-static
klinkstatus-parser-static
utils-static
-
+ klinkstatus+src+cfg+klsconfig.cpp
+
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/klinkstatus/src/engine/CMakeLists.txt b/klinkstatus/src/engine/CMakeLists.txt
index 21cd32ae..11df5a56 100644
--- a/klinkstatus/src/engine/CMakeLists.txt
+++ b/klinkstatus/src/engine/CMakeLists.txt
@@ -27,4 +27,7 @@ tde_add_library( engine STATIC_PIC AUTOMOC
linkfilter.cpp
LINK
tdehtml-shared
+
+ DEPENDENCIES
+ klinkstatus+src+cfg+klsconfig.cpp
)
diff --git a/klinkstatus/src/ui/CMakeLists.txt b/klinkstatus/src/ui/CMakeLists.txt
index 316b729b..a7270ed1 100644
--- a/klinkstatus/src/ui/CMakeLists.txt
+++ b/klinkstatus/src/ui/CMakeLists.txt
@@ -32,4 +32,7 @@ tde_add_library( ui STATIC_PIC AUTOMOC
documentrootdialog.cpp
LINK
cfg-static
+
+ DEPENDENCIES
+ klinkstatus+src+cfg+klsconfig.cpp
)
diff --git a/klinkstatus/src/ui/settings/CMakeLists.txt b/klinkstatus/src/ui/settings/CMakeLists.txt
index 932c0cdd..0624c65e 100644
--- a/klinkstatus/src/ui/settings/CMakeLists.txt
+++ b/klinkstatus/src/ui/settings/CMakeLists.txt
@@ -30,6 +30,7 @@ tde_add_library( settings STATIC_PIC AUTOMOC
DEPENDENCIES
cfg-static
+ klinkstatus+src+cfg+klsconfig.cpp
)
configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY )
diff --git a/kommander/editor/orderindicator.cpp b/kommander/editor/orderindicator.cpp
index 24108c2f..2a3f49eb 100644
--- a/kommander/editor/orderindicator.cpp
+++ b/kommander/editor/orderindicator.cpp
@@ -18,7 +18,7 @@
**
**********************************************************************/
-#include <tqvariant.h> // HP-UX compiler need this here
+#include <tqvariant.h>
#include "orderindicator.h"
#include "formwindow.h"
diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp
index 71fe357c..357b2fe4 100644
--- a/kommander/editor/pixmapchooser.cpp
+++ b/kommander/editor/pixmapchooser.cpp
@@ -18,7 +18,7 @@
**
**********************************************************************/
-#include <tqvariant.h> // HP-UX compiler needs this here
+#include <tqvariant.h>
#include "pixmapchooser.h"
#include "formwindow.h"
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index 4b0c58e4..d69f67b0 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -18,7 +18,7 @@
**
**********************************************************************/
-#include <tqvariant.h> // HP-UX compiler needs this here
+#include <tqvariant.h>
#include "propertyeditor.h"
#include "pixmapchooser.h"
diff --git a/kommander/editor/sizehandle.cpp b/kommander/editor/sizehandle.cpp
index 4f6773dc..db2add07 100644
--- a/kommander/editor/sizehandle.cpp
+++ b/kommander/editor/sizehandle.cpp
@@ -18,7 +18,7 @@
**
**********************************************************************/
-#include <tqvariant.h> // HP-UX compiler needs this here
+#include <tqvariant.h>
#include "sizehandle.h"
#include "formwindow.h"
diff --git a/kommander/editor/styledbutton.cpp b/kommander/editor/styledbutton.cpp
index c35ce642..1d013d83 100644
--- a/kommander/editor/styledbutton.cpp
+++ b/kommander/editor/styledbutton.cpp
@@ -18,7 +18,7 @@
**
**********************************************************************/
-#include <tqvariant.h> // HP-UX compiler needs this here
+#include <tqvariant.h>
#include "styledbutton.h"
#include "formwindow.h"
#include "pixmapchooser.h"
diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp
index d22d63f2..681b0db4 100644
--- a/kommander/editor/widgetfactory.cpp
+++ b/kommander/editor/widgetfactory.cpp
@@ -26,7 +26,7 @@
#include <kommanderfactory.h>
#include "kmdrmainwindow.h"
-#include <tqvariant.h> // HP-UX compiler need this here
+#include <tqvariant.h>
#include "widgetfactory.h"
#include "widgetdatabase.h"
#include "metadatabase.h"
diff --git a/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp
index 59ed882c..f17c5e16 100644
--- a/kommander/editor/workspace.cpp
+++ b/kommander/editor/workspace.cpp
@@ -18,7 +18,7 @@
**
**********************************************************************/
-#include <tqvariant.h> // HP-UX compiler needs this here
+#include <tqvariant.h>
#include <tqlistview.h>
#include "workspace.h"
#include "formwindow.h"
diff --git a/kommander/widget/kommander_export.h b/kommander/widget/kommander_export.h
index f9e5d4ed..90d1d9f7 100644
--- a/kommander/widget/kommander_export.h
+++ b/kommander/widget/kommander_export.h
@@ -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 */
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
index 22d31db8..561dbb05 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
@@ -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 );
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index d4d523dc..a237a442 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -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();
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-10 04:20:23 +0000