[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeutils/kedit
From:       Simon Hausmann <hausmann () kde ! org>
Date:       2003-09-07 19:09:21
[Download RAW message or body]

CVS commit by hausmann: 

- fixed kdeinit support
- KURL::isMalformed -> !isValid
- fixed call to deprecated KIO::NetAccess::stat method


  M +5 -10     Makefile.am   1.41
  M +5 -5      kedit.cpp   1.187


--- kdeutils/kedit/Makefile.am  #1.40:1.41
@@ -8,14 +8,11 @@
 INCLUDES = $(all_includes)
 
-bin_PROGRAMS = kedit
-lib_LTLIBRARIES = kedit.la
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = kedit.la
 
 kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp optiondialog.cpp 
-kedit_la_LIBADD = -lkdeprint $(LIB_KFILE) $(LIB_KIO)
-kedit_la_LDFLAGS = $(all_libraries) -module -avoid-version
-
-kedit_SOURCES = dummy.cpp
-kedit_LDADD   = kedit.la
-kedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kedit_la_LIBADD = -lkdeprint $(LIB_KFILE)
+kedit_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries)
 
 noinst_HEADERS = kedit.h ktextfiledlg.h\
@@ -36,4 +33,2 @@
         $(XGETTEXT) rc.cpp *.cpp -o $(podir)/kedit.pot
 
-dummy.cpp:
-        echo > dummy.cpp

--- kdeutils/kedit/kedit.cpp  #1.186:1.187
@@ -471,5 +471,5 @@ void TopLevel::file_open( void )
 
     KIO::UDSEntry entry;
-    KIO::NetAccess::stat(url, entry);
+    KIO::NetAccess::stat(url, entry, this);
     KFileItem fileInfo(entry, url);
     if (fileInfo.size() > 2097152 && // 2MB large/small enough?
@@ -1067,5 +1067,5 @@ void TopLevel::save_options()
 int TopLevel::saveURL( const KURL& _url )
 {
-    if ( _url.isMalformed() )
+    if ( !_url.isValid() )
     {
         KMessageBox::sorry(this, i18n("Malformed URL"));
@@ -1198,5 +1198,5 @@ int TopLevel::saveFile( const QString& _
 void TopLevel::openURL( const KURL& _url, int _mode )
 {
-    if ( _url.isMalformed() )
+    if ( !_url.isValid() )
     {
         QString string;
@@ -1399,5 +1399,5 @@ static const KCmdLineOptions options[] =
 };
 
-int main (int argc, char **argv)
+extern "C" int kdemain (int argc, char **argv)
 {
         bool have_top_window = false;


[prev in list] [next in list] [prev in thread] [next in thread]