summaryrefslogtreecommitdiffstats
path: root/konqueror/keditbookmarks/kbookmarkmerger.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Rename KInstance and KAboutData to avoid conflicts with KDE4Timothy Pearson2013-01-221-2/+2
|
* Rename KApplication to TDEApplication to avoid conflicts with KDE4Timothy Pearson2013-01-201-2/+2
|
* Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4Timothy Pearson2013-01-191-3/+3
|
* rename the following methods:tpearson2011-08-101-1/+1
| | | | | | | | | tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
* Enable compilation with TQt for Qt4 3.4.0 TP2tpearson2011-01-191-1/+1
| | | | | | | This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
* Trinity Qt initial conversiontpearson2010-07-311-9/+9
| | | | git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
* Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.toma2009-11-251-0/+138
BUG:215923 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da