- Queries
- All Stories
- Search
- Advanced Search
Feed Advanced Search
Advanced Search
Advanced Search
Feb 3 2020
Feb 3 2020
mreeves committed R983:32a38f2b046c: Take advantage of default init to reduce maintenance load (authored by mreeves).
Take advantage of default init to reduce maintenance load
Return error string as referance
Add missing copyright
Jan 31 2020
Jan 31 2020
mreeves committed R983:f85936a96b3e: Add SPDX headers to py and cpp files in test (authored by mreeves).
Add SPDX headers to py and cpp files in test
Convert to SPDX headers
mreeves committed R983:4f80c7a91918: Use QScrollArea instead of QFrame as base for OptionDialog pages. (authored by mreeves).
Use QScrollArea instead of QFrame as base for OptionDialog pages.
Jan 24 2020
Jan 24 2020
Explicitly set automoc and autouic
Jan 19 2020
Jan 19 2020
mreeves committed R983:7bc89d8de6c6: Use QElapsedTimer not QTime for determining duration (authored by mreeves).
Use QElapsedTimer not QTime for determining duration
mreeves committed R983:bf5194f36812: replace QString::sprintf with QString::asprintf. (authored by mreeves).
replace QString::sprintf with QString::asprintf.
make OptionItems::write const
rm stale comment
mreeves committed R983:bf769b03788b: Refactor to make loop termination condition clear (authored by mreeves).
Refactor to make loop termination condition clear
mreeves committed R983:d15b3d17d02a: Pass QSharedPointer to SourceData::isBinaryEqualWith (authored by mreeves).
Pass QSharedPointer to SourceData::isBinaryEqualWith
mreeves committed R983:91c69b3c6226: Make all member variables private for TotalDiffStatus (authored by mreeves).
Make all member variables private for TotalDiffStatus
mreeves committed R983:50a49cb90f41: replace QString::sprintf with QString::asprintf. (authored by mreeves).
replace QString::sprintf with QString::asprintf.
mreeves committed R983:e8d067745c04: Use QElapsedTimer not QTime for determining duration (authored by mreeves).
Use QElapsedTimer not QTime for determining duration
Merge branch 'hig-folder' into 'master'
mreeves committed R983:181eda3c1ed7: Change ‘directory’ to ‘folder’ in user-visible strings (authored by adrianchavesfernandez).
Change ‘directory’ to ‘folder’ in user-visible strings
Jan 13 2020
Jan 13 2020
Fix syncmode
FIx warning on gcc 8.0+
Fix syncmode
FIx warning on gcc 8.0+
mreeves committed R983:f9bd88a1bebb: Make matching in CvsIngnoreList always honor bCaseSensitive setting. (authored by mreeves).
Make matching in CvsIngnoreList always honor bCaseSensitive setting.
Update ABI in tests fix warnings
Drop unneeded proto type
Add more testing
mreeves committed R983:537835714480: Make CvsIgnoreList::matches always honor bCaseSesitive (authored by mreeves).
Make CvsIgnoreList::matches always honor bCaseSesitive
mreeves committed R983:c8f5eadf86af: Move findHistoryRange and calcHistoryLead out of global scope (authored by mreeves).
Move findHistoryRange and calcHistoryLead out of global scope
Fix EBN issues
Jan 10 2020
Jan 10 2020
mreeves committed R983:c11bae1ea6a4: Update readme add build instructions for 1.8 branch (authored by mreeves).
Update readme add build instructions for 1.8 branch
Fix install instructions
mreeves committed R983:395e571f7cd0: Use QRegularExpression to get the history lead (authored by mreeves).
Use QRegularExpression to get the history lead
Kill trigraph support in gcc/clang
fix formatting
mreeves committed R983:e52d19d52ccc: Update readme add build instructions for 1.8 branch (authored by mreeves).
Update readme add build instructions for 1.8 branch
Fix install instructions
Kill trigraph support in gcc/clang
Jan 5 2020
Jan 5 2020
Add missing Licemse Header
mreeves committed R983:576756cbb48c: Revert dfd04d09647fb11d9e59951295fb67fffdf4b84d add more testing (authored by mreeves).
Revert dfd04d09647fb11d9e59951295fb67fffdf4b84d add more testing
mreeves committed R983:edc27113a25e: Convert static const char* to const expr (authored by mreeves).
Convert static const char* to const expr
Use QStringLIst for default patterns
Use QString::split
Add simple auto test for CvsIgnoreList
Scrap duplicate code
mreeves committed R983:380bc3ce83af: Use addEntry when reading a .csvignore file (authored by mreeves).
Use addEntry when reading a .csvignore file
Set cxx_std_11 as feature requirement
Disable Qt keywords
mreeves committed R983:7532c96fd1e3: Add missing log messages for threeway compare (authored by mreeves).
Add missing log messages for threeway compare
mreeves committed R983:fab592157a9c: Use QtNumberType in CvsIgnoreList::addEntriesFromString (authored by mreeves).
Use QtNumberType in CvsIgnoreList::addEntriesFromString
mreeves committed R983:baac1e453fb2: Convert more interator loops to ranged for (authored by mreeves).
Convert more interator loops to ranged for
mreeves committed R983:e5eac07e0062: Move struct t_ItemInfo out of global scope (authored by mreeves).
Move struct t_ItemInfo out of global scope
mreeves committed R983:ea6c2e0bd615: Don't update UI on first pass in updateFileVisibilities (authored by mreeves).
Don't update UI on first pass in updateFileVisibilities
Use MergeFileInfos isThreeWay()
Make m_dirInfo static
Move equality logic to MergeFileInfos
Dec 30 2019
Dec 30 2019
Fix version
Fix compile with KF5DocTolls 5.44
Fix formating
mreeves committed R983:c4530e94d774: Use Qt signals/slots to communicate changes across objects (authored by mreeves).
Use Qt signals/slots to communicate changes across objects
mreeves committed R983:6417f848a857: Don't put referance to stack in QPointer (authored by mreeves).
Don't put referance to stack in QPointer
Update kf5 deprecation flag
Dec 28 2019
Dec 28 2019
mreeves committed R983:3297e8bdf73b: Bump kf5 min due to crash bug in side kf5 code. (authored by mreeves).
Bump kf5 min due to crash bug in side kf5 code.
Use default init for merger
mreeves committed R983:eb2639084df5: Fix static functions being called via an instance (authored by mreeves).
Fix static functions being called via an instance
Make MergeData a class
Add default contructor to Diff
mreeves committed R983:7975c822b675: Run readability-make-member-function-const (authored by mreeves).
Run readability-make-member-function-const
Use new for syntax in Options.cpp
Use Q_SLOTS instead of slots
mreeves committed R983:cac173bbf150: Use ranged for syntax in place of iterator loops. (authored by mreeves).
Use ranged for syntax in place of iterator loops.
mreeves committed R983:71e4a52b9435: Move ToolTip globals to OptionDialog and make them static const (authored by mreeves).
Move ToolTip globals to OptionDialog and make them static const
Use c++11 list intialization sytax
mreeves committed R983:ac716d8961f2: Bump kf5 min due to crash bug in side kf5 code. (authored by mreeves).
Bump kf5 min due to crash bug in side kf5 code.
Dec 25 2019
Dec 25 2019
mreeves committed R983:47da68f21a46: Concolidate memmber function definitions. (authored by mreeves).
Concolidate memmber function definitions.
Resolved TODO
Dec 23 2019
Dec 23 2019
mreeves committed R983:0806d2a28dd7: Use std::swap to switch entries in manual DiffList (authored by mreeves).
Use std::swap to switch entries in manual DiffList
Use LineRef::isValid
Improve memmory mangment
Move line counting to Diff3LineList
Create accessors for Diff3Line
mreeves committed R983:58ffede7fcef: Use struct not class for POD type with no member functions (authored by mreeves).
Use struct not class for POD type with no member functions
mreeves committed R983:9c9e519c5f6b: DirMergeItemDelegate should not directly access DirectoryMergeWindowPrivate. (authored by mreeves).
DirMergeItemDelegate should not directly access DirectoryMergeWindowPrivate.
Fix crazy issue
Dec 17 2019
Dec 17 2019
I will be able to conduct a proper review on Friday. From a quick glance through I seems ok from my end.
Dec 16 2019
Dec 16 2019
mreeves committed R983:25d5dde197de: Add comment for KDiff3App::slotCheckIfCanContinue (authored by mreeves).
Add comment for KDiff3App::slotCheckIfCanContinue
Use Q_EMIT
Switch to isValid
mreeves committed R983:637459c4e65a: Move some connection setup to out of KDiff3App::initView (authored by mreeves).
Move some connection setup to out of KDiff3App::initView
Move DropEvent code to DiffTextWindow
mreeves committed R983:afad2a9a182b: Route all calls to KDiff3App::canContinue through checkIfCanContinue (authored by mreeves).
Route all calls to KDiff3App::canContinue through checkIfCanContinue
Create finishDrop signal/slot