Fix inadvertent tqt changes.

pull/1/head
Darrell Anderson 12 years ago
parent 800c08601d
commit c21c4a8f6e

@ -51,7 +51,7 @@
typedef void (*crypt_engine_deallocator_func)(KviCryptEngine *); typedef void (*crypt_engine_deallocator_func)(KviCryptEngine *);
#endif //COMPILE_CRYPT_SUPPORT #endif //COMPILE_CRYPT_SUPPORT
// we must include this declaration to make tqmoc happy even // we must include this declaration to make moc happy even
// if we're not compiling the crypt support // if we're not compiling the crypt support
class KVILIB_API KviCryptEngine : public TQObject, public KviHeapObject class KVILIB_API KviCryptEngine : public TQObject, public KviHeapObject

@ -30,7 +30,7 @@
// //
// This is the only reasonable CROSS-QT3-QT4-COMPATIBLE implementation // This is the only reasonable CROSS-QT3-QT4-COMPATIBLE implementation
// of TQListBox I've been able to find. // of TQListBox I've been able to find.
// Note that using macros for the items will NOT work since tqmoc // Note that using macros for the items will NOT work since moc
// doesn't expand them. Note also that KviTalListBoxText must // doesn't expand them. Note also that KviTalListBoxText must
// be fully reimplemented and not be inherited from TQListBoxText // be fully reimplemented and not be inherited from TQListBoxText
// to build up a consistent item object hierarchy. To complete // to build up a consistent item object hierarchy. To complete

@ -29,7 +29,7 @@
// //
// This is the only reasonable CROSS-QT3-QT4-COMPATIBLE implementation // This is the only reasonable CROSS-QT3-QT4-COMPATIBLE implementation
// of TQListView I've been able to find. // of TQListView I've been able to find.
// Note that using macros for the items will NOT work since tqmoc // Note that using macros for the items will NOT work since moc
// doesn't expand them. Note also that KviTalCheckListItem must // doesn't expand them. Note also that KviTalCheckListItem must
// be fully reimplemented and not be inherited from TQCheckListItem // be fully reimplemented and not be inherited from TQCheckListItem
// to build up a consistent item object hierarchy. To complete // to build up a consistent item object hierarchy. To complete

@ -33,7 +33,7 @@
class KviTalToolTip; class KviTalToolTip;
// This is useful only with TQt4, but we put it here anyway // This is useful only with TQt4, but we put it here anyway
// to have both a consistent API and make tqmoc happy // to have both a consistent API and make moc happy
class KviTalToolTipHelper : public TQObject class KviTalToolTipHelper : public TQObject
{ {
friend class KviTalToolTip; friend class KviTalToolTip;

@ -2065,7 +2065,7 @@ void KviApp::timerEvent(TQTimerEvent *e)
heartbeat(tNow); heartbeat(tNow);
} }
// qvariant.h uses this , and it is included by the qt generated tqmoc file for TQt >= 3.0.0 // qvariant.h uses this , and it is included by the qt generated moc file for TQt >= 3.0.0
#ifdef Bool #ifdef Bool
#undef Bool #undef Bool
#endif #endif

@ -30,7 +30,7 @@
#define COMPILE_CRYPT_SUPPORT #define COMPILE_CRYPT_SUPPORT
#endif // Q_MOC_RUN #endif // Q_MOC_RUN
// TQt4 tqmoc bails out on this ?????? // TQt4 moc bails out on this ??????
#if defined(COMPILE_CRYPT_SUPPORT) || defined(TQ_TQMOC_RUN) #if defined(COMPILE_CRYPT_SUPPORT) || defined(TQ_TQMOC_RUN)
#include <tqwidget.h> #include <tqwidget.h>

@ -56,7 +56,7 @@ class KVIRC_API KviIrcView : public TQWidget
Q_OBJECT Q_OBJECT
TQ_PROPERTY(int TransparencyCapable READ dummyRead) TQ_PROPERTY(int TransparencyCapable READ dummyRead)
// we cannot #ifdef due to a bug in tqmoc // we cannot #ifdef due to a bug in moc
TQ_PROPERTY(bool usePaintOnScreen READ getPaintOnScreen WRITE setPaintOnScreen) TQ_PROPERTY(bool usePaintOnScreen READ getPaintOnScreen WRITE setPaintOnScreen)
public: public:
friend class KviIrcViewToolTip; friend class KviIrcViewToolTip;
@ -70,7 +70,7 @@ public:
bool getPaintOnScreen() const { return testAttribute(TQt::WA_PaintOnScreen);}; bool getPaintOnScreen() const { return testAttribute(TQt::WA_PaintOnScreen);};
void setPaintOnScreen(bool bFlag){setAttribute(TQt::WA_PaintOnScreen,bFlag);} ; void setPaintOnScreen(bool bFlag){setAttribute(TQt::WA_PaintOnScreen,bFlag);} ;
#else #else
// hack to fix tqmoc bug on win qt4 // hack to fix moc bug on win qt4
bool getPaintOnScreen() const { return 0;}; bool getPaintOnScreen() const { return 0;};
void setPaintOnScreen(bool bFlag){} ; void setPaintOnScreen(bool bFlag){} ;
#endif #endif

@ -74,14 +74,14 @@ public:
// This is the basic interface that all the external classes should see // This is the basic interface that all the external classes should see
// //
// Please note that TQt3 tqmoc skips the *_SKIP_BEGIN -> *_SKIP_END blocks // Please note that TQt3 moc skips the *_SKIP_BEGIN -> *_SKIP_END blocks
// while the TQt4 tqmoc skips the TQ_TQMOC_RUN ifdef block.. so... // while the TQt4 moc skips the TQ_TQMOC_RUN ifdef block.. so...
// TQt4 version // TQt4 version
// If you get failures (undefined references) in some non-autotools based // If you get failures (undefined references) in some non-autotools based
// build system that uses TQt4 then you must add the -DCOMPILE_USE_QT4 // build system that uses TQt4 then you must add the -DCOMPILE_USE_QT4
// commandline parameter to tqmoc (at leat) when parsing this file. // commandline parameter to moc (at leat) when parsing this file.
// TQMOC_SKIP_BEGIN // TQMOC_SKIP_BEGIN
#ifdef COMPILE_USE_QT4 #ifdef COMPILE_USE_QT4

@ -488,7 +488,7 @@ const TQString & KviWindow::lastMessageText()
return KviTQString::empty; return KviTQString::empty;
} }
// The following three have to be here even if the crypt support is disabled...tqmoc does not support conditional compilations // The following three have to be here even if the crypt support is disabled...moc does not support conditional compilations
void KviWindow::toggleCryptController() void KviWindow::toggleCryptController()
{ {
#ifdef COMPILE_CRYPT_SUPPORT #ifdef COMPILE_CRYPT_SUPPORT

@ -309,7 +309,7 @@ public slots:
void reloadImages(); void reloadImages();
protected slots: protected slots:
void savePropertiesAsDefault(); void savePropertiesAsDefault();
void toggleCryptController(); // This has to be here even if the crypt support is enabled...tqmoc does not support conditionals void toggleCryptController(); // This has to be here even if the crypt support is enabled...moc does not support conditionals
void cryptControllerFinished(); // same as above void cryptControllerFinished(); // same as above
void cryptSessionInfoDestroyed(); // same as above void cryptSessionInfoDestroyed(); // same as above
void textEncodingButtonClicked(); void textEncodingButtonClicked();

Loading…
Cancel
Save