TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KDE_MAKE_VERSION and update TDE version string

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 039393e199
commit 4163a7bc76
14 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File

2
chalk/ui/kis_paintop_box.cc
Unescape View File

@ -47,7 +47,7 @@ KisPaintopBox::KisPaintopBox (KisView * view, TQWidget *parent, const char * nam
: super (parent, name), : super (parent, name),
m_canvasController(view->getCanvasController()) 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); KAcceleratorManager::setNoAccel(this);
#endif #endif

4
kexi/formeditor/commands.cpp
Unescape View File

@ -744,7 +744,7 @@ InsertWidgetCommand::execute()
kdWarning() << "InsertWidgetCommand::execute() ERROR: widget creation failed" << endl; kdWarning() << "InsertWidgetCommand::execute() ERROR: widget creation failed" << endl;
return; 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 //! @todo allow setting this for data view mode as well
if (m_form->designMode()) { if (m_form->designMode()) {
//don't generate accelerators for widgets in design mode //don't generate accelerators for widgets in design mode
@ -897,7 +897,7 @@ CreateLayoutCommand::execute()
m_name = m_form->objectTree()->generateUniqueName(classname); m_name = m_form->objectTree()->generateUniqueName(classname);
TQWidget *w = lib->createWidget(classname, container->widget(), m_name.latin1(), container); 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 //! @todo allow setting this for data view mode as well
if (w) { if (w) {
if (m_form->designMode()) { if (m_form->designMode()) {

8
kexi/formeditor/factories/containerfactory.cpp
Unescape View File

@ -56,7 +56,7 @@
#include "widgetlibrary.h" #include "widgetlibrary.h"
#include <formeditor/utils.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 # define KInputDialog TQInputDialog
# include <tqinputdialog.h> # include <tqinputdialog.h>
# include <tqlineedit.h> # include <tqlineedit.h>
@ -367,7 +367,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wTabWidget = new KFormDesigner::WidgetInfo(this); KFormDesigner::WidgetInfo *wTabWidget = new KFormDesigner::WidgetInfo(this);
wTabWidget->setPixmap("tabwidget"); wTabWidget->setPixmap("tabwidget");
wTabWidget->setClassName("KFDTabWidget"); 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("KTabWidget");
wTabWidget->addAlternateClassName(TQTABWIDGET_OBJECT_NAME_STRING); wTabWidget->addAlternateClassName(TQTABWIDGET_OBJECT_NAME_STRING);
//tmp: wTabWidget->setSavingName(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") else if(c == "KFDTabWidget")
{ {
KFDTabWidget *tab = new KFDTabWidget(p, n); 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); tab->setTabReorderingEnabled(true);
connect(tab, TQT_SIGNAL(movedTab(int,int)), this, TQT_SLOT(reorderTabs(int,int))); connect(tab, TQT_SIGNAL(movedTab(int,int)), this, TQT_SLOT(reorderTabs(int,int)));
#endif #endif
@ -857,7 +857,7 @@ void ContainerFactory::renameTabPage()
bool ok; bool ok;
TQString name = KInputDialog::getText(i18n("New Page Title"), i18n("Enter a new title for the current page:"), 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, TQLineEdit::Normal,
#endif #endif
tab->tabLabel(w), &ok, w->topLevelWidget()); tab->tabLabel(w), &ok, w->topLevelWidget());

8
kexi/formeditor/factories/stdwidgetfactory.cpp
Unescape View File

@ -35,7 +35,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <tdeversion.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> # include <tqdatetimeedit.h>
# define KTimeWidget TQTimeEdit # define KTimeWidget TQTimeEdit
# define KDateWidget TQDateEdit # define KDateWidget TQDateEdit
@ -280,7 +280,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wDate = new KFormDesigner::WidgetInfo(this); KFormDesigner::WidgetInfo *wDate = new KFormDesigner::WidgetInfo(this);
wDate->setPixmap("dateedit"); wDate->setPixmap("dateedit");
wDate->setClassName("KDateWidget"); 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->addAlternateClassName(TQDATEEDIT_OBJECT_NAME_STRING);
wDate->setIncludeFileName("kdatewidget.h"); wDate->setIncludeFileName("kdatewidget.h");
#endif #endif
@ -293,7 +293,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wTime = new KFormDesigner::WidgetInfo(this); KFormDesigner::WidgetInfo *wTime = new KFormDesigner::WidgetInfo(this);
wTime->setPixmap("timeedit"); wTime->setPixmap("timeedit");
wTime->setClassName("KTimeWidget"); 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->addAlternateClassName(TQTIMEEDIT_OBJECT_NAME_STRING);
wTime->setIncludeFileName("ktimewidget.h"); wTime->setIncludeFileName("ktimewidget.h");
#endif #endif
@ -306,7 +306,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wDateTime = new KFormDesigner::WidgetInfo(this); KFormDesigner::WidgetInfo *wDateTime = new KFormDesigner::WidgetInfo(this);
wDateTime->setPixmap("datetimeedit"); wDateTime->setPixmap("datetimeedit");
wDateTime->setClassName("KDateTimeWidget"); 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->addAlternateClassName(TQDATETIMEEDIT_OBJECT_NAME_STRING);
wDateTime->setIncludeFileName("kdatetimewidget.h"); wDateTime->setIncludeFileName("kdatetimewidget.h");
#endif #endif

2
kexi/formeditor/formIO.cpp
Unescape View File

@ -1197,7 +1197,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
if(!w) if(!w)
return; 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 //! @todo allow setting this for data view mode as well
if (m_currentForm->designMode()) { if (m_currentForm->designMode()) {
//don't generate accelerators for widgets in design mode //don't generate accelerators for widgets in design mode

2
kexi/formeditor/formmanager.cpp
Unescape View File

@ -51,7 +51,7 @@
#include <kfontdialog.h> #include <kfontdialog.h>
#include <tdeversion.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> # include <kactioncollection.h>
#endif #endif

2
kexi/main/keximainwindowimpl_p.h
Unescape View File

@ -290,7 +290,7 @@ void updatePropEditorDockWidthInfo() {
// ds->setKeepSize(true); // ds->setKeepSize(true);
config->setGroup("MainWindow"); 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()) if (wasAutoOpen) //(dw2->isVisible())
// ds->setSeparatorPosInPercent( 100 * nav->width() / wnd->width() ); // ds->setSeparatorPosInPercent( 100 * nav->width() / wnd->width() );

6
kexi/main/kexistatusbar.cpp
Unescape View File

@ -80,7 +80,7 @@ void KexitStatusBar::activePartChanged(KParts::Part *part)
connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ), connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ),
this, TQT_SLOT( setStatus( 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); changeItem(m_map[ m_activePart ], m_msgID);
// m_status->setText( m_map[ m_activePart ] ); // m_status->setText( m_map[ m_activePart ] );
# endif # endif
@ -116,8 +116,8 @@ void KexitStatusBar::setStatus(const TQString &str)
// m_status->setText(str); // m_status->setText(str);
changeItem(str, m_msgID); changeItem(str, m_msgID);
#if defined(KDE_MAKE_VERSION) #if defined(TDE_MAKE_VERSION)
# if TDE_VERSION < KDE_MAKE_VERSION(3,1,90) # if TDE_VERSION < TDE_MAKE_VERSION(3,1,90)
m_map[m_activePart] = str; m_map[m_activePart] = str;
# endif # endif
#endif #endif

4
kexi/main/kexistatusbar.h
Unescape View File

@ -67,8 +67,8 @@ class KexitStatusBar : public KStatusBar
KParts::Part *m_activePart; KParts::Part *m_activePart;
// still hoping for a fix for KDE-3.1 // still hoping for a fix for KDE-3.1
#if defined(KDE_MAKE_VERSION) #if defined(TDE_MAKE_VERSION)
# if TDE_VERSION < KDE_MAKE_VERSION(3,1,90) # if TDE_VERSION < TDE_MAKE_VERSION(3,1,90)
TQMap<KParts::Part*, TQString> m_map; TQMap<KParts::Part*, TQString> m_map;
# endif # endif
#endif #endif

6
kexi/plugins/forms/kexidbfactory.cpp
Unescape View File

@ -210,7 +210,7 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL
#endif #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"); KexiDataAwareWidgetInfo *wDate = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KDateWidget");
#else #else
KexiDataAwareWidgetInfo *wDate = new KexiDataAwareWidgetInfo(this, "stdwidgets", TQDATEEDIT_OBJECT_NAME_STRING); 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")); wDate->setDescription(i18n("A widget to input and display a date"));
addClass(wDate); 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"); KexiDataAwareWidgetInfo *wTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KTimeWidget");
#else #else
KexiDataAwareWidgetInfo *wTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", TQTIMEEDIT_OBJECT_NAME_STRING); 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")); wTime->setDescription(i18n("A widget to input and display a time"));
addClass(wTime); 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"); KexiDataAwareWidgetInfo *wDateTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KDateTimeWidget");
#else #else
KexiDataAwareWidgetInfo *wDateTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KDateTimeWidget"); KexiDataAwareWidgetInfo *wDateTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KDateTimeWidget");

2
lib/kofficecore/koffice_export.h
Unescape View File

@ -159,7 +159,7 @@
#define EXAMPLE_EXPORT KDE_EXPORT #define EXAMPLE_EXPORT KDE_EXPORT
#else // not windows #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 #define KOFFICE_EXPORT KDE_EXPORT
#else #else
#define KOFFICE_EXPORT #define KOFFICE_EXPORT

2
lib/kopalette/kopalette.cc
Unescape View File

@ -43,7 +43,7 @@ KoPalette::KoPalette(TQWidget * parent, const char * name)
: TQDockWindow(parent, 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); KAcceleratorManager::setNoAccel(this);
#endif #endif
setCloseMode( TQDockWindow::Never); setCloseMode( TQDockWindow::Never);

2
lib/koproperty/editors/fontedit.cpp
Unescape View File

@ -51,7 +51,7 @@ class FontEditRequester : public KFontRequester
label()->setMinimumWidth(0); label()->setMinimumWidth(0);
label()->setFrameShape(TQFrame::Box); label()->setFrameShape(TQFrame::Box);
label()->setIndent(-1); 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); label()->setFocusPolicy(TQ_ClickFocus);
KAcceleratorManager::setNoAccel(label()); KAcceleratorManager::setNoAccel(label());
#endif #endif

2
lib/kotext/KoBgSpellCheck.cpp
Unescape View File

@ -228,7 +228,7 @@ void KoBgSpellCheck::slotParagraphModified( KoTextParag* parag, int /*ParagModif
kdDebug(32500) << "Para modified " << parag << " pos = "<<pos<<", length = "<< length <<endl; kdDebug(32500) << "Para modified " << parag << " pos = "<<pos<<", length = "<< length <<endl;
#endif #endif
#if TDE_VERSION > KDE_MAKE_VERSION(3,3,0) #if TDE_VERSION > TDE_MAKE_VERSION(3,3,0)
if ( length < 10 ) { if ( length < 10 ) {
TQString str = parag->string()->stringToSpellCheck(); TQString str = parag->string()->stringToSpellCheck();
/// ##### do we really need to create a Filter every time? /// ##### do we really need to create a Filter every time?

Write Preview
Loading…
Cancel
Save