ソースを参照

Aviod conflicts with Qt4 namespace members


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1217530 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tpearson 8年前
コミット
2fa036d589
7個のファイルの変更31行の追加31行の削除
  1. 20
    20
      kate/part/kateviewinternal.cpp
  2. 3
    3
      kate/part/kateviewinternal.h
  3. 2
    2
      khtml/Makefile.am
  4. 1
    1
      kimgio/psd.cpp
  5. 2
    2
      kinit/Makefile.am
  6. 2
    2
      kio/kio/kfilterdev.cpp
  7. 1
    1
      kio/kio/kfilterdev.h

+ 20
- 20
kate/part/kateviewinternal.cpp ファイルの表示

@@ -976,17 +976,17 @@ public:
976 976
   }
977 977
 
978 978
   void toEdge( Bias bias ) {
979
-    if( bias == left ) m_col = 0;
980
-    else if( bias == right ) m_col = m_vi->m_doc->lineLength( line() );
979
+    if( bias == left_b ) m_col = 0;
980
+    else if( bias == right_b ) m_col = m_vi->m_doc->lineLength( line() );
981 981
   }
982 982
 
983
-  bool atEdge() const { return atEdge( left ) || atEdge( right ); }
983
+  bool atEdge() const { return atEdge( left_b ) || atEdge( right_b ); }
984 984
 
985 985
   bool atEdge( Bias bias ) const {
986 986
     switch( bias ) {
987
-    case left:  return col() == 0;
988
-    case none:  return atEdge();
989
-    case right: return col() == m_vi->m_doc->lineLength( line() );
987
+    case left_b:  return col() == 0;
988
+    case none:    return atEdge();
989
+    case right_b: return col() == m_vi->m_doc->lineLength( line() );
990 990
     default: Q_ASSERT(false); return false;
991 991
     }
992 992
   }
@@ -1107,7 +1107,7 @@ void KateViewInternal::cursorLeft(  bool sel )
1107 1107
   if ( ! m_view->wrapCursor() && cursor.col() == 0 )
1108 1108
     return;
1109 1109
 
1110
-  moveChar( left, sel );
1110
+  moveChar( left_b, sel );
1111 1111
   if (m_view->m_codeCompletion->codeCompletionVisible()) {
1112 1112
     m_view->m_codeCompletion->updateBox();
1113 1113
   }
@@ -1115,7 +1115,7 @@ void KateViewInternal::cursorLeft(  bool sel )
1115 1115
 
1116 1116
 void KateViewInternal::cursorRight( bool sel )
