summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
m---------admin0
-rw-r--r--kommander/editor/command.h12
-rw-r--r--kommander/editor/formwindow.h5
-rw-r--r--kommander/editor/listvieweditorimpl.h3
-rw-r--r--kommander/editor/mainwindow.h5
-rw-r--r--kommander/editor/metadatabase.h3
-rw-r--r--kommander/editor/orderindicator.cpp2
-rw-r--r--kommander/editor/pixmapchooser.cpp2
-rw-r--r--kommander/editor/propertyeditor.cpp2
-rw-r--r--kommander/editor/sizehandle.cpp2
-rw-r--r--kommander/editor/styledbutton.cpp2
-rw-r--r--kommander/editor/widgetfactory.cpp2
-rw-r--r--kommander/editor/workspace.cpp2
-rw-r--r--kommander/factory/kommanderfactory.h3
14 files changed, 7 insertions, 38 deletions
diff --git a/admin b/admin
-Subproject 585c17a2dda766ac4d442c4b9f998e18cb1b2d9
+Subproject fea885d44c272f7d7ccb64c68f6f6730e3ce78d
diff --git a/kommander/editor/command.h b/kommander/editor/command.h
index 615a0348..f9e743a2 100644
--- a/kommander/editor/command.h
+++ b/kommander/editor/command.h
@@ -659,9 +659,6 @@ public:
{
TQString text;
TQPixmap pix;
-#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
- bool operator==( const Item & ) const { return false; }
-#endif
};
PopulateListBoxCommand( const TQString &n, FormWindow *fw,
@@ -685,9 +682,6 @@ public:
{
TQString text;
TQPixmap pix;
-#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
- bool operator==( const Item & ) const { return false; }
-#endif
};
PopulateIconViewCommand( const TQString &n, FormWindow *fw,
@@ -745,9 +739,6 @@ public:
{
TQString text;
TQPixmap pix;
-#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
- bool operator==( const Row& ) const { return false; }
-#endif
};
struct Column
@@ -755,9 +746,6 @@ public:
TQString text;
TQPixmap pix;
TQString field;
-#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
- bool operator==( const Column& ) const { return false; }
-#endif
};
PopulateTableCommand( const TQString &n, FormWindow *fw, TQTable *t,
diff --git a/kommander/editor/formwindow.h b/kommander/editor/formwindow.h
index 57f17d5b..c55617f0 100644
--- a/kommander/editor/formwindow.h
+++ b/kommander/editor/formwindow.h
@@ -48,12 +48,7 @@ class BreakLayoutCommand;
class TQPixmap;
class TQSizeGrip;
class FormFile;
-
-#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
-#include "orderindicator.h"
-#else
class OrderIndicator;
-#endif
class FormWindow : public TQWidget
{
diff --git a/kommander/editor/listvieweditorimpl.h b/kommander/editor/listvieweditorimpl.h
index f870c08b..86832ab4 100644
--- a/kommander/editor/listvieweditorimpl.h
+++ b/kommander/editor/listvieweditorimpl.h
@@ -71,9 +71,6 @@ private:
TQString text;
TQPixmap pixmap;
bool clickable, resizable;
-#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
- bool operator==( const Column& ) const { return false; }
-#endif
};
private:
diff --git a/kommander/editor/mainwindow.h b/kommander/editor/mainwindow.h
index 2269fd3a..bbb3cec9 100644
--- a/kommander/editor/mainwindow.h
+++ b/kommander/editor/mainwindow.h
@@ -52,12 +52,7 @@ class TQWorkspace;
class MessageLog;
class ReplaceDialog;
class Workspace;
-
-#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
-#include <tqtoolbar.h>
-#else
class TQToolBar;
-#endif
class Preferences;
namespace KParts {
diff --git a/kommander/editor/metadatabase.h b/kommander/editor/metadatabase.h
index b2d8fd49..f4455ba8 100644
--- a/kommander/editor/metadatabase.h
+++ b/kommander/editor/metadatabase.h
@@ -125,9 +125,6 @@ public:
{
TQString name;
TQStringList args;
-#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
- bool operator==( const EventDescription& ) const { return false; }
-#endif
};
MetaDataBase();
diff --git a/kommander/editor/orderindicator.cpp b/kommander/editor/orderindicator.cpp
index 24108c2f..2a3f49eb 100644
--- a/kommander/editor/orderindicator.cpp
+++ b/kommander/editor/orderindicator.cpp
@@ -18,7 +18,7 @@
**
**********************************************************************/
-#include <tqvariant.h> // HP-UX compiler need this here
+#include <tqvariant.h>
#include "orderindicator.h"
#include "formwindow.h"
diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp
index 71fe357c..357b2fe4 100644
--- a/kommander/editor/pixmapchooser.cpp
+++ b/kommander/editor/pixmapchooser.cpp
@@ -18,7 +18,7 @@
**
**********************************************************************/
-#include <tqvariant.h> // HP-UX compiler needs this here
+#include <tqvariant.h>
#include "pixmapchooser.h"
#include "formwindow.h"
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index 4b0c58e4..d69f67b0 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -18,7 +18,7 @@
**
**********************************************************************/
-#include <tqvariant.h> // HP-UX compiler needs this here
+#include <tqvariant.h>
#include "propertyeditor.h"
#include "pixmapchooser.h"
diff --git a/kommander/editor/sizehandle.cpp b/kommander/editor/sizehandle.cpp
index 4f6773dc..db2add07 100644
--- a/kommander/editor/sizehandle.cpp
+++ b/kommander/editor/sizehandle.cpp
@@ -18,7 +18,7 @@
**
**********************************************************************/
-#include <tqvariant.h> // HP-UX compiler needs this here
+#include <tqvariant.h>
#include "sizehandle.h"
#include "formwindow.h"
diff --git a/kommander/editor/styledbutton.cpp b/kommander/editor/styledbutton.cpp
index c35ce642..1d013d83 100644
--- a/kommander/editor/styledbutton.cpp
+++ b/kommander/editor/styledbutton.cpp
@@ -18,7 +18,7 @@
**
**********************************************************************/
-#include <tqvariant.h> // HP-UX compiler needs this here
+#include <tqvariant.h>
#include "styledbutton.h"
#include "formwindow.h"
#include "pixmapchooser.h"
diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp
index d22d63f2..681b0db4 100644
--- a/kommander/editor/widgetfactory.cpp
+++ b/kommander/editor/widgetfactory.cpp
@@ -26,7 +26,7 @@
#include <kommanderfactory.h>
#include "kmdrmainwindow.h"
-#include <tqvariant.h> // HP-UX compiler need this here
+#include <tqvariant.h>
#include "widgetfactory.h"
#include "widgetdatabase.h"
#include "metadatabase.h"
diff --git a/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp
index 59ed882c..f17c5e16 100644
--- a/kommander/editor/workspace.cpp
+++ b/kommander/editor/workspace.cpp
@@ -18,7 +18,7 @@
**
**********************************************************************/
-#include <tqvariant.h> // HP-UX compiler needs this here
+#include <tqvariant.h>
#include <tqlistview.h>
#include "workspace.h"
#include "formwindow.h"
diff --git a/kommander/factory/kommanderfactory.h b/kommander/factory/kommanderfactory.h
index 599cff8c..b905ce68 100644
--- a/kommander/factory/kommanderfactory.h
+++ b/kommander/factory/kommanderfactory.h
@@ -109,9 +109,6 @@ private:
TQString name;
TQPixmap pix;
TQString field;
-#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
- bool operator==( const Field& ) const { return false; }
-#endif
};
struct EventFunction