[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-devel
Subject: kdebase patch (cvs Aug. 7, 2001)
From: Jesse Barnes <jbarnes () sgi ! com>
Date: 2001-08-07 21:02:50
[Download RAW message or body]
Here's a patch to the kdebase module from today's cvs to make it compile
on my IRIX box. I hope the changes are relatively inoffensive...
Jesse
Index: kcontrol/info/memory_sgi.cpp
===================================================================
RCS file: /home/kde/kdebase/kcontrol/info/memory_sgi.cpp,v
retrieving revision 1.7
diff -u -3 -p -r1.7 memory_sgi.cpp
--- kcontrol/info/memory_sgi.cpp 2001/05/27 16:19:53 1.7
+++ kcontrol/info/memory_sgi.cpp 2001/08/07 20:13:11
@@ -27,7 +27,6 @@ void KMemoryWidget::update()
Memory_Info[FREE_MEM] = MEMORY(rmi.freemem*pagesize); // total free physical \
memory (without swaps) Memory_Info[BUFFER_MEM] = MEMORY(rmi.bufmem*pagesize);
-#warning "FIXME: Memory_Info[CACHED_MEM]"
Memory_Info[CACHED_MEM] = NO_MEMORY_INFO; // cached memory in ram
long val;
Index: kioslave/man/kio_man.cpp
===================================================================
RCS file: /home/kde/kdebase/kioslave/man/kio_man.cpp,v
retrieving revision 1.38
diff -u -3 -p -r1.38 kio_man.cpp
--- kioslave/man/kio_man.cpp 2001/08/05 12:14:02 1.38
+++ kioslave/man/kio_man.cpp 2001/08/07 20:13:21
@@ -537,7 +537,6 @@ struct man_index_t {
typedef man_index_t *man_index_ptr;
#ifdef _USE_QSORT
-#warning using qsort
int compare_man_index(const void *s1, const void *s2)
{
struct man_index_t *m1 = *(struct man_index_t **)s1;
Index: konqueror/KonquerorIface.cc
===================================================================
RCS file: /home/kde/kdebase/konqueror/KonquerorIface.cc,v
retrieving revision 1.23
diff -u -3 -p -r1.23 KonquerorIface.cc
--- konqueror/KonquerorIface.cc 2001/07/08 19:14:16 1.23
+++ konqueror/KonquerorIface.cc 2001/08/07 20:13:21
@@ -49,7 +49,8 @@ ASYNC KonquerorIface::openBrowserWindow(
ASYNC KonquerorIface::openBrowserWindowASN( const QString &url, const QCString& \
startup_id ) {
kapp->setStartupId( startup_id );
- return openBrowserWindow( url );
+ openBrowserWindow( url );
+ return;
}
ASYNC KonquerorIface::createNewWindow( const QString &url )
@@ -63,7 +64,8 @@ ASYNC KonquerorIface::createNewWindow( c
ASYNC KonquerorIface::createNewWindowASN( const QString &url, const QCString& \
startup_id ) {
kapp->setStartupId( startup_id );
- return createNewWindow( url );
+ createNewWindow( url );
+ return;
}
ASYNC KonquerorIface::createNewWindow( const QString &url, const QString &mimetype )
@@ -80,7 +82,8 @@ ASYNC KonquerorIface::createNewWindowASN
const QCString& startup_id )
{
kapp->setStartupId( startup_id );
- return createNewWindow( url, mimetype );
+ createNewWindow( url, mimetype );
+ return;
}
ASYNC KonquerorIface::createBrowserWindowFromProfile( const QString &path )
@@ -96,7 +99,8 @@ ASYNC KonquerorIface::createBrowserWindo
ASYNC KonquerorIface::createBrowserWindowFromProfileASN( const QString &path, const \
QCString& startup_id ) {
kapp->setStartupId( startup_id );
- return createBrowserWindowFromProfile( path );
+ createBrowserWindowFromProfile( path );
+ return;
}
ASYNC KonquerorIface::createBrowserWindowFromProfile( const QString & path, const \
QString &filename ) @@ -113,7 +117,8 @@ ASYNC KonquerorIface::createBrowserWindo
const QCString& startup_id )
{
kapp->setStartupId( startup_id );
- return createBrowserWindowFromProfile( path, filename );
+ createBrowserWindowFromProfile( path, filename );
+ return;
}
ASYNC KonquerorIface::createBrowserWindowFromProfileAndURL( const QString & path, \
const QString &filename, const QString &url ) @@ -128,7 +133,8 @@ ASYNC \
KonquerorIface::createBrowserWindo const QCString& startup_id )
{
kapp->setStartupId( startup_id );
- return createBrowserWindowFromProfileAndURL( path, filename, url );
+ createBrowserWindowFromProfileAndURL( path, filename, url );
+ return;
}
ASYNC KonquerorIface::createBrowserWindowFromProfileAndURL( const QString &path, \
const QString &filename, const QString &url, const QString &mimetype ) @@ -145,7 \
+151,8 @@ ASYNC KonquerorIface::createBrowserWindo const QCString& startup_id )
{
kapp->setStartupId( startup_id );
- return createBrowserWindowFromProfileAndURL( path, filename, url, mimetype );
+ createBrowserWindowFromProfileAndURL( path, filename, url, mimetype );
+ return;
}
Index: konqueror/sidebar/sidebar_widget.cpp
===================================================================
RCS file: /home/kde/kdebase/konqueror/sidebar/sidebar_widget.cpp,v
retrieving revision 1.18
diff -u -3 -p -r1.18 sidebar_widget.cpp
--- konqueror/sidebar/sidebar_widget.cpp 2001/07/22 17:58:15 1.18
+++ konqueror/sidebar/sidebar_widget.cpp 2001/08/07 20:13:33
@@ -180,7 +180,6 @@ Sidebar_Widget::Sidebar_Widget(QWidget *
connect(Area,SIGNAL(docked()),this,SLOT(updateDock()));
ButtonBar=new Sidebar_ButtonBar(this);
ButtonBar->setIconText(KToolBar::IconOnly);
-#warning setIconSize(16) for the buttonbar is only a temporary solution for missing \
22x22 icons ButtonBar->setIconSize(16);
ButtonBar->enableMoving(false);
ButtonBar->setOrientation(Qt::Vertical);
@@ -199,11 +198,9 @@ Sidebar_Widget::Sidebar_Widget(QWidget *
buttonPopup->insertSeparator();
buttonPopup->insertItem(SmallIconSet("remove"),i18n("Remove"),3);
connect(buttonPopup,SIGNAL(activated(int)),this,SLOT(buttonPopupActivate(int)));
-#warning replace SmallIcon with BarIcon when 22x22 icons are all available
ButtonBar->insertButton(SmallIcon("remove"),-2);
connect(ButtonBar->getButton(-2),SIGNAL(clicked(int)),par,SLOT(doCloseMe()));
ButtonBar->insertLineSeparator();
-#warning replace SmallIcon with BarIcon when 22x22 icons are all available
ButtonBar->insertButton(SmallIcon("configure"), -1, Menu,true,
i18n("Configure Sidebar"));
connect(new addBackEnd(this,addMenu,"Sidebar_Widget-addBackEnd"),SIGNAL(updateNeeded()),this,SLOT(createButtons()));
@@ -349,7 +346,6 @@ void Sidebar_Widget::updateDock()
ButtonInfo* Sidebar_Widget::getActiveModule()
{
-#warning implement correctly for multiple views
ButtonInfo *info;
for (unsigned int i=0;i<Buttons.count();i++)
if ((info=Buttons.at(i))->dock!=0)
Index: kwin/kwinbutton.cpp
===================================================================
RCS file: /home/kde/kdebase/kwin/kwinbutton.cpp,v
retrieving revision 1.2
diff -u -3 -p -r1.2 kwinbutton.cpp
--- kwin/kwinbutton.cpp 2001/07/02 12:40:14 1.2
+++ kwin/kwinbutton.cpp 2001/08/07 20:13:34
@@ -30,7 +30,6 @@
#include "workspace.h"
// This is a hack to ensure that we use Qt fade and scroll effects
-#warning: Using extracts from qeffects_p.h for kwinbutton tooltip fade and scroll \
effects
// This code is copied directly from qeffects_p.h
struct QEffects
> > Visit http://master.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic