code cleaning

- ACKTYPE_URL removed;
- PF1_URL removed;
- IEED_EVENT_URL removed;
- another URL-related code cleaning

6 files changed, 4 insertions, 15 deletions

diff --git a/include/delphi/m_protocols.inc b/include/delphi/m_protocols.inc
index d7bf082421..3a7bf25c7f 100644
--- a/include/delphi/m_protocols.inc
+++ b/include/delphi/m_protocols.inc
@@ -57,7 +57,6 @@ type
 

 const

   ACKTYPE_MESSAGE   = 0;

-  ACKTYPE_URL       = 1;

   ACKTYPE_FILE      = 2;

   ACKTYPE_CHAT      = 3;

   ACKTYPE_AWAYMSG   = 4;

diff --git a/include/delphi/m_protosvc.inc b/include/delphi/m_protosvc.inc
index 25c55dde3e..6846081c76 100644
--- a/include/delphi/m_protosvc.inc
+++ b/include/delphi/m_protosvc.inc
@@ -66,9 +66,6 @@ const
   PF1_IMSEND        = $00000001; // supports IM sending

   PF1_IMRECV        = $00000002; // supports IM receiving

   PF1_IM            = (PF1_IMSEND or PF1_IMRECV);

-  PF1_URLSEND       = $00000004; // supports separate URL sending

-  PF1_URLRECV       = $00000008; // supports separate URL receiving

-  PF1_URL           = (PF1_URLSEND or PF1_URLRECV);

   PF1_FILESEND      = $00000010; // supports file sending

   PF1_FILERECV      = $00000020; // supports file receiving

   PF1_FILE          = (PF1_FILESEND or PF1_FILERECV);

diff --git a/include/m_database.h b/include/m_database.h
index c906e5499f..58b7845b6e 100644
--- a/include/m_database.h
+++ b/include/m_database.h
@@ -272,7 +272,6 @@ public:
 // db/time/x below with useful stuff for dealing with it.

 

 #define EVENTTYPE_MESSAGE         0

-#define EVENTTYPE_URL             1

 #define EVENTTYPE_CONTACTS        2   //v0.1.2.2+

 #define EVENTTYPE_ADDED         1000  //v0.1.1.0+: these used to be module-

 #define EVENTTYPE_AUTHREQUEST   1001  //specific codes, hence the module-

diff --git a/include/m_ignore.h b/include/m_ignore.h
index 8ab880ef01..b4439727b7 100644
--- a/include/m_ignore.h
+++ b/include/m_ignore.h
@@ -30,12 +30,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #define IGNOREEVENT_ALL        (LPARAM)(-1)

 #define IGNOREEVENT_MESSAGE       1

-#define IGNOREEVENT_URL           2

-#define IGNOREEVENT_FILE          3

-#define IGNOREEVENT_USERONLINE    4

-#define IGNOREEVENT_AUTHORIZATION 5

-#define IGNOREEVENT_YOUWEREADDED  6 // 0.3.3a+

-#define IGNOREEVENT_TYPINGNOTIFY  7 // 0.7+

+#define IGNOREEVENT_FILE          2

+#define IGNOREEVENT_USERONLINE    3

+#define IGNOREEVENT_AUTHORIZATION 4

+#define IGNOREEVENT_TYPINGNOTIFY  5

 

 //determines if a message type to a contact should be ignored  v0.1.0.1+

 //wParam = (MCONTACT)hContact

diff --git a/include/m_protocols.h b/include/m_protocols.h
index ba2ba342c1..0561695ad2 100644
--- a/include/m_protocols.h
+++ b/include/m_protocols.h
@@ -52,7 +52,6 @@ struct CCSDATA
 // you will receive.

 

 #define ACKTYPE_MESSAGE    0

-#define ACKTYPE_URL        1

 #define ACKTYPE_FILE       2

 #define ACKTYPE_CHAT       3

 #define ACKTYPE_AWAYMSG    4

diff --git a/include/m_protosvc.h b/include/m_protosvc.h
index e28e31098b..aea91827ea 100644
--- a/include/m_protosvc.h
+++ b/include/m_protosvc.h
@@ -50,8 +50,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define PFLAGNUM_1   1

 #define PF1_IMSEND        0x00000001 // supports IM sending

 #define PF1_IMRECV        0x00000002 // supports IM receiving

-#define PF1_URLSEND       0x00000004 // supports separate URL sending

-#define PF1_URLRECV       0x00000008 // supports separate URL receiving

 #define PF1_FILESEND      0x00000010 // supports file sending

 #define PF1_FILERECV      0x00000020 // supports file receiving

 #define PF1_MODEMSGSEND   0x00000040 // supports broadcasting away messages

@@ -81,7 +79,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define PF1_NUMERICUSERID 0x80000000 // the unique user IDs for this protocol are numeric

 

 #define PF1_IM (PF1_IMSEND|PF1_IMRECV)

-#define PF1_URL (PF1_URLSEND|PF1_URLRECV)

 #define PF1_FILE (PF1_FILESEND|PF1_FILERECV)

 #define PF1_MODEMSG (PF1_MODEMSGSEND|PF1_MODEMSGRECV)

 #define PF1_CONTACT (PF1_CONTACTSEND|PF1_CONTACTRECV)