TDE
/
tde-construct
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-construct
0
0
Fork 0
Code Issues Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'e324e2fbba'
${ noResults }
tde-construct/apps/internet/kbear/files/fix-gcc-semicolons.diff

165 lines
9.6 KiB
Raw Normal View History Unescape

Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features. BUG:215923 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/konstruct@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
15 years ago
--- ./work/kbear-2.1/kbear/qextmdi/qextmdidefines.h.orig 2001-12-09 07:45:30.000000000 -0500
+++ ./work/kbear-2.1/kbear/qextmdi/qextmdidefines.h 2004-11-17 11:21:23.587352072 -0500
@@ -88,7 +88,7 @@
TabPageMode = 2
};
-}; //namespace
+} //namespace
//----------------------------------------------------------------------------
--- ./work/kbear-2.1/kbear/qextmdi/qextmdimainfrm.cpp.orig 2002-10-23 18:47:55.000000000 -0400
+++ ./work/kbear-2.1/kbear/qextmdi/qextmdimainfrm.cpp 2004-11-17 11:41:44.727710520 -0500
@@ -1863,7 +1863,7 @@
if (m_pTaskBar)
m_pTaskBar->close();
m_pTaskBar = 0L;
-};
+}
#ifndef NO_INCLUDE_MOCFILES
#include "qextmdimainfrm.moc"
--- ./work/kbear-2.1/kbear/base/kbearcopyjob.cpp.orig 2002-12-02 17:23:41.000000000 -0500
+++ ./work/kbear-2.1/kbear/base/kbearcopyjob.cpp 2004-11-17 11:45:54.569728760 -0500
@@ -266,7 +266,7 @@
default:
break;
}
-};
+}
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
12 years ago
void KBearCopyJob::slotEntries(TDEIO::Job* job, const TDEIO::UDSEntryList& list)
Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features. BUG:215923 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/konstruct@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
15 years ago
{
--- ./work/kbear-2.1/kbear/kbeartransferview.h.orig 2002-11-04 18:15:17.000000000 -0500
+++ ./work/kbear-2.1/kbear/kbeartransferview.h 2004-11-17 11:47:44.494017728 -0500
@@ -30,7 +30,7 @@
class KBearMdiChildView;
class QextMdiChildView;
-class Transfer;;
+class Transfer;
/**
*@author Bj<42>rn Sahlstr<74>m
--- ./work/kbear-2.1/kbear/plugins/importfilters/gftpimportfilter/gftpimportfilterplugin.cpp.orig 2002-09-10 13:39:32.000000000 -0400
+++ ./work/kbear-2.1/kbear/plugins/importfilters/gftpimportfilter/gftpimportfilterplugin.cpp 2004-11-17 12:15:31.984520640 -0500
@@ -34,7 +34,7 @@
#include "gftpimportfilterplugin.h"
typedef KGenericFactory<GFTPImportFilterPlugin> GFTPImportFilterPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libkbeargftpimportfilter, GFTPImportFilterPluginFactory( "GFTPImportFilterPlugin" ) );
+K_EXPORT_COMPONENT_FACTORY( libkbeargftpimportfilter, GFTPImportFilterPluginFactory( "GFTPImportFilterPlugin" ) )
//-----------------------------------------------
GFTPImportFilterPlugin::GFTPImportFilterPlugin(QObject *parent, const char *name,const QStringList& )
: SiteImportFilterPluginIface(parent,name),
--- ./work/kbear-2.1/kbear/plugins/importfilters/ncftpimportfilter/ncftpimportfilterplugin.cpp.orig 2002-09-10 13:39:22.000000000 -0400
+++ ./work/kbear-2.1/kbear/plugins/importfilters/ncftpimportfilter/ncftpimportfilterplugin.cpp 2004-11-17 11:53:09.232649952 -0500
@@ -42,7 +42,7 @@
#include "ncftpimportfilterplugin.h"
typedef KGenericFactory<NcFTPImportFilterPlugin> NcFTPImportFilterPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libkbearncftpimportfilter, NcFTPImportFilterPluginFactory( "NcFTPImportFilterPlugin" ) );
+K_EXPORT_COMPONENT_FACTORY( libkbearncftpimportfilter, NcFTPImportFilterPluginFactory( "NcFTPImportFilterPlugin" ) )
//-----------------------------------------------
NcFTPImportFilterPlugin::NcFTPImportFilterPlugin(QObject *parent, const char *name, const QStringList& )
: SiteImportFilterPluginIface(parent,name),
--- ./work/kbear-2.1/kbear/plugins/importfilters/kbearimportfilter/kbearimportfilterplugin.cpp.orig 2002-09-10 13:39:29.000000000 -0400
+++ ./work/kbear-2.1/kbear/plugins/importfilters/kbearimportfilter/kbearimportfilterplugin.cpp 2004-11-17 11:57:17.095969000 -0500
@@ -108,7 +108,7 @@
}
///////////////////////////////////////////////////////
typedef KGenericFactory<KBearImportFilterPlugin> KBearImportFilterPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libkbearimportfilter, KBearImportFilterPluginFactory( "KBearImportFilterPlugin" ) );
+K_EXPORT_COMPONENT_FACTORY( libkbearimportfilter, KBearImportFilterPluginFactory( "KBearImportFilterPlugin" ) )
//-----------------------------------------------
KBearImportFilterPlugin::KBearImportFilterPlugin(QObject *parent, const char *name,const QStringList& )
: SiteImportFilterPluginIface(parent,name),
--- ./work/kbear-2.1/kbear/plugins/importfilters/ws_ftpimportfilter/ws_ftpimportfilterplugin.cpp.orig 2002-09-10 13:38:55.000000000 -0400
+++ ./work/kbear-2.1/kbear/plugins/importfilters/ws_ftpimportfilter/ws_ftpimportfilterplugin.cpp 2004-11-17 11:59:28.761952728 -0500
@@ -34,7 +34,7 @@
#include "ws_ftpimportfilterplugin.h"
typedef KGenericFactory<WS_FTPImportFilterPlugin> WS_FTPImportFilterPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libkbearwsftpimportfilter, WS_FTPImportFilterPluginFactory( "WS_FTPImportFilterPlugin" ) );
+K_EXPORT_COMPONENT_FACTORY( libkbearwsftpimportfilter, WS_FTPImportFilterPluginFactory( "WS_FTPImportFilterPlugin" ) )
//-----------------------------------------------
WS_FTPImportFilterPlugin::WS_FTPImportFilterPlugin(QObject *parent, const char *name,const QStringList& )
: SiteImportFilterPluginIface(parent,name),
--- ./work/kbear-2.1/kbear/plugins/importfilters/wincommanderimportfilter/wincommanderimportfilterplugin.cpp.orig 2002-09-10 13:39:18.000000000 -0400
+++ ./work/kbear-2.1/kbear/plugins/importfilters/wincommanderimportfilter/wincommanderimportfilterplugin.cpp 2004-11-17 12:00:44.572427784 -0500
@@ -34,7 +34,7 @@
#include "wincommanderimportfilterplugin.h"
typedef KGenericFactory<WinCommanderImportFilterPlugin> WinCommanderImportFilterPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libkbearwincommanderimportfilter, WinCommanderImportFilterPluginFactory( "WinCommanderImportFilterPlugin" ) );
+K_EXPORT_COMPONENT_FACTORY( libkbearwincommanderimportfilter, WinCommanderImportFilterPluginFactory( "WinCommanderImportFilterPlugin" ) )
//-----------------------------------------------
WinCommanderImportFilterPlugin::WinCommanderImportFilterPlugin(QObject *parent, const char *name,const QStringList& )
: SiteImportFilterPluginIface(parent,name),
--- ./work/kbear-2.1/kbear/plugins/importfilters/krusaderimportfilter/krusaderimportfilterplugin.cpp.orig 2002-09-10 13:39:28.000000000 -0400
+++ ./work/kbear-2.1/kbear/plugins/importfilters/krusaderimportfilter/krusaderimportfilterplugin.cpp 2004-11-17 12:01:54.807750392 -0500
@@ -34,7 +34,7 @@
#include "krusaderimportfilterplugin.h"
typedef KGenericFactory<KrusaderImportFilterPlugin> KrusaderImportFilterPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libkbearkrusaderimportfilter, KrusaderImportFilterPluginFactory( "KrusaderImportFilterPlugin" ) );
+K_EXPORT_COMPONENT_FACTORY( libkbearkrusaderimportfilter, KrusaderImportFilterPluginFactory( "KrusaderImportFilterPlugin" ) )
//-----------------------------------------------
KrusaderImportFilterPlugin::KrusaderImportFilterPlugin(QObject *parent, const char *name,const QStringList& )
: SiteImportFilterPluginIface(parent,name),
--- ./work/kbear-2.1/kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp.orig 2002-11-21 10:58:42.000000000 -0500
+++ ./work/kbear-2.1/kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp 2004-11-17 12:02:54.094737400 -0500
@@ -50,7 +50,7 @@
#include "../../base/group.h"
typedef KGenericFactory<KBearSiteManagerPlugin> KBearSiteManagerPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libkbearsitemanager, KBearSiteManagerPluginFactory( "kbearsitemanager" ) );
+K_EXPORT_COMPONENT_FACTORY( libkbearsitemanager, KBearSiteManagerPluginFactory( "kbearsitemanager" ) )
//-----------------------------------------------
KBearSiteManagerPlugin::KBearSiteManagerPlugin(QObject* parent, const char* name, const QStringList& )
: KParts::Plugin(parent,name),
--- ./work/kbear-2.1/kbear/plugins/tools/kbeartoolsplugin.cpp.orig 2002-09-25 15:46:15.000000000 -0400
+++ ./work/kbear-2.1/kbear/plugins/tools/kbeartoolsplugin.cpp 2004-11-17 12:03:56.322277376 -0500
@@ -40,7 +40,7 @@
#include "kbeartoolswidget.h"
typedef KGenericFactory<KBearToolsPlugin> KBearToolsPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libkbeartoolsplugin, KBearToolsPluginFactory( "KBearToolsPlugin" ) );
+K_EXPORT_COMPONENT_FACTORY( libkbeartoolsplugin, KBearToolsPluginFactory( "KBearToolsPlugin" ) )
//-----------------------------------------------
KBearToolsPlugin::KBearToolsPlugin(QObject *parent, const char *name, const QStringList& )
: KParts::Plugin(parent,name)
--- ./work/kbear-2.1/kbear/parts/filesyspart/kbearfilesyspart.cpp.orig 2003-11-21 15:13:24.000000000 -0500
+++ ./work/kbear-2.1/kbear/parts/filesyspart/kbearfilesyspart.cpp 2004-11-17 12:07:22.302963552 -0500
@@ -79,7 +79,7 @@
//-----------------------------------------------
typedef KParts::GenericFactory<KBearFileSysPart> KBearFileSysPartFactory;
-K_EXPORT_COMPONENT_FACTORY( libkbearfilesyspart, KBearFileSysPartFactory );
+K_EXPORT_COMPONENT_FACTORY( libkbearfilesyspart, KBearFileSysPartFactory )
//-----------------------------------------------
KBearFileSysPart::KBearFileSysPart( QWidget* parentWidget, const char* widgetName,
QObject* parent, const char* name, const QStringList& )
--- ./work/kbear-2.1/kbear/parts/filesyspart/kbearfilesyspart.h.orig 2002-11-21 10:58:42.000000000 -0500
+++ ./work/kbear-2.1/kbear/parts/filesyspart/kbearfilesyspart.h 2004-11-17 12:09:09.217710040 -0500
@@ -331,6 +331,6 @@
bool m_isLoading;
QValueList<int> m_splitterSizes;
QTextCodec* m_codec;
- bool m_guiEnabled;;
+ bool m_guiEnabled;
};
#endif
--- ./work/kbear-2.1/kbear/parts/dirsynchpart/kbeardirsynchpart.cpp.orig 2002-12-04 14:56:53.000000000 -0500
+++ ./work/kbear-2.1/kbear/parts/dirsynchpart/kbeardirsynchpart.cpp 2004-11-17 12:11:40.857657264 -0500
@@ -58,7 +58,7 @@
//-----------------------------------------------
typedef KParts::GenericFactory<KBearDirSynchPart> KBearDirSynchPartFactory;
-K_EXPORT_COMPONENT_FACTORY( libkbeardirsynchpart, KBearDirSynchPartFactory );
+K_EXPORT_COMPONENT_FACTORY( libkbeardirsynchpart, KBearDirSynchPartFactory )
//-----------------------------------------------
KBearDirSynchPart::KBearDirSynchPart( QWidget* parentWidget, const char* widgetName,
QObject* parent, const char* name, const QStringList& )