*fix plug-in instantiation

*preemptively uncomment all #include *.moc lines
--already had one esoteric error related to this

src/directorymergewindow.cpp

@@ -3495,4 +3495,4 @@ void DirectoryMergeWindow::updateAvailabilities( bool bDirCompare, bool bDiffWin
 }
 
 
-//#include "directorymergewindow.moc"
+#include "directorymergewindow.moc"

src/fileaccess.cpp

@@ -1812,4 +1812,4 @@ void ProgressProxyExtender::slotPercent( KJob*, unsigned long percent )
 }
 
 
-//#include "fileaccess.moc"
+#include "fileaccess.moc"

src/kdiff3.cpp

@@ -1061,4 +1061,4 @@ void KDiff3App::slotStatusMsg(const QString &text)
 
 
 
-//#include "kdiff3.moc"
+#include "kdiff3.moc"

src/kdiff3_shell.cpp

@@ -52,7 +52,7 @@ KDiff3Shell::KDiff3Shell( bool bCompleteInit )
     statusBar()->show();
 
 //       m_part = static_cast<KParts::ReadWritePart*>(factory->create(this, "KDiff3Part", QStringList("KParts::ReadWritePart")));
-   m_part = new KDiff3Part( this, this, QStringList("KDiff3Part") );
+   m_part = new KDiff3Part( this, this, QVariantList() << QVariant(QLatin1String("KDiff3Part")) );
 
    if (m_part)
    {
@@ -170,4 +170,4 @@ void KDiff3Shell::slotNewInstance( const QString& fn1, const QString& fn2, const
    ((KDiff3App*)pKDiff3Shell->m_part->widget())->completeInit(fn1,fn2,fn3);
 }
 
-//#include "kdiff3_shell.moc"
+#include "kdiff3_shell.moc"

src/kreplacements/kreplacements.cpp

@@ -1235,4 +1235,4 @@ QObject* KLibFactory::create(QObject* pParent, const QString& name, const QStrin
 
 
 
-//#include "kreplacements.moc"
+#include "kreplacements.moc"

src/mergeresultwindow.cpp

@@ -3468,4 +3468,4 @@ bool WindowTitleWidget::eventFilter( QObject* o, QEvent* e )
    return false;
 }
 
-//#include "mergeresultwindow.moc"
+#include "mergeresultwindow.moc"

src/optiondialog.cpp

@@ -1909,4 +1909,4 @@ void OptionDialog::slotHistoryMergeRegExpTester()
 }
 
 
-//#include "optiondialog.moc"
+#include "optiondialog.moc"

src/smalldialogs.cpp

@@ -620,4 +620,4 @@ void RegExpTester::slotRecalc()
    }
 }
 
-//#include "smalldialogs.moc"
+#include "smalldialogs.moc"