summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-10-21 13:01:09 -0500
committerSlávek Banko <slavek.banko@axis.cz>2013-01-01 03:30:28 +0100
commiteccf1d3f974061867ee67cde7912b7924f5b3f2d (patch)
tree3ae1c18d04a380775ba8bf6f103f7a1ffe9528cb
parent70295dc654be3ff3ea56eba02d855d4e2c4c0f31 (diff)
downloadkvirc-eccf1d3f974061867ee67cde7912b7924f5b3f2d.tar.gz
kvirc-eccf1d3f974061867ee67cde7912b7924f5b3f2d.zip
Fix inadvertent tqt changes.
(cherry picked from commit c21c4a8f6edc6078e46f4beb2368129899c6cfe8)
-rw-r--r--src/kvilib/ext/kvi_crypt.h2
-rw-r--r--src/kvilib/tal/kvi_tal_listbox.h2
-rw-r--r--src/kvilib/tal/kvi_tal_listview.h2
-rw-r--r--src/kvilib/tal/kvi_tal_tooltip.h2
-rw-r--r--src/kvirc/kernel/kvi_app.cpp2
-rw-r--r--src/kvirc/ui/kvi_cryptcontroller.h2
-rw-r--r--src/kvirc/ui/kvi_ircview.h4
-rw-r--r--src/kvirc/ui/kvi_taskbar.h6
-rw-r--r--src/kvirc/ui/kvi_window.cpp2
-rw-r--r--src/kvirc/ui/kvi_window.h2
10 files changed, 13 insertions, 13 deletions
diff --git a/src/kvilib/ext/kvi_crypt.h b/src/kvilib/ext/kvi_crypt.h
index 8b36d0be..257c0b91 100644
--- a/src/kvilib/ext/kvi_crypt.h
+++ b/src/kvilib/ext/kvi_crypt.h
@@ -51,7 +51,7 @@
typedef void (*crypt_engine_deallocator_func)(KviCryptEngine *);
#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
class KVILIB_API KviCryptEngine : public TQObject, public KviHeapObject
diff --git a/src/kvilib/tal/kvi_tal_listbox.h b/src/kvilib/tal/kvi_tal_listbox.h
index 4cddaeac..f7c53560 100644
--- a/src/kvilib/tal/kvi_tal_listbox.h
+++ b/src/kvilib/tal/kvi_tal_listbox.h
@@ -30,7 +30,7 @@
//
// This is the only reasonable CROSS-QT3-QT4-COMPATIBLE implementation
// 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
// be fully reimplemented and not be inherited from TQListBoxText
// to build up a consistent item object hierarchy. To complete
diff --git a/src/kvilib/tal/kvi_tal_listview.h b/src/kvilib/tal/kvi_tal_listview.h
index 0bf48740..9e1b46fa 100644
--- a/src/kvilib/tal/kvi_tal_listview.h
+++ b/src/kvilib/tal/kvi_tal_listview.h
@@ -29,7 +29,7 @@
//
// This is the only reasonable CROSS-QT3-QT4-COMPATIBLE implementation
// 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
// be fully reimplemented and not be inherited from TQCheckListItem
// to build up a consistent item object hierarchy. To complete
diff --git a/src/kvilib/tal/kvi_tal_tooltip.h b/src/kvilib/tal/kvi_tal_tooltip.h
index 3c5cfb2a..97d2c344 100644
--- a/src/kvilib/tal/kvi_tal_tooltip.h
+++ b/src/kvilib/tal/kvi_tal_tooltip.h
@@ -33,7 +33,7 @@
class KviTalToolTip;
// 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
{
friend class KviTalToolTip;
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 66b65cf0..dd1d2110 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -2065,7 +2065,7 @@ void KviApp::timerEvent(TQTimerEvent *e)
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
#undef Bool
#endif
diff --git a/src/kvirc/ui/kvi_cryptcontroller.h b/src/kvirc/ui/kvi_cryptcontroller.h
index 0be14a2d..18574f8c 100644
--- a/src/kvirc/ui/kvi_cryptcontroller.h
+++ b/src/kvirc/ui/kvi_cryptcontroller.h
@@ -30,7 +30,7 @@
#define COMPILE_CRYPT_SUPPORT
#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)
#include <tqwidget.h>
diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h
index 84b485ff..4d435430 100644
--- a/src/kvirc/ui/kvi_ircview.h
+++ b/src/kvirc/ui/kvi_ircview.h
@@ -56,7 +56,7 @@ class KVIRC_API KviIrcView : public TQWidget
Q_OBJECT
TQ_OBJECT
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)
public:
friend class KviIrcViewToolTip;
@@ -70,7 +70,7 @@ public:
bool getPaintOnScreen() const { return testAttribute(TQt::WA_PaintOnScreen);};
void setPaintOnScreen(bool bFlag){setAttribute(TQt::WA_PaintOnScreen,bFlag);} ;
#else
- // hack to fix tqmoc bug on win qt4
+ // hack to fix moc bug on win qt4
bool getPaintOnScreen() const { return 0;};
void setPaintOnScreen(bool bFlag){} ;
#endif
diff --git a/src/kvirc/ui/kvi_taskbar.h b/src/kvirc/ui/kvi_taskbar.h
index 6c5794ca..f760af84 100644
--- a/src/kvirc/ui/kvi_taskbar.h
+++ b/src/kvirc/ui/kvi_taskbar.h
@@ -74,14 +74,14 @@ public:
// This is the basic interface that all the external classes should see
//
-// Please note that TQt3 tqmoc skips the *_SKIP_BEGIN -> *_SKIP_END blocks
-// while the TQt4 tqmoc skips the TQ_TQMOC_RUN ifdef block.. so...
+// Please note that TQt3 moc skips the *_SKIP_BEGIN -> *_SKIP_END blocks
+// while the TQt4 moc skips the TQ_TQMOC_RUN ifdef block.. so...
// TQt4 version
// If you get failures (undefined references) in some non-autotools based
// 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
#ifdef COMPILE_USE_QT4
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 08882035..c8e9c4ba 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -488,7 +488,7 @@ const TQString & KviWindow::lastMessageText()
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()
{
#ifdef COMPILE_CRYPT_SUPPORT
diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h
index e4c1373f..b03789c5 100644
--- a/src/kvirc/ui/kvi_window.h
+++ b/src/kvirc/ui/kvi_window.h
@@ -309,7 +309,7 @@ public slots:
void reloadImages();
protected slots:
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 cryptSessionInfoDestroyed(); // same as above
void textEncodingButtonClicked();