summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xkdiff3plugin/kdiff3plugin.h2
-rw-r--r--src/difftextwindow.h4
-rw-r--r--src/directorymergewindow.h4
-rw-r--r--src/fileaccess.h4
-rw-r--r--src/kdiff3.h4
-rw-r--r--src/kdiff3_part.h4
-rw-r--r--src/kdiff3_shell.h2
-rw-r--r--src/kreplacements/kreplacements.h14
-rw-r--r--src/mergeresultwindow.h6
-rw-r--r--src/optiondialog.h2
-rw-r--r--src/smalldialogs.h6
11 files changed, 26 insertions, 26 deletions
diff --git a/kdiff3plugin/kdiff3plugin.h b/kdiff3plugin/kdiff3plugin.h
index e627b9d..352d1ff 100755
--- a/kdiff3plugin/kdiff3plugin.h
+++ b/kdiff3plugin/kdiff3plugin.h
@@ -28,7 +28,7 @@ class TQStringList;
class KDiff3Plugin : public KonqPopupMenuPlugin
{
Q_OBJECT
- TQ_OBJECT
+
public:
KDiff3Plugin (KonqPopupMenu *, const char *name, const TQStringList & list);
virtual ~KDiff3Plugin();
diff --git a/src/difftextwindow.h b/src/difftextwindow.h
index e5631a0..f5f5d01 100644
--- a/src/difftextwindow.h
+++ b/src/difftextwindow.h
@@ -30,7 +30,7 @@ class DiffTextWindowFrame;
class DiffTextWindow : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
DiffTextWindow(
DiffTextWindowFrame* pParent,
@@ -114,7 +114,7 @@ class DiffTextWindowFrameData;
class DiffTextWindowFrame : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
DiffTextWindowFrame( TQWidget* pParent, TQStatusBar* pStatusBar, OptionDialog* pOptionDialog, int winIdx );
~DiffTextWindowFrame();
diff --git a/src/directorymergewindow.h b/src/directorymergewindow.h
index 99c0405..855811a 100644
--- a/src/directorymergewindow.h
+++ b/src/directorymergewindow.h
@@ -117,7 +117,7 @@ public:
class DirectoryMergeWindow : public TQListView
{
Q_OBJECT
- TQ_OBJECT
+
public:
DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOptions, KIconLoader* pIconLoader );
~DirectoryMergeWindow();
@@ -333,7 +333,7 @@ protected slots:
class DirectoryMergeInfo : public TQFrame
{
Q_OBJECT
- TQ_OBJECT
+
public:
DirectoryMergeInfo( TQWidget* pParent );
void setInfo(
diff --git a/src/fileaccess.h b/src/fileaccess.h
index d23e0f6..2a5deeb 100644
--- a/src/fileaccess.h
+++ b/src/fileaccess.h
@@ -120,7 +120,7 @@ class t_DirectoryList : public std::list<FileAccess>
class FileAccessJobHandler : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
FileAccessJobHandler( FileAccess* pFileAccess );
@@ -173,7 +173,7 @@ private slots:
class ProgressDialog : public TQDialog
{
Q_OBJECT
- TQ_OBJECT
+
public:
ProgressDialog( TQWidget* pParent );
diff --git a/src/kdiff3.h b/src/kdiff3.h
index 46c0d3c..00cca9e 100644
--- a/src/kdiff3.h
+++ b/src/kdiff3.h
@@ -63,7 +63,7 @@ class DirectoryMergeInfo;
class ReversibleScrollBar : public TQScrollBar
{
Q_OBJECT
- TQ_OBJECT
+
bool* m_pbRightToLeftLanguage;
int m_realVal;
public:
@@ -97,7 +97,7 @@ signals:
class KDiff3App : public TQSplitter
{
Q_OBJECT
- TQ_OBJECT
+
public:
/** constructor of KDiff3App, calls all init functions to create the application.
diff --git a/src/kdiff3_part.h b/src/kdiff3_part.h
index 5e3ae49..a200fe3 100644
--- a/src/kdiff3_part.h
+++ b/src/kdiff3_part.h
@@ -38,7 +38,7 @@ class KDiff3App;
class KDiff3Part : public KParts::ReadOnlyPart
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Default constructor
@@ -85,7 +85,7 @@ class KAboutData;
class KDiff3PartFactory : public KParts::Factory
{
Q_OBJECT
- TQ_OBJECT
+
public:
KDiff3PartFactory();
virtual ~KDiff3PartFactory();
diff --git a/src/kdiff3_shell.h b/src/kdiff3_shell.h
index e8fa8ec..c3523fd 100644
--- a/src/kdiff3_shell.h
+++ b/src/kdiff3_shell.h
@@ -39,7 +39,7 @@ class KToggleAction;
class KDiff3Shell : public KParts::MainWindow
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Default Constructor
diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h
index 7519b87..054e3c3 100644
--- a/src/kreplacements/kreplacements.h
+++ b/src/kreplacements/kreplacements.h
@@ -88,7 +88,7 @@ typedef TQPopupMenu KPopupMenu;
class KDialogBase : public TQTabDialog
{
Q_OBJECT
- TQ_OBJECT
+
public:
KDialogBase( int, const TQString& caption, int, int, TQWidget* parent, const char* name,
bool /*modal*/, bool );
@@ -172,7 +172,7 @@ namespace KParts
class KMainWindow : public TQMainWindow
{
Q_OBJECT
- TQ_OBJECT
+
private:
KStatusBar m_statusBar;
KActionCollection m_actionCollection;
@@ -220,7 +220,7 @@ public:
class KAction : public TQAction
{
Q_OBJECT
- TQ_OBJECT
+
public:
KAction(const TQString& text, const TQIconSet& icon, int accel, TQObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bToggle=false, bool bMenu=true);
KAction(const TQString& text, int accel, TQObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bToggle=false, bool bMenu=true);
@@ -273,7 +273,7 @@ public:
class KFontChooser : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
TQFont m_font;
TQPushButton* m_pSelectFont;
TQLabel* m_pLabel;
@@ -289,7 +289,7 @@ private slots:
class KColorButton : public TQPushButton
{
Q_OBJECT
- TQ_OBJECT
+
TQColor m_color;
public:
KColorButton(TQWidget* parent);
@@ -392,7 +392,7 @@ extern KApplication* kapp;
class KLibFactory : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
TQObject* create(TQObject*,const TQString&,const TQString&);
};
@@ -500,7 +500,7 @@ namespace KParts
class Factory : public KLibFactory
{
Q_OBJECT
- TQ_OBJECT
+
public:
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
diff --git a/src/mergeresultwindow.h b/src/mergeresultwindow.h
index 2b61e6f..57f25d7 100644
--- a/src/mergeresultwindow.h
+++ b/src/mergeresultwindow.h
@@ -29,7 +29,7 @@ class TQPainter;
class Overview : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
Overview( TQWidget* pParent, OptionDialog* pOptions );
@@ -97,7 +97,7 @@ enum e_MergeSrcSelector
class MergeResultWindow : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
MergeResultWindow(
TQWidget* pParent,
@@ -427,7 +427,7 @@ class TQLabel;
class WindowTitleWidget : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
private:
TQLabel* m_pLabel;
TQLineEdit* m_pFileNameLineEdit;
diff --git a/src/optiondialog.h b/src/optiondialog.h
index b7a27e6..3fd6cf7 100644
--- a/src/optiondialog.h
+++ b/src/optiondialog.h
@@ -49,7 +49,7 @@ enum e_LineEndStyle
class OptionDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/src/smalldialogs.h b/src/smalldialogs.h
index 88e6146..da7c671 100644
--- a/src/smalldialogs.h
+++ b/src/smalldialogs.h
@@ -33,7 +33,7 @@ class TQLabel;
class OpenDialog : public TQDialog
{
Q_OBJECT
- TQ_OBJECT
+
public:
OpenDialog(
TQWidget* pParent, const TQString& n1, const TQString& n2, const TQString& n3,
@@ -70,7 +70,7 @@ signals:
class FindDialog : public TQDialog
{
Q_OBJECT
- TQ_OBJECT
+
public:
FindDialog(TQWidget* pParent);
@@ -94,7 +94,7 @@ public:
class RegExpTester : public TQDialog
{
Q_OBJECT
- TQ_OBJECT
+
private:
TQLineEdit* m_pAutoMergeRegExpEdit;
TQLineEdit* m_pAutoMergeMatchResult;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-31 16:26:39 +0000