kdenonbeta/kdedebian/kapture
CVS commit by mornfall:
Fix bunch of warnings. Yes, it still compiles & runs. Found another bug
tho, out to fix that...
M +2 -3 kapture/Makefile.am 1.13
M +6 -7 kapture/kapture.cpp 1.24
M +0 -4 kapture/kapture.h 1.10
M +2 -1 libcapture/pkgmanager.cpp 1.26
M +2 -0 libcapture/stl_util.cpp 1.4
--- kdenonbeta/kdedebian/kapture/kapture/Makefile.am #1.12:1.13
@@ -19,9 +19,8 @@
# which sources should be compiled for kapture
-kapture_SOURCES = main.cpp kapture.cpp kaptureview.cpp \
- kapturepref.cpp
+kapture_SOURCES = main.cpp kapture.cpp kapturepref.cpp
# these are the headers for your project
-noinst_HEADERS = kapture.h kaptureview.h kapturepref.h
+noinst_HEADERS = kapture.h kapturepref.h
# let automoc handle all of the meta source files (moc)
--- kdenonbeta/kdedebian/kapture/kapture/kapture.cpp #1.23:1.24
@@ -33,4 +33,5 @@
#include <qtimer.h>
#include <kde_terminal_interface.h>
+#include <kparts/part.h>
#include <libcapture/grouper.h>
@@ -50,6 +51,5 @@ using namespace kapture;
/* {{{ */
Kapture::Kapture()
- : KDockMainWindow (0, "Kapture"),
- m_printer(0)
+ : KDockMainWindow (0, "Kapture")
{
// accept dnd
@@ -190,5 +190,4 @@ Kapture::~Kapture()
kdDebug () << "Kapture::~Kapture" << endl;
// PkgManager::destroy ();
- delete m_printer;
}
/* }}} */
@@ -244,5 +243,5 @@ void Kapture::saveProperties(KConfig *co
// later when this app is restored
- if (!m_view->currentURL().isNull()) {
+ /* if (!m_view->currentURL().isNull()) {
#if KDE_IS_VERSION(3,1,3)
config->writePathEntry("lastURL", m_view->currentURL());
@@ -250,5 +249,5 @@ void Kapture::saveProperties(KConfig *co
config->writeEntry("lastURL", m_view->currentURL());
#endif
- }
+ } */
}
/* }}} */
@@ -263,6 +262,6 @@ void Kapture::readProperties(KConfig *co
QString url = config->readPathEntry("lastURL");
- if (!url.isEmpty())
- m_view->openURL(KURL::fromPathOrURL(url));
+ /* if (!url.isEmpty())
+ m_view->openURL(KURL::fromPathOrURL(url)); */
}
/* }}} */
--- kdenonbeta/kdedebian/kapture/kapture/kapture.h #1.9:1.10
@@ -11,6 +11,4 @@
#include <kdockwidget.h>
-#include "kaptureview.h"
-
class KPrinter;
class KTabWidget;
@@ -87,6 +85,4 @@ class Kapture : public KDockMainWindow
void setupAccel();
void setupActions();
- KaptureView *m_view;
- KPrinter *m_printer;
};
--- kdenonbeta/kdedebian/kapture/libcapture/pkgmanager.cpp #1.25:1.26
@@ -93,4 +93,5 @@ bool PkgManager::loadAll ()
m_notify = n;
notifyRebuild ();
+ return r;
}
/* {{{ */
@@ -514,5 +515,5 @@ bool PkgManager::doCommit (CommitStatus
_system->UnLock();
- int count = 0;
+ unsigned count = 0;
for (pkgCache::PkgIterator mP = m_cache -> PkgBegin (); ! mP . end (); mP ++) {
if (m_cache [mP] . Delete ()) {
--- kdenonbeta/kdedebian/kapture/libcapture/stl_util.cpp #1.3:1.4
@@ -91,4 +91,5 @@ static string escape( string s, string d
}
/* }}} */
+#if 0
/* {{{ */
static list<string> explode_helper (string s, string delim)
@@ -106,4 +107,5 @@ static list<string> explode_helper (stri
}
/* }}} */
+#endif
/* {{{ */
list<string> capture::explode (string s, string delim)
Reply to: