|
|
|
@ -26,7 +26,7 @@
|
|
|
|
|
#include <tdelocale.h>
|
|
|
|
|
#include <kgenericfactory.h>
|
|
|
|
|
#include <kurl.h>
|
|
|
|
|
#include <ksimpleconfig.h>
|
|
|
|
|
#include <tdesimpleconfig.h>
|
|
|
|
|
#include <tdemessagebox.h>
|
|
|
|
|
|
|
|
|
|
//#include <iostream>
|
|
|
|
@ -35,7 +35,7 @@ static TQStringList* s_pHistory=0;
|
|
|
|
|
|
|
|
|
|
class KDiff3PluginFactory : public KGenericFactory < KDiff3Plugin, KonqPopupMenu >
|
|
|
|
|
{
|
|
|
|
|
KSimpleConfig* m_pConfig;
|
|
|
|
|
TDESimpleConfig* m_pConfig;
|
|
|
|
|
public:
|
|
|
|
|
KDiff3PluginFactory( const char* instanceName = 0 )
|
|
|
|
|
: KGenericFactory< KDiff3Plugin, KonqPopupMenu >( instanceName )
|
|
|
|
@ -45,7 +45,7 @@ public:
|
|
|
|
|
{
|
|
|
|
|
//std::cout << "New History: " << instanceName << std::endl;
|
|
|
|
|
s_pHistory = new TQStringList;
|
|
|
|
|
m_pConfig = new KSimpleConfig( "kdiff3pluginrc", false );
|
|
|
|
|
m_pConfig = new TDESimpleConfig( "kdiff3pluginrc", false );
|
|
|
|
|
*s_pHistory = m_pConfig->readListEntry("HistoryStack");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|