summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chalk/ui/kis_paintop_box.cc2
-rw-r--r--kexi/formeditor/commands.cpp4
-rw-r--r--kexi/formeditor/factories/containerfactory.cpp8
-rw-r--r--kexi/formeditor/factories/stdwidgetfactory.cpp8
-rw-r--r--kexi/formeditor/formIO.cpp2
-rw-r--r--kexi/formeditor/formmanager.cpp2
-rw-r--r--kexi/main/keximainwindowimpl_p.h2
-rw-r--r--kexi/main/kexistatusbar.cpp6
-rw-r--r--kexi/main/kexistatusbar.h4
-rw-r--r--kexi/plugins/forms/kexidbfactory.cpp6
-rw-r--r--lib/kofficecore/koffice_export.h2
-rw-r--r--lib/kopalette/kopalette.cc2
-rw-r--r--lib/koproperty/editors/fontedit.cpp2
-rw-r--r--lib/kotext/KoBgSpellCheck.cpp2
14 files changed, 26 insertions, 26 deletions
diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc
index 30c2c8e9..95a99bd5 100644
--- a/chalk/ui/kis_paintop_box.cc
+++ b/chalk/ui/kis_paintop_box.cc
@@ -47,7 +47,7 @@ KisPaintopBox::KisPaintopBox (KisView * view, TQWidget *parent, const char * nam
: super (parent, name),
m_canvasController(view->getCanvasController())
{
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,3,90)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,90)
KAcceleratorManager::setNoAccel(this);
#endif
diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index 1d782a20..929624ab 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -744,7 +744,7 @@ InsertWidgetCommand::execute()
kdWarning() << "InsertWidgetCommand::execute() ERROR: widget creation failed" << endl;
return;
}
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
+#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
@@ -897,7 +897,7 @@ CreateLayoutCommand::execute()
m_name = m_form->objectTree()->generateUniqueName(classname);
TQWidget *w = lib->createWidget(classname, container->widget(), m_name.latin1(), container);
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
+#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()) {
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index e87c300e..81360927 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -56,7 +56,7 @@
#include "widgetlibrary.h"
#include <formeditor/utils.h>
-#if TDE_VERSION < KDE_MAKE_VERSION(3,1,9)
+#if TDE_VERSION < TDE_MAKE_VERSION(3,1,9)
# define KInputDialog TQInputDialog
# include <tqinputdialog.h>
# include <tqlineedit.h>
@@ -367,7 +367,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wTabWidget = new KFormDesigner::WidgetInfo(this);
wTabWidget->setPixmap("tabwidget");
wTabWidget->setClassName("KFDTabWidget");
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,9)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
wTabWidget->addAlternateClassName("KTabWidget");
wTabWidget->addAlternateClassName(TQTABWIDGET_OBJECT_NAME_STRING);
//tmp: wTabWidget->setSavingName(TQTABWIDGET_OBJECT_NAME_STRING);
@@ -518,7 +518,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 >= KDE_MAKE_VERSION(3,1,9)
+#if defined(USE_KTabWidget) && TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
tab->setTabReorderingEnabled(true);
connect(tab, TQT_SIGNAL(movedTab(int,int)), this, TQT_SLOT(reorderTabs(int,int)));
#endif
@@ -857,7 +857,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 < KDE_MAKE_VERSION(3,1,9)
+#if TDE_VERSION < TDE_MAKE_VERSION(3,1,9)
TQLineEdit::Normal,
#endif
tab->tabLabel(w), &ok, w->topLevelWidget());
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index e6b13f0e..be97d921 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -35,7 +35,7 @@
#include <kdebug.h>
#include <tdeversion.h>
-#if TDE_VERSION < KDE_MAKE_VERSION(3,1,9)
+#if TDE_VERSION < TDE_MAKE_VERSION(3,1,9)
# include <tqdatetimeedit.h>
# define KTimeWidget TQTimeEdit
# define KDateWidget TQDateEdit
@@ -280,7 +280,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wDate = new KFormDesigner::WidgetInfo(this);
wDate->setPixmap("dateedit");
wDate->setClassName("KDateWidget");
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,9)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
wDate->addAlternateClassName(TQDATEEDIT_OBJECT_NAME_STRING);
wDate->setIncludeFileName("kdatewidget.h");
#endif
@@ -293,7 +293,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wTime = new KFormDesigner::WidgetInfo(this);
wTime->setPixmap("timeedit");
wTime->setClassName("KTimeWidget");
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,9)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
wTime->addAlternateClassName(TQTIMEEDIT_OBJECT_NAME_STRING);
wTime->setIncludeFileName("ktimewidget.h");
#endif
@@ -306,7 +306,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wDateTime = new KFormDesigner::WidgetInfo(this);
wDateTime->setPixmap("datetimeedit");
wDateTime->setClassName("KDateTimeWidget");
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,9)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
wDateTime->addAlternateClassName(TQDATETIMEEDIT_OBJECT_NAME_STRING);
wDateTime->setIncludeFileName("kdatetimewidget.h");
#endif
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index bf3b9d08..5fafc6ec 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -1197,7 +1197,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
if(!w)
return;
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
+#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
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index b212f00e..87adfb20 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -51,7 +51,7 @@
#include <kfontdialog.h>
#include <tdeversion.h>
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,9) && !defined(TQ_WS_WIN)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) && !defined(TQ_WS_WIN)
# include <kactioncollection.h>
#endif
diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h
index b3d60b89..d95107c0 100644
--- a/kexi/main/keximainwindowimpl_p.h
+++ b/kexi/main/keximainwindowimpl_p.h
@@ -290,7 +290,7 @@ void updatePropEditorDockWidthInfo() {
// ds->setKeepSize(true);
config->setGroup("MainWindow");
-# if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
+# if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
if (wasAutoOpen) //(dw2->isVisible())
// ds->setSeparatorPosInPercent( 100 * nav->width() / wnd->width() );
diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp
index 02778208..2245f23c 100644
--- a/kexi/main/kexistatusbar.cpp
+++ b/kexi/main/kexistatusbar.cpp
@@ -80,7 +80,7 @@ void KexitStatusBar::activePartChanged(KParts::Part *part)
connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ),
this, TQT_SLOT( setStatus( const TQString & ) ) );
-# if TDE_VERSION < KDE_MAKE_VERSION(3,1,90)
+# if TDE_VERSION < TDE_MAKE_VERSION(3,1,90)
changeItem(m_map[ m_activePart ], m_msgID);
// m_status->setText( m_map[ m_activePart ] );
# endif
@@ -116,8 +116,8 @@ void KexitStatusBar::setStatus(const TQString &str)
// m_status->setText(str);
changeItem(str, m_msgID);
-#if defined(KDE_MAKE_VERSION)
-# if TDE_VERSION < KDE_MAKE_VERSION(3,1,90)
+#if defined(TDE_MAKE_VERSION)
+# if TDE_VERSION < TDE_MAKE_VERSION(3,1,90)
m_map[m_activePart] = str;
# endif
#endif
diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h
index 0d20e0a8..6f415af3 100644
--- a/kexi/main/kexistatusbar.h
+++ b/kexi/main/kexistatusbar.h
@@ -67,8 +67,8 @@ class KexitStatusBar : public KStatusBar
KParts::Part *m_activePart;
// still hoping for a fix for KDE-3.1
-#if defined(KDE_MAKE_VERSION)
-# if TDE_VERSION < KDE_MAKE_VERSION(3,1,90)
+#if defined(TDE_MAKE_VERSION)
+# if TDE_VERSION < TDE_MAKE_VERSION(3,1,90)
TQMap<KParts::Part*, TQString> m_map;
# endif
#endif
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index c46b04de..bfc70226 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -210,7 +210,7 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL
#endif
/*
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,9)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
KexiDataAwareWidgetInfo *wDate = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KDateWidget");
#else
KexiDataAwareWidgetInfo *wDate = new KexiDataAwareWidgetInfo(this, "stdwidgets", TQDATEEDIT_OBJECT_NAME_STRING);
@@ -225,7 +225,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 >= KDE_MAKE_VERSION(3,1,9)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
KexiDataAwareWidgetInfo *wTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KTimeWidget");
#else
KexiDataAwareWidgetInfo *wTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", TQTIMEEDIT_OBJECT_NAME_STRING);
@@ -240,7 +240,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 >= KDE_MAKE_VERSION(3,1,9)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
KexiDataAwareWidgetInfo *wDateTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KDateTimeWidget");
#else
KexiDataAwareWidgetInfo *wDateTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KDateTimeWidget");
diff --git a/lib/kofficecore/koffice_export.h b/lib/kofficecore/koffice_export.h
index cb54dbea..0f91de95 100644
--- a/lib/kofficecore/koffice_export.h
+++ b/lib/kofficecore/koffice_export.h
@@ -159,7 +159,7 @@
#define EXAMPLE_EXPORT KDE_EXPORT
#else // not windows
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,3,90)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,90)
#define KOFFICE_EXPORT KDE_EXPORT
#else
#define KOFFICE_EXPORT
diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc
index dd247877..751074b7 100644
--- a/lib/kopalette/kopalette.cc
+++ b/lib/kopalette/kopalette.cc
@@ -43,7 +43,7 @@ KoPalette::KoPalette(TQWidget * parent, const char * name)
: TQDockWindow(parent, name)
{
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,3,90)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,90)
KAcceleratorManager::setNoAccel(this);
#endif
setCloseMode( TQDockWindow::Never);
diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp
index a4f4b519..589e0a3b 100644
--- a/lib/koproperty/editors/fontedit.cpp
+++ b/lib/koproperty/editors/fontedit.cpp
@@ -51,7 +51,7 @@ class FontEditRequester : public KFontRequester
label()->setMinimumWidth(0);
label()->setFrameShape(TQFrame::Box);
label()->setIndent(-1);
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
label()->setFocusPolicy(TQ_ClickFocus);
KAcceleratorManager::setNoAccel(label());
#endif
diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp
index 612f0be7..604a6237 100644
--- a/lib/kotext/KoBgSpellCheck.cpp
+++ b/lib/kotext/KoBgSpellCheck.cpp
@@ -228,7 +228,7 @@ void KoBgSpellCheck::slotParagraphModified( KoTextParag* parag, int /*ParagModif
kdDebug(32500) << "Para modified " << parag << " pos = "<<pos<<", length = "<< length <<endl;
#endif
-#if TDE_VERSION > KDE_MAKE_VERSION(3,3,0)
+#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?
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 22:43:53 +0000