1117 1117
 {
1118
-  moveChar( right, sel );
1118
+  moveChar( right_b, sel );
1119 1119
   if (m_view->m_codeCompletion->codeCompletionVisible()) {
1120 1120
     m_view->m_codeCompletion->updateBox();
1121 1121
   }
@@ -1134,23 +1134,23 @@ void KateViewInternal::wordLeft ( bool sel )
1134 1134
   // The code assumes that space is never part of the word character class.
1135 1135
 
1136 1136
   KateHighlighting* h = m_doc->highlight();
1137
-  if( !c.atEdge( left ) ) {
1137
+  if( !c.atEdge( left_b ) ) {
1138 1138
 
1139
-    while( !c.atEdge( left ) && m_doc->textLine( c.line() )[ c.col() - 1 ].isSpace() )
1139
+    while( !c.atEdge( left_b ) && m_doc->textLine( c.line() )[ c.col() - 1 ].isSpace() )
1140 1140
       --c;
1141 1141
   }
1142
-  if( c.atEdge( left ) )
1142
+  if( c.atEdge( left_b ) )
1143 1143
   {
1144 1144
     --c;
1145 1145
   }
1146 1146
   else if( h->isInWord( m_doc->textLine( c.line() )[ c.col() - 1 ] ) )
1147 1147
   {
1148
-    while( !c.atEdge( left ) && h->isInWord( m_doc->textLine( c.line() )[ c.col() - 1 ] ) )
1148
+    while( !c.atEdge( left_b ) && h->isInWord( m_doc->textLine( c.line() )[ c.col() - 1 ] ) )
1149 1149
       --c;
1150 1150
   }
1151 1151
   else
1152 1152
   {
1153
-    while( !c.atEdge( left )
1153
+    while( !c.atEdge( left_b )
1154 1154
            && !h->isInWord( m_doc->textLine( c.line() )[ c.col() - 1 ] )
1155 1155
            // in order to stay symmetric to wordLeft()
1156 1156
            // we must not skip space preceding a non-word sequence
@@ -1177,18 +1177,18 @@ void KateViewInternal::wordRight( bool sel )
1177 1177
   // The code assumes that space is never part of the word character class.
1178 1178
 
1179 1179
   KateHighlighting* h = m_doc->highlight();
1180
-  if( c.atEdge( right ) )
1180
+  if( c.atEdge( right_b ) )
1181 1181
   {
1182 1182
     ++c;
1183 1183
   }
1184 1184
   else if( h->isInWord( m_doc->textLine( c.line() )[ c.col() ] ) )
1185 1185
   {
1186
-    while( !c.atEdge( right ) && h->isInWord( m_doc->textLine( c.line() )[ c.col() ] ) )
1186
+    while( !c.atEdge( right_b ) && h->isInWord( m_doc->textLine( c.line() )[ c.col() ] ) )
1187 1187
       ++c;
1188 1188
   }
1189 1189
   else
1190 1190
   {
1191
-    while( !c.atEdge( right )
1191
+    while( !c.atEdge( right_b )
1192 1192
            && !h->isInWord( m_doc->textLine( c.line() )[ c.col() ] )
1193 1193
            // we must not skip space, because if that space is followed
1194 1194
            // by more non-word characters, we would skip them, too
@@ -1198,7 +1198,7 @@ void KateViewInternal::wordRight( bool sel )
1198 1198
     }
1199 1199
   }
1200 1200
 
1201
-  while( !c.atEdge( right ) && m_doc->textLine( c.line() )[ c.col() ].isSpace() )
1201
+  while( !c.atEdge( right_b ) && m_doc->textLine( c.line() )[ c.col() ].isSpace() )
1202 1202
     ++c;
1203 1203
 
1204 1204
   updateSelection( c, sel );
@@ -1232,7 +1232,7 @@ void KateViewInternal::home( bool sel )
1232 1232
   }
1233 1233
 
1234 1234
   if( !(m_doc->configFlags() & KateDocument::cfSmartHome) ) {
1235
-    moveEdge( left, sel );
1235
+    moveEdge( left_b, sel );
1236 1236
     return;
1237 1237
   }
1238 1238
 
@@ -1275,7 +1275,7 @@ void KateViewInternal::end( bool sel )
1275 1275
   }
1276 1276
 
1277 1277
   if( !(m_doc->configFlags() & KateDocument::cfSmartHome) ) {
1278
-    moveEdge( right, sel );
1278
+    moveEdge( right_b, sel );
1279 1279
     return;
1280 1280
   }
1281 1281
 
@@ -1294,7 +1294,7 @@ void KateViewInternal::end( bool sel )
1294 1294
     updateSelection(c, sel);
1295 1295
     updateCursor(c, true);
1296 1296
   } else {
1297
-    moveEdge(right, sel);
1297
+    moveEdge(right_b, sel);
1298 1298
   }
1299 1299
 }
1300 1300
 

+ 3
- 3
kate/part/kateviewinternal.h ファイルの表示

@@ -45,9 +45,9 @@ class TQScrollBar;
45 45
 
46 46
 enum Bias
47 47
 {
48
-    left  = -1,
49
-    none  =  0,
50
-    right =  1
48
+    left_b  = -1,
49
+    none    =  0,
50
+    right_b =  1
51 51
 };
52 52
 
53 53
 class KateViewInternal : public TQWidget

+ 2
- 2
khtml/Makefile.am ファイルの表示

@@ -67,7 +67,7 @@ dummy.cpp: $(srcdir)/Makefile.am
67 67
 
68 68
 libkhtmlpart_la_SOURCES = dummy.cpp
69 69
 libkhtmlpart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
70
-libkhtmlpart_la_LIBADD = libkhtml.la
70
+libkhtmlpart_la_LIBADD = libkhtml.la $(LIB_QT)
71 71
 
72 72
 # init_khtmlimagefactory is in libkhtml.so; init_khtmlimagepart needs to be in the part
73 73
 imgdummy.cpp: $(srcdir)/Makefile.am
@@ -77,7 +77,7 @@ imgdummy.cpp: $(srcdir)/Makefile.am
77 77
 
78 78
 khtmlimagepart_la_SOURCES = imgdummy.cpp
79 79
 khtmlimagepart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
80
-khtmlimagepart_la_LIBADD = libkhtml.la 
80
+khtmlimagepart_la_LIBADD = libkhtml.la $(LIB_QT)
81 81
 
82 82
 INCLUDES = -I$(top_srcdir)/kjs -I$(top_builddir)/kjs -I$(top_srcdir)/kimgio \
83 83
 	-I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc \

+ 1
- 1
kimgio/psd.cpp ファイルの表示

@@ -70,7 +70,7 @@ namespace {	// Private.
70 70
         {
71 71
                 char buf[4096];
72 72
                 while (bytes) {
73
-                        unsigned int num= QMIN(bytes,sizeof(buf));
73
+                        unsigned int num= TQMIN(bytes,sizeof(buf));
74 74
                         unsigned int l = num;
75 75
                         s.readRawBytes(buf, l);
76 76
                         if(l != num)

+ 2
- 2
kinit/Makefile.am ファイルの表示

@@ -33,7 +33,7 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
33 33
 
34 34
 kdeinit_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
35 35
                   $(KDE_RPATH)
36
-kdeinit_LDADD = $(LIB_KPARTS) 
36
+kdeinit_LDADD = $(LIB_KPARTS) -lXft $(LIB_QT)
37 37
 
38 38
 kioslave_SOURCES = kioslave.cpp
39 39
 kioslave_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
@@ -60,7 +60,7 @@ klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/l
60 60
 klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp
61 61
 
62 62
 kstartupconfig_SOURCES  = kstartupconfig.cpp
63
-kstartupconfig_LDADD  = $(top_builddir)/kdecore/libkdefakes.la
63
+kstartupconfig_LDADD  = $(top_builddir)/kdecore/libkdefakes.la $(LIB_QT)
64 64
 kdostartupconfig_SOURCES = kdostartupconfig.cpp
65 65
 kdostartupconfig_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
66 66
                            $(KDE_RPATH)

+ 2
- 2
kio/kio/kfilterdev.cpp ファイルの表示

@@ -116,7 +116,7 @@ TQIODevice * KFilterDev::device( TQIODevice* inDevice, const TQString & mimetype
116 116
    return 0;
117 117
 }
118 118
 
119
-bool KFilterDev::open( int mode )
119
+bool KFilterDev::open( OpenMode mode )
120 120
 {
121 121
     //kdDebug(7005) << "KFilterDev::open " << mode << endl;
122 122
     if ( mode == IO_ReadOnly )
@@ -132,7 +132,7 @@ bool KFilterDev::open( int mode )
132 132
     d->bNeedHeader = !d->bSkipHeaders;
133 133
     filter->init( mode );
134 134
     d->bOpenedUnderlyingDevice = !filter->device()->isOpen();
135
-    bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( (TQIODevice_OpenModeFlag)mode ) : true;
135
+    bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( (OpenMode)mode ) : true;
136 136
     d->result = KFilterBase::OK;
137 137
 
138 138
     if ( !ret )

+ 1
- 1
kio/kio/kfilterdev.h ファイルの表示

@@ -53,7 +53,7 @@ public:
53 53
      * Open for reading or writing.
54 54
      * If the KFilterBase's device is not opened, it will be opened.
55 55
      */
56
-    virtual bool open( int mode );
56
+    virtual bool open( OpenMode mode );
57 57
     /**
58 58
      * Close after reading or writing.
59 59
      * If the KFilterBase's device was opened by open(), it will be closed.

読み込み中…
キャンセル
保存