summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-26 20:07:39 -0600
committerTimothy Pearson <[email protected]>2011-12-26 20:07:39 -0600
commit4163a7bc764c85387ab50a0a9042401aac430547 (patch)
treec2ede39f3fbc7e64aa67e9823aa37182289e22c3 /lib
parent039393e199a49b5158929668908f9cb1fe226484 (diff)
downloadkoffice-4163a7bc764c85387ab50a0a9042401aac430547.tar.gz
koffice-4163a7bc764c85387ab50a0a9042401aac430547.zip
Rename KDE_MAKE_VERSION and update TDE version string
Diffstat (limited to 'lib')
-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
4 files changed, 4 insertions, 4 deletions
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?