Mercurial > hg > easyhg-kdiff3
diff kdiff3/src/kreplacements/kreplacements.h @ 68:d7cafcda8c99
KDiff3 0.9.87
author | joachim99 |
---|---|
date | Mon, 31 Jan 2005 22:30:47 +0000 |
parents | efe33e938730 |
children | 8febbfb1148c |
line wrap: on
line diff
--- a/kdiff3/src/kreplacements/kreplacements.h Thu Sep 16 02:45:37 2004 +0000 +++ b/kdiff3/src/kreplacements/kreplacements.h Mon Jan 31 22:30:47 2005 +0000 @@ -86,7 +86,7 @@ { Q_OBJECT public: - KDialogBase( int, const QString& caption, int, int, QWidget* parent, const QString& name, + KDialogBase( int, const QString& caption, int, int, QWidget* parent, const char* name, bool /*modal*/, bool ); ~KDialogBase(); @@ -187,7 +187,7 @@ KToolBar* m_pToolBar; - KMainWindow( QWidget* parent, const QString& name ); + KMainWindow( QWidget* parent, const char* name ); KToolBar* toolBar(const QString& s = QString::null); KActionCollection* actionCollection(); void createGUI(); @@ -233,8 +233,10 @@ { Q_OBJECT public: - KAction(const QString& text, const QIconSet& icon, int accel, QObject* receiver, const char* slot, KActionCollection* actionCollection, const QString& name, bool bToggle=false, bool bMenu=true); - KAction(const QString& text, int accel, QObject* receiver, const char* slot, KActionCollection* actionCollection, const QString& name, bool bToggle=false, bool bMenu=true); + KAction(const QString& text, const QIconSet& icon, int accel, QObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bToggle=false, bool bMenu=true); + KAction(const QString& text, int accel, QObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bToggle=false, bool bMenu=true); + void init(QObject* receiver, const char* slot, KActionCollection* actionCollection, + const char* name, bool bToggle, bool bMenu); void setStatusText(const QString&); void plug(QPopupMenu*); }; @@ -242,9 +244,9 @@ class KToggleAction : public KAction { public: - KToggleAction(const QString& text, const QIconSet& icon, int accel, QObject* receiver, const char* slot, KActionCollection* actionCollection, const QString& name, bool bMenu=true); - KToggleAction(const QString& text, int accel, QObject* receiver, const char* slot, KActionCollection* actionCollection, const QString& name, bool bMenu=true); - KToggleAction(const QString& text, const QIconSet& icon, int accel, KActionCollection* actionCollection, const QString& name, bool bMenu=true); + KToggleAction(const QString& text, const QIconSet& icon, int accel, QObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bMenu=true); + KToggleAction(const QString& text, int accel, QObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bMenu=true); + KToggleAction(const QString& text, const QIconSet& icon, int accel, KActionCollection* actionCollection, const char* name, bool bMenu=true); void setChecked(bool); bool isChecked(); }; @@ -447,7 +449,7 @@ class MainWindow : public KMainWindow { public: - MainWindow( QWidget* parent, const QString& name ) : KMainWindow(parent,name) {} + MainWindow( QWidget* parent, const char* name ) : KMainWindow(parent,name) {} void setXMLFile(const QString&){} void setAutoSaveSettings(){} void saveMainWindowSettings(KConfig*){}