Commit 04a502fa authored by Michael Reeves's avatar Michael Reeves

*update slots/singals syntax in headers.

parent 7e30ba0b
......@@ -33,7 +33,6 @@ add_subdirectory(src)
#add_subdirectory(po)
add_subdirectory(doc)
find_file(KFILEITEMACTIONPLUGIN_FOUND kabstractfileitemactionplugin.h PATHS)
if(KFILEITEMACTIONPLUGIN_FOUND)
message(STATUS "")
......
......@@ -36,7 +36,7 @@ public:
// implement pure virtual method from KonqPopupMenuPlugin
virtual QList<QAction*> actions( const KFileItemListProperties& fileItemInfos, QWidget* pParentWidget );
private slots:
private Q_SLOTS:
void slotCompareWith();
void slotCompareTwoFiles();
void slotCompareThreeFiles();
......
......@@ -36,7 +36,7 @@ public:
// implement pure virtual method from KonqPopupMenuPlugin
virtual void setup( KActionCollection* actionCollection, const KonqPopupMenuInformation& popupMenuInfo, QMenu* menu );
private slots:
private Q_SLOTS:
void slotCompareWith();
void slotCompareTwoFiles();
void slotCompareThreeFiles();
......
......@@ -78,7 +78,7 @@ public:
void setPaintingAllowed( bool bAllowPainting );
void recalcWordWrap( bool bWordWrap, int wrapLineVectorSize, int nofVisibleColumns );
void print( MyPainter& painter, const QRect& r, int firstLine, int nofLinesPerPage );
signals:
Q_SIGNALS:
void resizeSignal( int nofVisibleColumns, int nofVisibleLines );
void scroll( int deltaX, int deltaY );
void newSelection();
......@@ -87,7 +87,7 @@ signals:
void gotFocus();
void lineClicked( int winIdx, int line );
public slots:
public Q_SLOTS:
void setFirstLine( int line );
void setHorizScrollOffset( int horizScrollOffset );
void resetSelection();
......@@ -125,13 +125,13 @@ public:
void init();
void setFirstLine(int firstLine);
void sendEncodingChangedSignal(QTextCodec* c);
signals:
Q_SIGNALS:
void fileNameChanged(const QString&, int);
void encodingChanged(QTextCodec*);
protected:
bool eventFilter( QObject*, QEvent* );
//void paintEvent(QPaintEvent*);
private slots:
private Q_SLOTS:
void slotReturnPressed();
void slotBrowseButtonClicked();
private:
......@@ -146,7 +146,7 @@ public:
protected:
void mouseMoveEvent(QMouseEvent *ev);
void mousePressEvent(QMouseEvent *ev);
private slots:
private Q_SLOTS:
void slotEncodingChanged();
private:
DiffTextWindowFrame* m_pDiffTextWindowFrame; //To send "EncodingChanged" signal
......
......@@ -91,7 +91,7 @@ public:
QString getDirNameC();
QString getDirNameDest();
public slots:
public Q_SLOTS:
void reload();
void mergeCurrentFile();
void compareCurrentFile();
......@@ -137,12 +137,12 @@ public slots:
void slotSaveMergeState();
void slotLoadMergeState();
signals:
Q_SIGNALS:
void startDiffMerge(QString fn1,QString fn2, QString fn3, QString ofn, QString,QString,QString,TotalDiffStatus*);
void checkIfCanContinue( bool* pbContinue );
void updateAvailabilities();
void statusBarMessage( const QString& msg );
protected slots:
protected Q_SLOTS:
void onDoubleClick( const QModelIndex& );
void onExpanded();
void currentChanged( const QModelIndex & current, const QModelIndex & previous ); // override
......@@ -167,7 +167,7 @@ public:
MergeFileInfos& mfi );
QTreeWidget* getInfoList() {return m_pInfoList;}
virtual bool eventFilter( QObject* o, QEvent* e );
signals:
Q_SIGNALS:
void gotFocus();
private:
QLabel* m_pInfoA;
......
......@@ -31,7 +31,7 @@ class ProgressProxyExtender: public ProgressProxy
{
Q_OBJECT
public slots:
public Q_SLOTS:
void slotListDirInfoMessage( KJob*, const QString& msg );
void slotPercent( KJob*, unsigned long percent );
};
......@@ -168,7 +168,7 @@ private:
bool scanLocalDirectory( const QString& dirName, t_DirectoryList* dirList );
private slots:
private Q_SLOTS:
void slotStatResult( KJob* );
void slotSimpleJobResult( KJob* pJob );
void slotPutJobResult( KJob* pJob );
......
......@@ -68,7 +68,7 @@ public:
connect( this, SIGNAL(valueChanged(int)), this, SLOT(slotValueChanged(int)));
}
void setAgain(){ setValue(m_realVal); }
public slots:
public Q_SLOTS:
void slotValueChanged(int i)
{
m_realVal = i;
......@@ -87,7 +87,7 @@ public slots:
{
return m_realVal;
}
signals:
Q_SIGNALS:
void valueChanged2(int);
};
......@@ -126,7 +126,7 @@ class KDiff3App : public QSplitter
virtual bool isFileSaved();
virtual bool isDirComparison();
signals:
Q_SIGNALS:
void createNewInstance( const QString& fn1, const QString& fn2, const QString& fn3 );
protected:
void initDirectoryMergeActions();
......@@ -136,7 +136,7 @@ class KDiff3App : public QSplitter
/** creates the centerwidget of the KMainWindow instance and sets it as the view */
void initView();
public slots:
public Q_SLOTS:
/** open a file and load it into the document*/
void slotFileOpen();
......@@ -331,7 +331,7 @@ class KDiff3App : public QSplitter
int m_iCumulativeWheelDelta;
public slots:
public Q_SLOTS:
void resizeDiffTextWindow(int newWidth, int newHeight);
void resizeMergeResultWindow();
void slotRecalcWordWrap();
......
......@@ -52,7 +52,7 @@ public:
bool queryExit();
virtual void closeEvent(QCloseEvent*e);
private slots:
private Q_SLOTS:
void optionsShowToolbar();
void optionsShowStatusbar();
void optionsConfigureKeys();
......
......@@ -168,9 +168,9 @@ public:
void setButtons(int){}
void setDefaultButton(int){}
void showButtonSeparator(bool){}
private slots:
private Q_SLOTS:
void slotHelpClicked();
signals:
Q_SIGNALS:
void applyClicked();
void okClicked();
void helpClicked();
......@@ -270,7 +270,7 @@ public:
void createGUI(KParts::ReadWritePart*){createGUI();}
QList<KMainWindow*>* memberList;
public slots:
public Q_SLOTS:
void appHelpActivated();
void slotAbout();
};
......@@ -371,7 +371,7 @@ public:
KFontChooser( QWidget* pParent );
QFont font();
void setFont( const QFont&, bool );
private slots:
private Q_SLOTS:
void slotSelectFont();
};
......@@ -384,7 +384,7 @@ public:
QColor color();
void setColor(const QColor&);
virtual void paintEvent(QPaintEvent* e);
public slots:
public Q_SLOTS:
void slotClicked();
};
......
......@@ -16,7 +16,7 @@
***************************************************************************/
#include <K4AboutData>
#include <KAboutData>
#include <klocale.h>
#include "kdiff3_shell.h"
#include <kstandarddirs.h>
......
......@@ -43,10 +43,10 @@ public:
void setOverviewMode( e_OverviewMode eOverviewMode );
e_OverviewMode getOverviewMode();
public slots:
public Q_SLOTS:
void setFirstLine(int firstLine);
void slotRedraw();
signals:
Q_SIGNALS:
void setLine(int);
private:
const Diff3LineList* m_pDiff3LineList;
......@@ -138,7 +138,7 @@ public:
void setSelection( int firstLine, int startPos, int lastLine, int endPos );
void setOverviewMode( Overview::e_OverviewMode eOverviewMode );
Overview::e_OverviewMode getOverviewMode();
public slots:
public Q_SLOTS:
void setFirstLine(int firstLine);
void setHorizScrollOffset(int horizScrollOffset);
......@@ -161,7 +161,7 @@ public slots:
void setPaintingAllowed(bool);
void updateSourceMask();
signals:
Q_SIGNALS:
void scroll( int deltaX, int deltaY );
void modifiedChanged(bool bModified);
void setFastSelectorRange( int line1, int nofLines );
......@@ -416,10 +416,10 @@ private:
bool deleteSelection2( QString& str, int& x, int& y,
MergeLineList::iterator& mlIt, MergeEditLineList::iterator& melIt );
bool doRelevantChangesExist();
public slots:
public Q_SLOTS:
void deleteSelection();
void pasteClipboard(bool bFromSelection);
private slots:
private Q_SLOTS:
void slotCursorUpdate();
};
......@@ -451,9 +451,9 @@ public:
e_LineEndStyle getLineEndStyle();
bool eventFilter( QObject* o, QEvent* e );
public slots:
public Q_SLOTS:
void slotSetModified( bool bModified );
//private slots:
//private Q_SLOTS:
// void slotBrowseButtonClicked();
};
......
......@@ -56,7 +56,7 @@ public:
void addOptionItem(OptionItem*);
KKeyDialog* m_pKeyDialog;
protected slots:
protected Q_SLOTS:
virtual void slotDefault( void );
virtual void slotOk( void );
virtual void slotApply( void );
......@@ -65,7 +65,7 @@ protected slots:
void slotHistoryMergeRegExpTester();
void slotIntegrateWithClearCase();
void slotRemoveClearCaseIntegration();
signals:
Q_SIGNALS:
void applyDone();
private:
void resetToDefaults();
......
......@@ -86,7 +86,7 @@ private:
bool m_bStayHidden;
protected:
virtual void reject();
private slots:
private Q_SLOTS:
void delayedHide();
void slotAbort();
};
......
......@@ -48,7 +48,7 @@ private:
Options* m_pOptions;
void selectURL( QComboBox* pLine, bool bDir, int i, bool bSave );
bool m_bInputFileNameChanged;
private slots:
private Q_SLOTS:
void selectFileA();
void selectFileB();
void selectFileC();
......@@ -60,7 +60,7 @@ private slots:
void internalSlot(int);
void inputFilenameChanged();
void slotSwapCopyNames(QAction*);
signals:
Q_SIGNALS:
void internalSignal(bool);
};
......@@ -71,7 +71,7 @@ public:
FindDialog(QWidget* pParent);
void setVisible(bool); //override QDialog::setVisible()
signals:
Q_SIGNALS:
void findNext();
public:
......@@ -111,7 +111,7 @@ public:
QString historyStartRegExp();
QString historyEntryStartRegExp();
QString historySortKeyOrder();
public slots:
public Q_SLOTS:
void slotRecalc();
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment