diff --git a/src/dolphin.cpp b/src/dolphin.cpp
index b3991531b5..8d2f59482d 100644
--- a/src/dolphin.cpp
+++ b/src/dolphin.cpp
@@ -143,6 +143,7 @@ void Dolphin::dropUrls(const KUrl::List& urls,
         /* KDE4-TODO: selectedIndex = popup.exec(QCursor::pos()); */
         popup.exec(QCursor::pos());
         selectedIndex = 0; // KD4-TODO: use QAction instead of switch below
+        // See libkonq/konq_operations.cc: KonqOperations::doDropFileCopy() (and doDrop, the main method)
     }
 
     if (selectedIndex < 0) {
@@ -641,6 +642,9 @@ void Dolphin::slotRedoTextChanged(const QString& text)
 
 void Dolphin::cut()
 {
+    // TODO: this boolean doesn't work between instances of dolphin or with konqueror or with other
+    // apps. The "application/x-kde-cutselection" mimetype should be used instead, see KonqMimeData
+    // in libkonq
     m_clipboardContainsCutData = true;
     /* KDE4-TODO: Q3DragObject* data = new KUrlDrag(m_activeView->selectedUrls(),
                                        widget());
@@ -658,7 +662,7 @@ void Dolphin::copy()
 
 void Dolphin::paste()
 {
-    /* KDE4-TODO:
+    /* KDE4-TODO:   - see KonqOperations::doPaste
     QClipboard* clipboard = QApplication::clipboard();
     QMimeSource* data = clipboard->data();
     if (!KUrlDrag::canDecode(data)) {
@@ -739,6 +743,8 @@ void Dolphin::updatePasteAction()
         else if (count == 1) {
             // Only one file is selected. Pasting is only allowed if this
             // file is a directory.
+            // TODO: this doesn't work with remote protocols; instead we need a
+            // m_activeView->selectedFileItems() to get the real KFileItems
             const KFileItem fileItem(S_IFDIR,
                                      KFileItem::Unknown,
                                      urls.first(),
@@ -1418,7 +1424,7 @@ void Dolphin::setupCreateNewMenuActions()
     unplugActionList("create_actions");
     KSortableList<CreateFileEntry, QString>::ConstIterator it = m_createFileTemplates.begin();
     KSortableList<CreateFileEntry, QString>::ConstIterator end = m_createFileTemplates.end();
-    /* KDE4-TODO:
+    /* KDE4-TODO: don't port this code; use KNewMenu instead
     while (it != end) {
         CreateFileEntry entry = (*it).value();
         KAction* action = new KAction(entry.name);
diff --git a/src/undomanager.cpp b/src/undomanager.cpp
index d4a4574a00..cf7d977139 100644
--- a/src/undomanager.cpp
+++ b/src/undomanager.cpp
@@ -37,6 +37,8 @@ DolphinCommand::DolphinCommand() :
     // Instead of expressing this implementation detail to the interface by adding a
     // Type::Undefined just Type::Copy is used to assure that all members have
     // a defined state.
+    //
+    // KDE4TODO: QList doesn't require a default constructor iirc - so remove this
 }
 
 DolphinCommand::DolphinCommand(Type type,
@@ -106,6 +108,8 @@ void UndoManager::endMacro()
     m_recordMacro = false;
 }
 
+// KDE4 TODO: consider switching to KCommandHistory (kdeui) for the command history, and to
+// KonqCommandRecorder etc. from libkonq/konq_undo.*
 void UndoManager::undo()
 {
     if (m_recordMacro) {
diff --git a/src/undomanager.h b/src/undomanager.h
index f5ce782f95..145c232e1a 100644
--- a/src/undomanager.h
+++ b/src/undomanager.h
@@ -80,7 +80,7 @@ private:
  *
  *	@author Peter Penz <peter.penz@gmx.at>
  */
-class UndoManager : public QObject
+class UndoManager : public QObject   // TODO switch to KonqUndoManager (multi-process, async, more robust on complex operations, no redo though)
 {
     Q_OBJECT