File sources.diff of Package klipoquery

Overview Repositories Revisions Requests Users Attributes Meta

File sources.diff of Package klipoquery

diff -u orig/klipoquery-0.2.4/src/klipoqueryaction.cpp klipoquery-0.2.4/src/klipoqueryaction.cpp
--- orig/klipoquery-0.2.4/src/klipoqueryaction.cpp	2004-07-30 16:38:52.000000000 +0200
+++ klipoquery-0.2.4/src/klipoqueryaction.cpp	2006-02-19 18:19:23.000000000 +0100
@@ -24,7 +24,7 @@
 #include <kprocess.h>
 #include <kurl.h> 
 #include <krun.h> 
-
+#include <kapp.h>
 
 #include "klipoqueryaction.h"
 
@@ -44,7 +44,7 @@
 
 QString KlipOQueryAction::getClipBoardContent()
 {
-DCOPClient *client = new DCOPClient();
+DCOPClient *client = kapp->dcopClient();
 client->attach();
 QByteArray  data, reply_data;    // also prepare a byte array
                           // for the reply
@@ -58,7 +58,6 @@
                    	// type of data contained in the answer
                    	// the answer
 {
-	delete client;
 	return "";
 }  
 else 
@@ -68,12 +67,10 @@
    {
      	QString result;
 	answer >> result;
-	delete client;
    	return result;
    }
     else
    {
-	delete client;
       	return "";
    }
 }
diff -u orig/klipoquery-0.2.4/src/klipoqueryconfig.cpp klipoquery-0.2.4/src/klipoqueryconfig.cpp
--- orig/klipoquery-0.2.4/src/klipoqueryconfig.cpp	2004-07-30 15:31:31.000000000 +0200
+++ klipoquery-0.2.4/src/klipoqueryconfig.cpp	2006-02-19 18:21:13.000000000 +0100
@@ -34,7 +34,7 @@
 
 KlipOQueryConfig::~KlipOQueryConfig()
 {
-	appletConfig->~KConfig();
+	delete appletConfig;
 }
 
 void KlipOQueryConfig::reload()
diff -u orig/klipoquery-0.2.4/src/klipoquery.cpp klipoquery-0.2.4/src/klipoquery.cpp
--- orig/klipoquery-0.2.4/src/klipoquery.cpp	2004-09-13 13:45:21.000000000 +0200
+++ klipoquery-0.2.4/src/klipoquery.cpp	2006-02-19 18:24:45.000000000 +0100
@@ -57,8 +57,7 @@
 
 KlipOQuery::~KlipOQuery()
 {
-	config->~KlipOQueryConfig();
-// 	delete config;
+ 	delete config;
 // 	delete  actionButton;
 // 	delete appletBox;
 //     	delete menu;
@@ -78,22 +77,20 @@
 void KlipOQuery::setBoxContent()
 {
 // look for suitable icon for the Url of the service
-KURLPixmapProvider *pixmapProvider=new KURLPixmapProvider();
+KURLPixmapProvider pixmapProvider;
 // set this pixmap to the button
-actionButton->setPixmap(pixmapProvider->pixmapFor(config->getServiceURL(),16));
+actionButton->setPixmap(pixmapProvider.pixmapFor(config->getServiceURL(),16));
 // set the tooltip
  QToolTip::add( this, config->getServiceName()+"\n"+config->getServiceDescription());
 actionButton->adjustSize();
 
-delete pixmapProvider;
 }
 
 void KlipOQuery::getInformation()
 {
 config->updateRank();
 generatePopupMenu();
-KlipOQueryAction *action = new KlipOQueryAction(config->getServiceURL(),config->getBrowser());
-delete action;
+KlipOQueryAction action(config->getServiceURL(),config->getBrowser());
 }
 
 void KlipOQuery::generatePopupMenu()
@@ -113,7 +110,7 @@
 QValueList<int> serviceIDs = config->getRegisteredServices();
 
 // handle the Urlicons
-KURLPixmapProvider *pixmapProvider=new KURLPixmapProvider();
+KURLPixmapProvider pixmapProvider;
 
 // add Services to the submenus
 for ( QValueList<int>::Iterator it = serviceIDs.begin(); it != serviceIDs.end(); ++it )
@@ -123,11 +120,11 @@
 
 	if (submenu)
 	{
-		submenu->insertItem(QIconSet(pixmapProvider->pixmapFor(config->getServiceURL(id),16)),config->getServiceName(id)+"\t"+config->getServiceDescription(id),id);
+		submenu->insertItem(QIconSet(pixmapProvider.pixmapFor(config->getServiceURL(id),16)),config->getServiceName(id)+"\t"+config->getServiceDescription(id),id);
 	}
 	else
 	{
-		menu->insertItem(QIconSet(pixmapProvider->pixmapFor(config->getServiceURL(id),16)),config->getServiceName(id)+"\t"+config->getServiceDescription(id),id);
+		menu->insertItem(QIconSet(pixmapProvider.pixmapFor(config->getServiceURL(id),16)),config->getServiceName(id)+"\t"+config->getServiceDescription(id),id);
 	}
 	
 }
@@ -148,10 +145,9 @@
 QValueList<int> topRanks = config->getTopRanking();
 for ( QValueList<int>::Iterator id = topRanks.begin(); id != topRanks.end(); ++id )
 	{	
-		menu->insertItem(QIconSet(pixmapProvider->pixmapFor(config->getServiceURL(*id),16)),config->getServiceName(*id)+"\t "+config->getServiceDescription(*id),*id);
+		menu->insertItem(QIconSet(pixmapProvider.pixmapFor(config->getServiceURL(*id),16)),config->getServiceName(*id)+"\t "+config->getServiceDescription(*id),*id);
 	}	
 
-delete pixmapProvider;
 }
 void KlipOQuery::mousePressEvent(QMouseEvent* e)
 {
diff -u orig/klipoquery-0.2.4/src/klipoquerypreferences.cpp klipoquery-0.2.4/src/klipoquerypreferences.cpp
--- orig/klipoquery-0.2.4/src/klipoquerypreferences.cpp	2004-07-21 13:24:31.000000000 +0200
+++ klipoquery-0.2.4/src/klipoquerypreferences.cpp	2006-02-19 18:26:55.000000000 +0100
@@ -351,7 +351,7 @@
 		}
 			
 QValueList<int> serviceIDs = newConfig->getAllServices();
-		KURLPixmapProvider *pixmapProvider=new KURLPixmapProvider();
+		KURLPixmapProvider pixmapProvider;
 
 		for ( QValueList<int>::Iterator it = serviceIDs.begin(); it != serviceIDs.end(); ++it )
 		{
@@ -369,12 +369,12 @@
 			if (parent)
 			{
 				KListViewItem *element = new KListViewItem(parent,newConfig->getServiceName(id),newConfig->getServiceDescription(id),activated,newConfig->getServiceURL(id),QString::number(id));
-				element->setPixmap(0,pixmapProvider->pixmapFor(newConfig->getServiceURL(id),16));
+				element->setPixmap(0,pixmapProvider.pixmapFor(newConfig->getServiceURL(id),16));
 			}
 			else
 			{
 				KListViewItem *element = new KListViewItem(preferences,newConfig->getServiceName(id),newConfig->getServiceDescription(id),activated,newConfig->getServiceURL(id),QString::number(id));
-				element->setPixmap(0,pixmapProvider->pixmapFor(newConfig->getServiceURL(id),16));
+				element->setPixmap(0,pixmapProvider.pixmapFor(newConfig->getServiceURL(id),16));
 			}

Places

File sources.diff of Package klipoquery

Places