Changeset View
Changeset View
Standalone View
Standalone View
src/mergeresultwindow.h
Show First 20 Lines • Show All 158 Lines • ▼ Show 20 Line(s) | 142 | public Q_SLOTS: | |||
---|---|---|---|---|---|
159 | void slotSplitDiff( int firstD3lLineIdx, int lastD3lLineIdx ); | 159 | void slotSplitDiff( int firstD3lLineIdx, int lastD3lLineIdx ); | ||
160 | void slotJoinDiffs( int firstD3lLineIdx, int lastD3lLineIdx ); | 160 | void slotJoinDiffs( int firstD3lLineIdx, int lastD3lLineIdx ); | ||
161 | void slotSetFastSelectorLine(int); | 161 | void slotSetFastSelectorLine(int); | ||
162 | void setPaintingAllowed(bool); | 162 | void setPaintingAllowed(bool); | ||
163 | void updateSourceMask(); | 163 | void updateSourceMask(); | ||
164 | void slotStatusMessageChanged( const QString& ); | 164 | void slotStatusMessageChanged( const QString& ); | ||
165 | 165 | | |||
166 | Q_SIGNALS: | 166 | Q_SIGNALS: | ||
167 | void scrollMergeResultWindow( int deltaX, int deltaY ); | ||||
167 | void modifiedChanged(bool bModified); | 168 | void modifiedChanged(bool bModified); | ||
168 | void setFastSelectorRange( int line1, int nofLines ); | 169 | void setFastSelectorRange( int line1, int nofLines ); | ||
169 | void sourceMask( int srcMask, int enabledMask ); | 170 | void sourceMask( int srcMask, int enabledMask ); | ||
170 | void resizeSignal(); | 171 | void resizeSignal(); | ||
171 | void selectionEnd(); | 172 | void selectionEnd(); | ||
172 | void newSelection(); | 173 | void newSelection(); | ||
173 | void updateAvailabilities(); | 174 | void updateAvailabilities(); | ||
174 | void showPopupMenu( const QPoint& point ); | 175 | void showPopupMenu( const QPoint& point ); | ||
▲ Show 20 Lines • Show All 291 Lines • Show Last 20 Lines |