diff options
63 files changed, 7 insertions, 154 deletions
diff --git a/chalk/ui/kis_paintop_box.cpp b/chalk/ui/kis_paintop_box.cpp index dbff1e1da..d2b9b5063 100644 --- a/chalk/ui/kis_paintop_box.cpp +++ b/chalk/ui/kis_paintop_box.cpp @@ -47,9 +47,7 @@ KisPaintopBox::KisPaintopBox (KisView * view, TQWidget *parent, const char * nam : super (parent, name), m_canvasController(view->getCanvasController()) { -#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,90) TDEAcceleratorManager::setNoAccel(this); -#endif Q_ASSERT(m_canvasController != 0); diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cpp b/filters/chalk/gmagick/kis_image_magick_converter.cpp index 01e1ee141..bb91d788c 100644 --- a/filters/chalk/gmagick/kis_image_magick_converter.cpp +++ b/filters/chalk/gmagick/kis_image_magick_converter.cpp @@ -28,8 +28,6 @@ #include <tqfileinfo.h> #include <tqstring.h> -#include <tdeversion.h> -#include <kdebug.h> #include <tdeapplication.h> #include <tdelocale.h> #include <kurl.h> diff --git a/filters/chalk/magick/kis_image_magick_converter.cpp b/filters/chalk/magick/kis_image_magick_converter.cpp index 5ea939e44..958cabf76 100644 --- a/filters/chalk/magick/kis_image_magick_converter.cpp +++ b/filters/chalk/magick/kis_image_magick_converter.cpp @@ -27,8 +27,6 @@ #include <tqfileinfo.h> #include <tqstring.h> -#include <tdeversion.h> -#include <kdebug.h> #include <tdeapplication.h> #include <tdelocale.h> #include <kurl.h> diff --git a/filters/kword/oowriter/oowriterimport.cpp b/filters/kword/oowriter/oowriterimport.cpp index ac3443799..42ad0d9d2 100644 --- a/filters/kword/oowriter/oowriterimport.cpp +++ b/filters/kword/oowriter/oowriterimport.cpp @@ -29,8 +29,6 @@ #include "oowriterimport.h" #include <ooutils.h> -#include <tdeversion.h> -#include <kdebug.h> #include <kzip.h> #include <KoDocumentInfo.h> diff --git a/filters/xsltfilter/export/xsltexportdia.cpp b/filters/xsltfilter/export/xsltexportdia.cpp index 0cd7c1115..c5780700d 100644 --- a/filters/xsltfilter/export/xsltexportdia.cpp +++ b/filters/xsltfilter/export/xsltexportdia.cpp @@ -28,7 +28,6 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdeconfig.h> -#include <tdeversion.h> #include <tdestandarddirs.h> #include <tderecentdocument.h> #include <tdetempfile.h> diff --git a/karbon/karbon_view.cpp b/karbon/karbon_view.cpp index 0a5add759..d12d6b54c 100644 --- a/karbon/karbon_view.cpp +++ b/karbon/karbon_view.cpp @@ -32,7 +32,6 @@ #include <tdelocale.h> #include <kiconloader.h> #include <tdemessagebox.h> -#include <tdeversion.h> #include <kprinter.h> #include <KoMainWindow.h> diff --git a/kexi/core/kexiaboutdata.cpp b/kexi/core/kexiaboutdata.cpp index 41ec076da..88e7d1204 100644 --- a/kexi/core/kexiaboutdata.cpp +++ b/kexi/core/kexiaboutdata.cpp @@ -21,7 +21,6 @@ #include "kexiaboutdata.h" #include <kexi_version.h> -#include <tdeversion.h> #include <kofficeversion.h> //only for KOFFICE_VERSION_STRING #include <tdelocale.h> diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp index 85f407073..a5677ba23 100644 --- a/kexi/formeditor/commands.cpp +++ b/kexi/formeditor/commands.cpp @@ -744,13 +744,11 @@ InsertWidgetCommand::execute() kdWarning() << "InsertWidgetCommand::execute() ERROR: widget creation failed" << endl; return; } -#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) //! @todo allow setting this for data view mode as well if (m_form->designMode()) { //don't generate accelerators for widgets in design mode TDEAcceleratorManager::setNoAccel(w); } -#endif // if the insertRect is invalid (ie only one point), we use widget' size hint if(( (m_insertRect.width() < 21) && (m_insertRect.height() < 21))) @@ -897,7 +895,6 @@ CreateLayoutCommand::execute() m_name = m_form->objectTree()->generateUniqueName(classname); TQWidget *w = lib->createWidget(classname, container->widget(), m_name.latin1(), container); -#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) //! @todo allow setting this for data view mode as well if (w) { if (m_form->designMode()) { @@ -905,7 +902,6 @@ CreateLayoutCommand::execute() TDEAcceleratorManager::setNoAccel(w); } } -#endif ObjectTreeItem *tree = w ? m_form->objectTree()->lookup(w->name()) : 0; if(!tree) return; diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index 12a9760f6..49991da4a 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -44,7 +44,6 @@ #include <klineedit.h> #include <tdelocale.h> #include <kdebug.h> -#include <tdeversion.h> #include "containerfactory.h" #include "container.h" @@ -55,14 +54,7 @@ #include "formmanager.h" #include "widgetlibrary.h" #include <formeditor/utils.h> - -#if TDE_VERSION < TDE_MAKE_VERSION(3,1,9) -# define KInputDialog TQInputDialog -# include <tqinputdialog.h> -# include <tqlineedit.h> -#else -# include <kinputdialog.h> -#endif +#include <kinputdialog.h> ContainerWidget::ContainerWidget(TQWidget *parent, const char *name) : TQWidget(parent, name) @@ -367,14 +359,10 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wTabWidget = new KFormDesigner::WidgetInfo(this); wTabWidget->setPixmap("tabwidget"); wTabWidget->setClassName("KFDTabWidget"); -#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) wTabWidget->addAlternateClassName("KTabWidget"); wTabWidget->addAlternateClassName("TQTabWidget"); //tmp: wTabWidget->setSavingName("TQTabWidget"); wTabWidget->setSavingName("KTabWidget"); -#else - wTabWidget->setSavingName("TQTabWidget"); -#endif wTabWidget->setIncludeFileName("ktabwidget.h"); wTabWidget->setName(i18n("Tab Widget")); wTabWidget->setNamePrefix( @@ -518,7 +506,7 @@ ContainerFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, else if(c == "KFDTabWidget") { KFDTabWidget *tab = new KFDTabWidget(p, n); -#if defined(USE_KTabWidget) && TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) +#if defined(USE_KTabWidget) tab->setTabReorderingEnabled(true); connect(tab, TQ_SIGNAL(movedTab(int,int)), this, TQ_SLOT(reorderTabs(int,int))); #endif @@ -857,10 +845,7 @@ void ContainerFactory::renameTabPage() bool ok; TQString name = KInputDialog::getText(i18n("New Page Title"), i18n("Enter a new title for the current page:"), -#if TDE_VERSION < TDE_MAKE_VERSION(3,1,9) - TQLineEdit::Normal, -#endif - tab->tabLabel(w), &ok, w->topLevelWidget()); + tab->tabLabel(w), &ok, w->topLevelWidget()); if(ok) tab->changeTab(w, name); } diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index e970b138d..5fd33962e 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -33,18 +33,9 @@ #include <kgenericfactory.h> #include <tdelocale.h> #include <kdebug.h> -#include <tdeversion.h> - -#if TDE_VERSION < TDE_MAKE_VERSION(3,1,9) -# include <tqdatetimeedit.h> -# define KTimeWidget TQTimeEdit -# define KDateWidget TQDateEdit -# define KDateTimeWidget TQDateTimeEdit -#else -# include <ktimewidget.h> -# include <kdatewidget.h> -# include <kdatetimewidget.h> -#endif +#include <ktimewidget.h> +#include <kdatewidget.h> +#include <kdatetimewidget.h> #include "spring.h" #include "formIO.h" @@ -280,10 +271,8 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wDate = new KFormDesigner::WidgetInfo(this); wDate->setPixmap("dateedit"); wDate->setClassName("KDateWidget"); -#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) wDate->addAlternateClassName("TQDateEdit"); wDate->setIncludeFileName("kdatewidget.h"); -#endif wDate->setName(i18n("Date Widget")); wDate->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "dateWidget")); @@ -293,10 +282,8 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wTime = new KFormDesigner::WidgetInfo(this); wTime->setPixmap("timeedit"); wTime->setClassName("KTimeWidget"); -#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) wTime->addAlternateClassName("TQTimeEdit"); wTime->setIncludeFileName("ktimewidget.h"); -#endif wTime->setName(i18n("Time Widget")); wTime->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "timeWidget")); @@ -306,10 +293,8 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wDateTime = new KFormDesigner::WidgetInfo(this); wDateTime->setPixmap("datetimeedit"); wDateTime->setClassName("KDateTimeWidget"); -#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) wDateTime->addAlternateClassName("TQDateTimeEdit"); wDateTime->setIncludeFileName("kdatetimewidget.h"); -#endif wDateTime->setName(i18n("Date/Time Widget")); wDateTime->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "dateTimeWidget")); diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index 188238fdd..2ab38e2dd 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -1197,13 +1197,11 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren if(!w) return; -#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) //! @todo allow setting this for data view mode as well if (m_currentForm->designMode()) { //don't generate accelerators for widgets in design mode TDEAcceleratorManager::setNoAccel(w); } -#endif w->setStyle(&(container->widget()->style())); w->show(); diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index 235ab2d20..ff440e931 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -50,8 +50,7 @@ #include <ktabwidget.h> #include <tdefontdialog.h> -#include <tdeversion.h> -#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) && !defined(TQ_WS_WIN) +#if !defined(TQ_WS_WIN) # include <tdeactioncollection.h> #endif diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp index aa8c3fa45..489716e63 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp @@ -25,7 +25,6 @@ #include <tqevent.h> #include <tqobjectlist.h> -#include <tdeversion.h> #include <tdeaction.h> #include <tdeinstance.h> #include <tdelocale.h> diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index 0a9e88acb..66bf7fd25 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -25,7 +25,6 @@ #include <tqevent.h> #include <tqobjectlist.h> -#include <tdeversion.h> #include <tdeaction.h> #include <tdeinstance.h> #include <tdelocale.h> diff --git a/kexi/kexidb/kexidb_export.h b/kexi/kexidb/kexidb_export.h index 8f8dbc0df..1c924ef30 100644 --- a/kexi/kexidb/kexidb_export.h +++ b/kexi/kexidb/kexidb_export.h @@ -21,7 +21,6 @@ #define _KEXIDB_EXPORT_H_ #ifdef __cplusplus -# include <tdeversion.h> /* this will also include <tdelibs_export.h>, if available */ #endif /* TDE_EXPORT will be defined multiple times without this on tdelibs 3.3 (tested on 3.3.1) */ #include <tdemacros.h> 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> diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp index 1dbffdb19..3ba7b342b 100644 --- a/kexi/plugins/forms/kexidbfactory.cpp +++ b/kexi/plugins/forms/kexidbfactory.cpp @@ -210,11 +210,7 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL #endif /* -#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) KexiDataAwareWidgetInfo *wDate = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KDateWidget"); -#else - KexiDataAwareWidgetInfo *wDate = new KexiDataAwareWidgetInfo(this, "stdwidgets", "TQDateEdit"); -#endif wDate->setPixmap("dateedit"); wDate->setClassName("KexiDBDateEdit"); wDate->addAlternateClassName("TQDateEdit", true);//override @@ -225,11 +221,7 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL wDate->setDescription(i18n("A widget to input and display a date")); addClass(wDate); -#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) KexiDataAwareWidgetInfo *wTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KTimeWidget"); -#else - KexiDataAwareWidgetInfo *wTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "TQTimeEdit"); -#endif wTime->setPixmap("timeedit"); wTime->setClassName("KexiDBTimeEdit"); wTime->addAlternateClassName("TQTimeEdit", true);//override @@ -240,11 +232,7 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL wTime->setDescription(i18n("A widget to input and display a time")); addClass(wTime); -#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) KexiDataAwareWidgetInfo *wDateTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KDateTimeWidget"); -#else - KexiDataAwareWidgetInfo *wDateTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KDateTimeWidget"); -#endif wDateTime->setPixmap("datetimeedit"); wDateTime->setClassName("KexiDBDateTimeEdit"); wDateTime->addAlternateClassName("TQDateTimeEdit", true);//override diff --git a/kexi/plugins/macros/lib/komacro_export.h b/kexi/plugins/macros/lib/komacro_export.h index 9b03f2698..36a8d13cc 100644 --- a/kexi/plugins/macros/lib/komacro_export.h +++ b/kexi/plugins/macros/lib/komacro_export.h @@ -21,7 +21,6 @@ #define KOMACRO_EXPORT_H_ #ifdef __cplusplus -# include <tdeversion.h> /* this will also include <tdelibs_export.h>, if available */ #endif /* TDE_EXPORT will be defined multiple times without this on tdelibs 3.3 (tested on 3.3.1) */ diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp index 2d80563a1..c4594a87d 100644 --- a/kexi/widget/kexidswelcome.cpp +++ b/kexi/widget/kexidswelcome.cpp @@ -25,7 +25,6 @@ #include <kiconloader.h> #include <tdeglobalsettings.h> #include <kstdguiitem.h> -#include <tdeversion.h> #include "kexidatasourcewizard.h" #include "kexidswelcome.h" diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp index eb65fe226..ac62dc5a8 100644 --- a/kexi/widget/kexifieldcombobox.cpp +++ b/kexi/widget/kexifieldcombobox.cpp @@ -32,7 +32,6 @@ #include <kdebug.h> #include <kiconloader.h> -#include <tdeversion.h> #include <tdeconfig.h> #include <tdeglobalsettings.h> #include <tdelocale.h> diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp index 64d38a326..33528e9db 100644 --- a/kexi/widget/kexifieldlistview.cpp +++ b/kexi/widget/kexifieldlistview.cpp @@ -31,7 +31,6 @@ #include <kdebug.h> #include <kiconloader.h> -#include <tdeversion.h> #include <tdeconfig.h> #include <tdeglobalsettings.h> #include <tdelocale.h> diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index 7c28d4638..92ce62b54 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -32,7 +32,6 @@ #include <kdebug.h> #include <kiconloader.h> -#include <tdeversion.h> #include <tdeconfig.h> #include <tdeglobalsettings.h> diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp index 6ed856678..be72693ef 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp @@ -14,7 +14,6 @@ #include <tdelocale.h> #include <KoGlobal.h> #include <KoZoomHandler.h> -#include <tdeversion.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/koshell/koshell_shell.cpp b/koshell/koshell_shell.cpp index ce5f4e3d1..eb65d57b9 100644 --- a/koshell/koshell_shell.cpp +++ b/koshell/koshell_shell.cpp @@ -46,7 +46,6 @@ #include <tderecentdocument.h> #include <tdeparts/partmanager.h> #include <tdeaction.h> -#include <tdeversion.h> #include <tdeaboutdata.h> #include <KoQueryTrader.h> diff --git a/kplato/kptview.cpp b/kplato/kptview.cpp index ad77e6125..21e5ac2c4 100644 --- a/kplato/kptview.cpp +++ b/kplato/kptview.cpp @@ -52,7 +52,6 @@ #include <tdelistview.h> #include <tdestdaccel.h> #include <tdeaccelgen.h> -#include <tdeversion.h> #include <kstatusbar.h> #include <kxmlguifactory.h> diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index 4ea5112bd..4b0d361a0 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -68,7 +68,6 @@ #include <klineedit.h> #include <KoRect.h> #include <tdemessagebox.h> -#include <tdeversion.h> #include <kurlrequesterdlg.h> #include <tdelistview.h> #include <tdefiledialog.h> diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index ebe4c0a90..b6bc350aa 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -44,7 +44,6 @@ #include <tdetempfile.h> #include <tdelocale.h> #include <kdebug.h> -#include <tdeversion.h> #include <tdemultipledrag.h> #include <tqfont.h> diff --git a/kspread/dialogs/kspread_dlg_preference.cpp b/kspread/dialogs/kspread_dlg_preference.cpp index 66776e346..0890f044c 100644 --- a/kspread/dialogs/kspread_dlg_preference.cpp +++ b/kspread/dialogs/kspread_dlg_preference.cpp @@ -37,7 +37,6 @@ #include <knuminput.h> #include <tdespell.h> #include <tdemessagebox.h> -#include <tdeversion.h> #include <kcolorbutton.h> #include <KoTabBar.h> diff --git a/kspread/dialogs/kspread_dlg_reference.cpp b/kspread/dialogs/kspread_dlg_reference.cpp index bb30c244c..3cb49ef9d 100644 --- a/kspread/dialogs/kspread_dlg_reference.cpp +++ b/kspread/dialogs/kspread_dlg_reference.cpp @@ -45,7 +45,6 @@ #include <kbuttonbox.h> #include <tdemessagebox.h> #include <kdebug.h> -#include <tdeversion.h> #include <kstdguiitem.h> diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 023119b60..81d404ef4 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -116,7 +116,6 @@ #include <kstdaction.h> #include <tdetempfile.h> #include <kurldrag.h> -#include <tdeversion.h> #include <kiconloader.h> #include <tqclipboard.h> diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 59d160e74..f2e5bc903 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -37,7 +37,6 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <tdeversion.h> #include <tdefileitem.h> #include <kiconloader.h> #include <tdeio/job.h> diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp index c1cd49367..5aafb96ca 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.cpp +++ b/lib/kofficecore/KoDocumentInfoDlg.cpp @@ -42,7 +42,6 @@ #include <tdeabc/addressee.h> #include <tdeabc/stdaddressbook.h> -#include <tdeversion.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <ktar.h> diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 747a21e4a..0264981e7 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -34,7 +34,6 @@ #include <tdeaboutdata.h> #include <kprinter.h> -#include <tdeversion.h> #include <kstdaction.h> #include <tdeapplication.h> #include <tdemessagebox.h> diff --git a/lib/kofficecore/KoPictureClipart.cpp b/lib/kofficecore/KoPictureClipart.cpp index dbb925110..f65791d1d 100644 --- a/lib/kofficecore/KoPictureClipart.cpp +++ b/lib/kofficecore/KoPictureClipart.cpp @@ -25,7 +25,6 @@ #include <tqpixmap.h> #include <kdebug.h> -#include <tdeversion.h> #include "KoPictureKey.h" #include "KoPictureBase.h" diff --git a/lib/kofficecore/KoPictureEps.cpp b/lib/kofficecore/KoPictureEps.cpp index 4e501b2c2..86f419c3f 100644 --- a/lib/kofficecore/KoPictureEps.cpp +++ b/lib/kofficecore/KoPictureEps.cpp @@ -34,7 +34,6 @@ #include <tdeglobal.h> #include <kdebug.h> -#include <tdeversion.h> #include <tdetempfile.h> #include <tdeprocess.h> diff --git a/lib/kofficecore/KoPictureWmf.cpp b/lib/kofficecore/KoPictureWmf.cpp index ec751865f..240d4d338 100644 --- a/lib/kofficecore/KoPictureWmf.cpp +++ b/lib/kofficecore/KoPictureWmf.cpp @@ -25,7 +25,6 @@ #include <tqpixmap.h> #include <kdebug.h> -#include <tdeversion.h> #include <kowmfpaint.h> #include "KoPictureKey.h" diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp index 5aeac9c7a..98197dda3 100644 --- a/lib/kofficecore/KoTemplates.cpp +++ b/lib/kofficecore/KoTemplates.cpp @@ -26,7 +26,6 @@ #include <tdedesktopfile.h> #include <tdesimpleconfig.h> #include <kdebug.h> -#include <tdeversion.h> #include <tdeinstance.h> #include <ksavefile.h> #include <tdestandarddirs.h> diff --git a/lib/kofficecore/koffice_export.h b/lib/kofficecore/koffice_export.h index e425aff61..0ebf2a421 100644 --- a/lib/kofficecore/koffice_export.h +++ b/lib/kofficecore/koffice_export.h @@ -159,11 +159,7 @@ #define EXAMPLE_EXPORT TDE_EXPORT #else // not windows -#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,90) #define KOFFICE_EXPORT TDE_EXPORT -#else -#define KOFFICE_EXPORT -#endif /* kdemacros is OK, we can use gcc visibility macros */ #define KOFFICECORE_EXPORT KOFFICE_EXPORT diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp index 0ae290832..d46d97429 100644 --- a/lib/kofficeui/KoEditPath.cpp +++ b/lib/kofficeui/KoEditPath.cpp @@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include <tdeversion.h> #include <tdelocale.h> #include <tqlayout.h> #include <tqpushbutton.h> diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index 8fecab48c..719d0310f 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -27,7 +27,6 @@ #include "KoTemplateChooseDia.h" #include <tdelocale.h> -#include <tdeversion.h> #include <tdefiledialog.h> #include <tdeinstance.h> #include <KoFilterManager.h> diff --git a/lib/kofficeui/ttdetoolbarbutton.cpp b/lib/kofficeui/ttdetoolbarbutton.cpp index 16b36d35e..9a568aeaa 100644 --- a/lib/kofficeui/ttdetoolbarbutton.cpp +++ b/lib/kofficeui/ttdetoolbarbutton.cpp @@ -27,7 +27,6 @@ #include <tqdrawutil.h> #include <tqstyle.h> -#include <tdeversion.h> #include <tdeapplication.h> #include <kiconeffect.h> #include <kiconloader.h> diff --git a/lib/kopalette/kopalette.cpp b/lib/kopalette/kopalette.cpp index 4c69aa59b..1c51680a5 100644 --- a/lib/kopalette/kopalette.cpp +++ b/lib/kopalette/kopalette.cpp @@ -43,9 +43,7 @@ KoPalette::KoPalette(TQWidget * parent, const char * name) : TQDockWindow(parent, name) { -#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,90) TDEAcceleratorManager::setNoAccel(this); -#endif setCloseMode( TQDockWindow::Never); setResizeEnabled(true); setOpaqueMoving(true); diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index eb1cfb04f..633a9abd1 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -41,7 +41,6 @@ #include <kdebug.h> #include <kiconloader.h> #include <tdelocale.h> -#include <tdeversion.h> #include <tdeapplication.h> namespace KoProperty { diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp index e9f48db7e..b35284bce 100644 --- a/lib/koproperty/editors/fontedit.cpp +++ b/lib/koproperty/editors/fontedit.cpp @@ -31,7 +31,6 @@ #include <tqlabel.h> #include <tqtooltip.h> -#include <tdeversion.h> #include <tdefontrequester.h> #include <tdeaccelmanager.h> #include <tdelocale.h> @@ -51,10 +50,8 @@ class FontEditRequester : public TDEFontRequester label()->setMinimumWidth(0); label()->setFrameShape(TQFrame::Box); label()->setIndent(-1); -#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) label()->setFocusPolicy(TQWidget::ClickFocus); TDEAcceleratorManager::setNoAccel(label()); -#endif layout()->remove(label()); layout()->remove(button());//->reparent(this, 0, TQPoint(0,0)); delete layout(); diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp index d11880665..db8456ff3 100644 --- a/lib/kotext/KoAutoFormat.cpp +++ b/lib/kotext/KoAutoFormat.cpp @@ -28,7 +28,6 @@ #include <KoSearchDia.h> #include <KoGlobal.h> -#include <tdeversion.h> #include <kdebug.h> #include <tdelocale.h> #include <tdeinstance.h> diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp index 1be095954..0a860bdf0 100644 --- a/lib/kotext/KoBgSpellCheck.cpp +++ b/lib/kotext/KoBgSpellCheck.cpp @@ -40,7 +40,6 @@ using namespace KSpell2; #include <tdelocale.h> #include <kdebug.h> -#include <tdeversion.h> #include <tqtimer.h> #include <tqptrdict.h> @@ -228,7 +227,6 @@ void KoBgSpellCheck::slotParagraphModified( KoTextParag* parag, int /*ParagModif kdDebug(32500) << "Para modified " << parag << " pos = "<<pos<<", length = "<< length <<endl; #endif -#if TDE_VERSION > TDE_MAKE_VERSION(3,3,0) if ( length < 10 ) { TQString str = parag->string()->stringToSpellCheck(); /// ##### do we really need to create a Filter every time? @@ -252,15 +250,6 @@ void KoBgSpellCheck::slotParagraphModified( KoTextParag* parag, int /*ParagModif } if ( parag->hasChanged() ) // always true currently parag->document()->emitRepaintChanged(); -#else - if ( length < 3 ) { - TQString word; - int start; - bool misspelled = !d->backSpeller->checkWordInParagraph( parag, pos, - word, start ); - markWord( parag, start, word.length(), misspelled ); - parag->document()->emitRepaintChanged(); -#endif } else { d->backSpeller->check( parag ); diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index f9b6dc49c..455fd3010 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -38,7 +38,6 @@ #include <KoGlobal.h> #include <tqgroupbox.h> #include <knuminput.h> -#include <tdeversion.h> #include <kpushbutton.h> #include <kcombobox.h> diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp index 286d97aa6..4a7baccc7 100644 --- a/lib/kotext/KoRichText.cpp +++ b/lib/kotext/KoRichText.cpp @@ -44,7 +44,6 @@ #include "KoParagCounter.h" #include "KoTextDocument.h" #include <kdebug.h> -#include <tdeversion.h> #include <tdeglobal.h> #include <tdelocale.h> #include <private/tqtextengine_p.h> diff --git a/lib/kotext/KoTextDocument.cpp b/lib/kotext/KoTextDocument.cpp index bb72478cf..21fc8d134 100644 --- a/lib/kotext/KoTextDocument.cpp +++ b/lib/kotext/KoTextDocument.cpp @@ -30,7 +30,6 @@ #include <KoXmlNS.h> #include <KoDom.h> #include <kdebug.h> -#include <tdeversion.h> #include <tqapplication.h> #include <assert.h> diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index 06e74da58..9789c40b5 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -41,7 +41,6 @@ #include <tdeglobal.h> #include <kdialogbase.h> #include <tdeconfig.h> -#include <tdeversion.h> #include <tdeinstance.h> #include <kcalendarsystem.h> #include <tdeaboutdata.h> diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index eb698c65c..2d133f6a7 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -25,7 +25,6 @@ #include <tqtooltip.h> #include <tdeapplication.h> -#include <tdeversion.h> #include <tdefiledialog.h> #include <kiconloader.h> #include <tdelistview.h> diff --git a/lib/store/KoStore.cpp b/lib/store/KoStore.cpp index fa6e88d10..3ba8e6e1e 100644 --- a/lib/store/KoStore.cpp +++ b/lib/store/KoStore.cpp @@ -33,7 +33,6 @@ #include <kurl.h> #include <kdebug.h> -#include <tdeversion.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <tdeio/netaccess.h> diff --git a/lib/store/KoTarStore.cpp b/lib/store/KoTarStore.cpp index 160258d95..5627e7c7e 100644 --- a/lib/store/KoTarStore.cpp +++ b/lib/store/KoTarStore.cpp @@ -24,7 +24,6 @@ #include <ktar.h> #include <kdebug.h> #include <kurl.h> -#include <tdeversion.h> #include <tdeio/netaccess.h> KoTarStore::KoTarStore( const TQString & _filename, Mode _mode, const TQCString & appIdentification ) diff --git a/lib/store/KoZipStore.cpp b/lib/store/KoZipStore.cpp index 734f9135b..5bbe18379 100644 --- a/lib/store/KoZipStore.cpp +++ b/lib/store/KoZipStore.cpp @@ -23,7 +23,6 @@ #include <kzip.h> #include <kdebug.h> -#include <tdeversion.h> #include <kurl.h> #include <tdeio/netaccess.h> diff --git a/tools/thesaurus/main.cpp b/tools/thesaurus/main.cpp index 73de57eed..b1a913405 100644 --- a/tools/thesaurus/main.cpp +++ b/tools/thesaurus/main.cpp @@ -46,7 +46,6 @@ NOT TODO: #include <tqtoolbutton.h> #include <kiconloader.h> #include <tdefiledialog.h> -#include <tdeversion.h> /*************************************************** * |