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

List:       kde-core-devel
Subject:    kxkb
From:       Stephen Leaf <smileaf () smileaf ! org>
Date:       2006-11-21 0:00:58
Message-ID: 200611201800.58900.smileaf () smileaf ! org
[Download RAW message or body]

Finally clicked the link for http://www.englishbreakfastnetwork.org/ in #kde 
today and decided to look at the krazy reports for KDE4 and decided to fix a 
few of them. So attached is a patch to hopefully fix all the non-licensing 
issues.

Stephen Leaf

["kxkb-krazy-reports-fixes.patch" (text/x-diff)]

Index: rules.h
===================================================================
--- rules.h	(revision 606572)
+++ rules.h	(working copy)
@@ -44,9 +44,9 @@
   QStringList m_oldLayouts;
   QStringList m_nonLatinLayouts;
 
-  void loadRules(QString filename, bool layoutsOnly=false);
-  void loadGroups(QString filename);
-  void loadOldLayouts(QString filename);
+  void loadRules(QString &filename, bool layoutsOnly=false);
+  void loadGroups(QString &filename);
+  void loadOldLayouts(QString &filename);
   void fixOptionGroups();
 #endif
 };
Index: rules.cpp
===================================================================
--- rules.cpp	(revision 606572)
+++ rules.cpp	(working copy)
@@ -47,7 +47,8 @@
 
 	loadRules(rulesFile, layoutsOnly);
 	loadOldLayouts(rulesFile);
-	loadGroups(KStandardDirs::locate("config", "kxkb_groups"));
+	QString kxkb_groups = KStandardDirs::locate("config", "kxkb_groups");
+	loadGroups(kxkb_groups);
 #endif
 
 	m_layoutsClean = true;
@@ -84,7 +85,7 @@
 
 #else
 
-void XkbRules::loadRules(QString file, bool layoutsOnly)
+void XkbRules::loadRules(QString &file, bool layoutsOnly)
 {
 	RulesInfo* rules = X11Helper::loadRules(file, layoutsOnly);
 
@@ -159,7 +160,7 @@
 #ifndef HAVE_XKLAVIER
 
 // check $oldlayouts and $nonlatin groups for XFree 4.3 and later
-void XkbRules::loadOldLayouts(QString rulesFile)
+void XkbRules::loadOldLayouts(QString &rulesFile)
 {
 	OldLayouts* oldLayoutsStruct = X11Helper::loadOldLayouts( rulesFile );
 	m_oldLayouts = oldLayoutsStruct->oldLayouts;
@@ -168,7 +169,7 @@
 
 // for multi-group layouts in XFree 4.2 and older
 //    or if layout is present in $oldlayout or $nonlatin groups
-void XkbRules::loadGroups(QString file)
+void XkbRules::loadGroups(QString &file)
 {
   kDebug() << "loading groups from " << file << endl;
   QFile f(file);
Index: kcmlayout.cpp
===================================================================
--- kcmlayout.cpp	(revision 606572)
+++ kcmlayout.cpp	(working copy)
@@ -85,7 +85,7 @@
         return it.key();
     }
 
-  return QString::null;
+  return QString();
 }
 
 static Q3ListViewItem* copyLVI(const Q3ListViewItem* src, Q3ListView* parent)
@@ -154,8 +154,8 @@
   widget->listLayoutsSrc->setColumnWidth(LAYOUT_COLUMN_FLAG, 28);
   widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_FLAG, 28);
 
-  widget->listLayoutsDst->header()->setResizeEnabled(FALSE, LAYOUT_COLUMN_INCLUDE);
-  widget->listLayoutsDst->header()->setResizeEnabled(FALSE, LAYOUT_COLUMN_DISPLAY_NAME);
+  widget->listLayoutsDst->header()->setResizeEnabled(false, LAYOUT_COLUMN_INCLUDE);
+  widget->listLayoutsDst->header()->setResizeEnabled(false, LAYOUT_COLUMN_DISPLAY_NAME);
   widget->listLayoutsDst->setColumnWidthMode(LAYOUT_COLUMN_INCLUDE, Q3ListView::Manual);
   widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_INCLUDE, 0);
 //  widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_DISPLAY_NAME, 0);
@@ -874,9 +874,9 @@
  I18N_NOOP("Press Right Win-key to choose 3rd level");
  I18N_NOOP("CapsLock key behavior");
  I18N_NOOP("uses internal capitalization. Shift cancels Caps.");
- I18N_NOOP("uses internal capitalization. Shift doesn't cancel Caps.");
+ I18N_NOOP("uses internal capitalization. Shift does not cancel Caps.");
  I18N_NOOP("acts as Shift with locking. Shift cancels Caps.");
- I18N_NOOP("acts as Shift with locking. Shift doesn't cancel Caps.");
+ I18N_NOOP("acts as Shift with locking. Shift does not cancel Caps.");
  I18N_NOOP("Alt/Win key behavior");
  I18N_NOOP("Add the standard behavior to Menu key.");
  I18N_NOOP("Alt and Meta on the Alt keys (default).");
Index: kcmmisc.cpp
===================================================================
--- kcmmisc.cpp	(revision 606572)
+++ kcmmisc.cpp	(working copy)
@@ -191,7 +191,7 @@
 
 QString KeyboardConfig::quickHelp() const
 {
-  return QString::null;
+  return QString();
 
   /* "<h1>Keyboard</h1> This module allows you to choose options"
      " for the way in which your keyboard works. The actual effect of"


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