cmake conversion #2

Merged
SlavekB merged 1 commits from feat/cmakeConv into master 5 years ago
Ghost commented 5 years ago

Please read issue #1

I've manually processed:

  • Q_bookmarkdialog.h
  • Q_colorspreferencesdialog.h
  • Q_customconnectdialog.h
  • Q_fileexistsdialog.h
  • Q_generalpreferencesdialog.h
  • Q_importdialog.h
  • Q_mainwindow.h
  • Q_userinterfacepreferencesdialog.h

I've added a man page, processed from kasablanca.xml from your Debian packaging system.

I didn't compare this package with one of your deb package (like I usually do), I've just compared automake result vs cmake on my system.

Please read issue #1 I've manually processed: - Q_bookmarkdialog.h - Q_colorspreferencesdialog.h - Q_customconnectdialog.h - Q_fileexistsdialog.h - Q_generalpreferencesdialog.h - Q_importdialog.h - Q_mainwindow.h - Q_userinterfacepreferencesdialog.h I've added a man page, processed from kasablanca.xml from your Debian packaging system. I didn't compare this package with one of your deb package (like I usually do), I've just compared automake result vs cmake on my system.
Ghost added the PR/wip label 5 years ago
SlavekB changed title from WIP: cmake conversion to cmake conversion 5 years ago
SlavekB removed the PR/wip label 5 years ago
SlavekB added this to the R14.0.7 release milestone 5 years ago
Owner

To avoid uselessly adding unwanted header files, I added the removal of unwanted cpp files as part of your commit. Next to this I added the usual patches for UI includes and ascii cast.

Please try it on your system.

To avoid uselessly adding unwanted header files, I added the removal of unwanted cpp files as part of your commit. Next to this I added the usual patches for UI includes and ascii cast. Please try it on your system.
Ghost commented 5 years ago
Poster

That's great!
I'll give It a try...

That's great! I'll give It a try...
Ghost commented 5 years ago
Poster

Ok, works for me.

There's 27 files where we can change the includes ex:

diff --git a/src/ftpsession.h b/src/ftpsession.h
index ce4cf1b..58914eb 100644
--- a/src/ftpsession.h
+++ b/src/ftpsession.h
@@ -13,11 +13,11 @@
 #define FTPSESSION_H
 
 #include <kprocess.h>
-#include <ntqstring.h>
-#include <ntqdir.h>
-#include <ntqpixmap.h>
-#include <ntqobject.h>
-#include <ntqcolor.h>
+#include <tqstring.h>
+#include <tqdir.h>
+#include <tqpixmap.h>
+#include <tqobject.h>
+#include <tqcolor.h>
 #include <list>
 
 #include "kbfileinfo.h"

Should I make an other commit, force an update or wait for you to merge the cmake conversion?

Ok, works for me. There's 27 files where we can change the includes ex: ``` diff --git a/src/ftpsession.h b/src/ftpsession.h index ce4cf1b..58914eb 100644 --- a/src/ftpsession.h +++ b/src/ftpsession.h @@ -13,11 +13,11 @@ #define FTPSESSION_H #include <kprocess.h> -#include <ntqstring.h> -#include <ntqdir.h> -#include <ntqpixmap.h> -#include <ntqobject.h> -#include <ntqcolor.h> +#include <tqstring.h> +#include <tqdir.h> +#include <tqpixmap.h> +#include <tqobject.h> +#include <tqcolor.h> #include <list> #include "kbfileinfo.h" ``` Should I make an other commit, force an update or wait for you to merge the cmake conversion?
Owner

Because you usually make this change in the initial commit for cmake conversion, I did amend to this commit.

Because you usually make this change in the initial commit for cmake conversion, I did amend to this commit.
Ghost commented 5 years ago
Poster

Yes, I usually do these changes, but here I didn't want to interfere with #1.

Thanks for the extra commits.

Yes, I usually do these changes, but here I didn't want to interfere with #1. Thanks for the extra commits.
SlavekB closed this pull request 5 years ago
SlavekB deleted branch feat/cmakeConv 5 years ago
The pull request has been merged as 0d2238b5a7.
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
2 Participants
Notifications
Due Date

No due date set.

Reference: TDE/kasablanca#2
Loading…
There is no content yet.