summaryrefslogtreecommitdiffstats
path: root/kexi/main
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/main')
-rw-r--r--kexi/main/keximainwindowimpl.cpp1
-rw-r--r--kexi/main/keximainwindowimpl_p.h5
-rw-r--r--kexi/main/kexinewstuff.cpp1
-rw-r--r--kexi/main/kexistatusbar.cpp11
-rw-r--r--kexi/main/kexistatusbar.h8
-rw-r--r--kexi/main/ksplitter.h1
-rw-r--r--kexi/main/printing/kexisimpleprintingpagesetup.cpp1
-rw-r--r--kexi/main/startup/KexiStartup.cpp1
-rw-r--r--kexi/main/startup/KexiStartupDialog.cpp1
9 files changed, 0 insertions, 30 deletions
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 939acea0c..3f76c9552 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -46,7 +46,6 @@
#include <kdebug.h>
#include <kkeydialog.h>
#include <kedittoolbar.h>
-#include <tdeversion.h>
#include <tdeglobalsettings.h>
#include <tdeparts/componentfactory.h>
#include <ktip.h>
diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h
index 3843f1daa..770d86098 100644
--- a/kexi/main/keximainwindowimpl_p.h
+++ b/kexi/main/keximainwindowimpl_p.h
@@ -290,7 +290,6 @@ void updatePropEditorDockWidthInfo() {
// ds->setKeepSize(true);
config->setGroup("MainWindow");
-# if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
if (wasAutoOpen) //(dw2->isVisible())
// ds->setSeparatorPosInPercent( 100 * nav->width() / wnd->width() );
@@ -303,10 +302,6 @@ void updatePropEditorDockWidthInfo() {
TQMAX(20, config->readNumEntry("LeftDockPosition", 20/* % */)));
// dw->resize( d->config->readNumEntry("LeftDockPosition", 115/* % */), dw->height() );
-# else
- //there were problems on KDE < 3.4
- ds->setSeparatorPosInPercent( 20 );
-# endif
//if (!wasAutoOpen) //(dw2->isVisible())
// ds->setSeparatorPos( ds->separatorPos(), true );
}
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index c3efa6e87..89b0705a9 100644
--- a/kexi/main/kexinewstuff.cpp
+++ b/kexi/main/kexinewstuff.cpp
@@ -26,7 +26,6 @@
#include <tdeapplication.h>
#include <tdefiledialog.h>
#include <tdelocale.h>
-#include <tdeversion.h>
#include "kexinewstuff.h"
diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp
index 0316da78b..afe791637 100644
--- a/kexi/main/kexistatusbar.cpp
+++ b/kexi/main/kexistatusbar.cpp
@@ -79,11 +79,6 @@ void KexitStatusBar::activePartChanged(KParts::Part *part)
if ((m_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) {
connect( part->widget(), TQ_SIGNAL( viewStatusMsg( const TQString & ) ),
this, TQ_SLOT( setStatus( const TQString & ) ) );
-
-# if TDE_VERSION < TDE_MAKE_VERSION(3,1,90)
- changeItem(m_map[ m_activePart ], m_msgID);
-// m_status->setText( m_map[ m_activePart ] );
-# endif
}
else if ((m_cursorIface = dynamic_cast<KTextEditor::ViewCursorInterface*>(part->widget()))) {
connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(cursorPositionChanged()));
@@ -115,12 +110,6 @@ void KexitStatusBar::setStatus(const TQString &str)
kdDebug() << "KexitStatusBar::setStatus(" << str << ")" << endl;
// m_status->setText(str);
changeItem(str, m_msgID);
-
-#if defined(TDE_MAKE_VERSION)
-# if TDE_VERSION < TDE_MAKE_VERSION(3,1,90)
- m_map[m_activePart] = str;
-# endif
-#endif
}
void KexitStatusBar::setCursorPosition(int line, int col)
diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h
index 09c675fa7..8d8f9437e 100644
--- a/kexi/main/kexistatusbar.h
+++ b/kexi/main/kexistatusbar.h
@@ -26,7 +26,6 @@
//temporary
#define KexitStatusBar_KTEXTEDITOR_USED 0
-#include <tdeversion.h>
#include <kstatusbar.h>
#include <tqmap.h>
@@ -65,13 +64,6 @@ class KexitStatusBar : public KStatusBar
KTextEditor::ViewStatusMsgInterface * m_viewmsgIface;
#endif
KParts::Part *m_activePart;
-
-// still hoping for a fix for KDE-3.1
-#if defined(TDE_MAKE_VERSION)
-# if TDE_VERSION < TDE_MAKE_VERSION(3,1,90)
- TQMap<KParts::Part*, TQString> m_map;
-# endif
-#endif
};
#endif
diff --git a/kexi/main/ksplitter.h b/kexi/main/ksplitter.h
index aee69081c..15871b345 100644
--- a/kexi/main/ksplitter.h
+++ b/kexi/main/ksplitter.h
@@ -27,7 +27,6 @@
#include <tqwidget.h>
#include <tqpushbutton.h>
-#include <tdeversion.h>
#ifndef NO_KDE2
#include <netwm_def.h>
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index f038bb3a8..dea68236f 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -34,7 +34,6 @@
#include <klineedit.h>
#include <kprinter.h>
#include <kpushbutton.h>
-#include <tdeversion.h>
#include <tqlabel.h>
#include <tqtimer.h>
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp
index 6e668b6c0..0311502f5 100644
--- a/kexi/main/startup/KexiStartup.cpp
+++ b/kexi/main/startup/KexiStartup.cpp
@@ -44,7 +44,6 @@
#include <kmimetype.h>
#include <tdemessagebox.h>
#include <tdecmdlineargs.h>
-#include <tdeversion.h>
#include <kprogress.h>
#include <ktextedit.h>
#include <kstaticdeleter.h>
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 9fdaf3ed7..f2926018e 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -37,7 +37,6 @@
#include <tqwidgetstack.h>
#include <tdelocale.h>
-#include <tdeversion.h>
#include <tdeinstance.h>
#include <kdebug.h>
#include <kpushbutton.h>